Merged revisions 300798 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r300798 | tilghman | 2011-01-06 00:28:18 -0600 (Thu, 06 Jan 2011) | 8 lines

  Don't destroy handle not created by use (because the caller will).

  (closes issue #18526)
   Reported by: makoto
   Patches:
         res-config-mysql-include.patch uploaded by makoto (license 38)
   Tested by: makoto
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300799 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index 93a743245dce97b4d714b9ac77ba28d698dce110..2176647096ef74321fbddb760a32f151fd3ab6cc 100644 (file)
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -978,7 +978,6 @@ static struct ast_config *config_mysql(const char *database, const char *table,
                                if (!ast_config_internal_load(row[2], cfg, config_flags, "", who_asked)) {
                                        mysql_free_result(result);
                                        release_database(dbh);
-                                       ast_config_destroy(cfg);
                                        return NULL;
                                }
                                continue;