diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2007-04-16 17:08:29 +0300 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2007-04-16 17:08:29 +0300 |
commit | 72d135bec59d7556736800bf3f9d268897e2832d (patch) | |
tree | 66913f618e8d3460513451fab5622e144183cd15 /sql/ha_ndbcluster.h | |
parent | 455b325b53aa23fa112ad6fe3751d508f017dcb7 (diff) | |
download | mariadb-git-72d135bec59d7556736800bf3f9d268897e2832d.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"
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; |