diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2008-03-21 17:48:28 +0200 |
| commit | f6871c0d661d1d6be814cc539bd33d5bf1a243d2 (patch) | |
| tree | 4f0c113cf15f0425c7fedd53da1c81aa881a00ea /sql/sql_prepare.cc | |
| parent | 9d03658bf2b846410f86acd6cc97a446a1ee9113 (diff) | |
| parent | dff2a4c3a3c219417340870fc25796b498e67764 (diff) | |
| download | mariadb-git-f6871c0d661d1d6be814cc539bd33d5bf1a243d2.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
Diffstat (limited to 'sql/sql_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index a027ffe9daa..933810a3fff 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1415,7 +1415,7 @@ error: */ static bool select_like_stmt_test(Prepared_statement *stmt, - bool (*specific_prepare)(THD *thd), + int (*specific_prepare)(THD *thd), ulong setup_tables_done_option) { DBUG_ENTER("select_like_stmt_test"); @@ -1452,7 +1452,7 @@ static bool select_like_stmt_test(Prepared_statement *stmt, static bool select_like_stmt_test_with_open(Prepared_statement *stmt, TABLE_LIST *tables, - bool (*specific_prepare)(THD *thd), + int (*specific_prepare)(THD *thd), ulong setup_tables_done_option) { DBUG_ENTER("select_like_stmt_test_with_open"); @@ -1638,7 +1638,7 @@ error: uses local tables lists. */ -static bool mysql_insert_select_prepare_tester(THD *thd) +static int mysql_insert_select_prepare_tester(THD *thd) { SELECT_LEX *first_select= &thd->lex->select_lex; TABLE_LIST *second_table= ((TABLE_LIST*)first_select->table_list.first)-> |