diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 17:01:48 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 17:01:48 +0300 |
| commit | cf55cf596e33bb5287bb8336972dbe3ae35fdad4 (patch) | |
| tree | 939d5c5ce926dbc17814e750c67d6ddc24765cf0 /sql/event_scheduler.cc | |
| parent | daec25c11d73e87c0f05b0d4d6cbd18a812d1995 (diff) | |
| parent | 59f1be1b636e360c410c81de1c41a8c4a254077d (diff) | |
| download | mariadb-git-cf55cf596e33bb5287bb8336972dbe3ae35fdad4.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_sp.result
Diffstat (limited to 'sql/event_scheduler.cc')
| -rwxr-xr-x[-rw-r--r--] | sql/event_scheduler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index ea20270b457..065d67bdb6a 100644..100755 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -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; } |