From 10ef77fc3bad3ccbcff22ce1e622f2ae96f72f82 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 16 Aug 2007 16:47:31 +0300 Subject: Fixed errors found by pushbuild: Fixed failing func_misc test for embedded server Added casts to avoid compiler warnings Removed Table_locks_immediate as it's depending on log file cacheing Changed type of get_time() to avoid warnings Removed testing if purger master logs succeded as this is not deterministic libmysqld/lib_sql.cc: Fixed failing func_misc test for embedded server mysql-test/mysql-test-run.pl: Shut first down slaves, then masters. This should avoid some errors in the log file about not being able to connect to master during shutdown mysql-test/r/func_misc.result: Move DROP TABLE's first mysql-test/r/status.result: Removed Table_locks_immediate as it's depending on log file cacheing mysql-test/suite/ndb/r/ndb_binlog_basic.result: Removed testing if purger master logs succeded as this is not deterministic mysql-test/suite/ndb/t/ndb_binlog_basic.test: Removed testing if purger master logs succeded as this is not deterministic mysql-test/t/func_misc.test: Move DROP TABLE's first mysql-test/t/status.test: Removed Table_locks_immediate as it's depending on log file cacheing sql/log_event.cc: Added cast to avoid warnings sql/log_event.h: Changed type of get_time() to avoid warnings --- libmysqld/lib_sql.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmysqld') diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 4a8387e9944..42d2752f6e1 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -567,7 +567,7 @@ void init_embedded_mysql(MYSQL *mysql, int client_flag) void *create_embedded_thd(int client_flag) { THD * thd= new THD; - thd->thread_id= thread_id++; + thd->thread_id= thd->variables.pseudo_thread_id= thread_id++; thd->thread_stack= (char*) &thd; if (thd->store_globals()) -- cgit v1.2.1