Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)

Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"


client/mysqltest.c:
  Added missing 'mysql_free_result' (fixed confusing memory leak when sync_with_master fails)ug
mysql-test/mysql-test-run.pl:
  Add the test case name to the instance manager log files
mysql-test/r/rpl_log_pos.result:
  Made test more portable (for powermac)
mysql-test/t/disabled.def:
  Disabled im_life_cycle (added bug#27851)
mysql-test/t/myisam-system.test:
  Use remove_file instead of "system rm"
mysql-test/t/ndb_autodiscover.test:
  Use remove_file instead of "system rm"
mysql-test/t/ndb_loaddatalocal.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_loaddatalocal.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_log_pos.test:
  Made test more portable (for powermac)
mysql-test/t/rpl_misc_functions.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_rbr_to_sbr.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_row_NOW.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_row_sp001.test:
  Use remove_file instead of "system rm"
mysql-test/t/rpl_row_sp011.test:
  Use remove_file instead of "system rm"
mysql-test/t/show_check.test:
  Use remove_file instead of "system rm"
mysys/my_alloc.c:
  Don't return on zero argument, as this may hide other errors
server-tools/instance-manager/log.cc:
  Log errors to both stdout and stderr (to know in which context we got the error)
server-tools/instance-manager/thread_registry.cc:
  Log error before common assert (to know in which context we fail)
sql/ha_ndbcluster.cc:
  Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql/ha_ndbcluster.h:
  Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql/ha_ndbcluster_binlog.cc:
  Do not terminate ndb_cluster_binary_log before the util thread has finnished.
sql-common/client.c:
  Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)

1 files changed, 3 insertions, 1 deletions

diff --git a/sql-common/client.c b/sql-common/client.c
index d6fd98a1ed2..2c09498d8f4 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2604,7 +2604,7 @@ static void mysql_close_free(MYSQL *mysql)
 */
 
 void mysql_detach_stmt_list(LIST **stmt_list __attribute__((unused)),
-                            const char *func_name)
+                            const char *func_name __attribute__((unused)))
 {
 #ifdef MYSQL_CLIENT
   /* Reset connection handle in all prepared statements. */
@@ -2828,6 +2828,7 @@ MYSQL_RES * STDCALL mysql_store_result(MYSQL *mysql)
   result->field_count=	mysql->field_count;
   /* The rest of result members is bzeroed in malloc */
   mysql->fields=0;				/* fields is now in result */
+  clear_alloc_root(&mysql->field_alloc);
   /* just in case this was mistakenly called after mysql_stmt_execute() */
   mysql->unbuffered_fetch_owner= 0;
   DBUG_RETURN(result);				/* Data fetched */
@@ -2877,6 +2878,7 @@ static MYSQL_RES * cli_use_result(MYSQL *mysql)
   result->handle=	mysql;
   result->current_row=	0;
   mysql->fields=0;			/* fields is now in result */
+  clear_alloc_root(&mysql->field_alloc);
   mysql->status=MYSQL_STATUS_USE_RESULT;
   mysql->unbuffered_fetch_owner= &result->unbuffered_fetch_cancelled;
   DBUG_RETURN(result);			/* Data is read to be fetched */