Merge MySQL 5.1.44 into MariaDB.

This commit is contained in:
unknown 2010-03-04 09:03:07 +01:00
commit 4bf849c23c
301 changed files with 10423 additions and 2259 deletions

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

@ -235,8 +235,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;
}