diff options
| author | Mikael Ronstrom <mikael@dator8> | 2011-03-04 13:17:58 +0100 |
|---|---|---|
| committer | Mikael Ronstrom <mikael@dator8> | 2011-03-04 13:17:58 +0100 |
| commit | 917da2749f1912c18ebeea08ce5a83a455807219 (patch) | |
| tree | 9aedcfa84c82154d5388549dc2aaa658cdead199 /sql | |
| parent | a41873670cbd3f0ca8ae8a8a992f02294d129539 (diff) | |
| download | mariadb-git-917da2749f1912c18ebeea08ce5a83a455807219.tar.gz | |
Further review fixes
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 39f80f2307d..3061cf9deda 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -742,7 +742,7 @@ bool Drop_table_error_handler::handle_condition(THD *thd, THD::THD() - :Statement(&main_lex, &main_mem_root, ES_CONVENTIONAL_EXECUTION, + :Statement(&main_lex, &main_mem_root, STMT_CONVENTIONAL_EXECUTION, /* statement id */ 0), rli_fake(0), user_time(0), in_sub_stmt(0), @@ -3550,7 +3550,7 @@ extern "C" void thd_pool_wait_end(MYSQL_THD thd); thd_wait_end MUST be called immediately after waking up again. */ -extern "C" void thd_wait_begin(MYSQL_THD thd, thd_wait_type wait_type) +extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type) { MYSQL_CALLBACK(thread_scheduler, thd_wait_begin, (thd, wait_type)); } @@ -3566,7 +3566,7 @@ extern "C" void thd_wait_end(MYSQL_THD thd) MYSQL_CALLBACK(thread_scheduler, thd_wait_end, (thd)); } #else -extern "C" void thd_wait_begin(MYSQL_THD thd, thd_wait_type wait_type) +extern "C" void thd_wait_begin(MYSQL_THD thd, int wait_type) { /* do NOTHING for the embedded library */ return; |