diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:21:17 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-03 19:21:17 +0300 |
| commit | 1ab31553cafbb5e7e090c638f5dbc6647ee2d111 (patch) | |
| tree | 33c92e57a94a700ac7dbcca5e9c0ff9181f1e6f0 /sql/event_scheduler.cc | |
| parent | ab61c15efdf8da4152a98ee218b537ad6da625a9 (diff) | |
| parent | cf55cf596e33bb5287bb8336972dbe3ae35fdad4 (diff) | |
| download | mariadb-git-1ab31553cafbb5e7e090c638f5dbc6647ee2d111.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/t/bug46080.test
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 5d8455fa88b..733f2a7167f 100644..100755 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -237,8 +237,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; } |