diff options
author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-04-16 17:08:29 +0300 |
---|---|---|
committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-04-16 17:08:29 +0300 |
commit | 48892844a9eab3c69143e1ae45690de3e947b650 (patch) | |
tree | 66913f618e8d3460513451fab5622e144183cd15 /sql/ha_ndbcluster.h | |
parent | 0a3abcf20d1497f2b4b9a0fdba2b280120a3b0f5 (diff) | |
download | mariadb-git-48892844a9eab3c69143e1ae45690de3e947b650.tar.gz |
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)
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r-- | sql/ha_ndbcluster.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index fe79135a47d..72e03fc2edd 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -1004,4 +1004,6 @@ void ndbcluster_print_error(int error, const NdbOperation *error_op); static const char ndbcluster_hton_name[]= "ndbcluster"; static const int ndbcluster_hton_name_length=sizeof(ndbcluster_hton_name)-1; - +extern int ndbcluster_terminating; +extern int ndb_util_thread_running; +extern pthread_cond_t COND_ndb_util_ready; |