1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Manual merge from mysql-5.1-bugteam.

Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_sp.result
This commit is contained in:
Alexander Nozdrin
2010-02-03 17:01:48 +03:00
17 changed files with 111 additions and 2325 deletions

3
sql/event_scheduler.cc Normal file → Executable file
View File

@@ -236,8 +236,9 @@ event_scheduler_thread(void *arg)
if (!res)
scheduler->run(thd);
DBUG_LEAVE; // Against gcc warnings
my_thread_end();
DBUG_RETURN(0); // Against gcc warnings
return 0;
}