diff options
| author | gshchepa/uchum@host.loc <> | 2008-03-27 15:54:45 +0400 |
|---|---|---|
| committer | gshchepa/uchum@host.loc <> | 2008-03-27 15:54:45 +0400 |
| commit | 810059404ee092d36085822999643c64363f5690 (patch) | |
| tree | 26a1228ee041cd494460792a2e5f3bff5c0f0b7b /sql/sql_prepare.cc | |
| parent | ac130084c4a1c533cc279dd446c5601071989354 (diff) | |
| parent | 60f750b9eda2ea384e6e49455fb1f1b5e221fc99 (diff) | |
| download | mariadb-git-810059404ee092d36085822999643c64363f5690.tar.gz | |
Merge host.loc:/home/uchum/work/mysql-5.1
into host.loc:/home/uchum/work/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 c922b21af90..091cc18114b 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)-> |