diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:52:55 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:52:55 +0400 |
| commit | 11cfd2ed67ddce51e6fe0b357a660557aa372ffb (patch) | |
| tree | 799a5f4f3ff09f0fd91eaac22493bded4eb38a8c /sql/sql_prepare.cc | |
| parent | 4816e7b7fbd9a035aab92fbebf3ffa065612289e (diff) | |
| parent | c3f2e30320f31d654fecb0bf2eabf66e64685b89 (diff) | |
| download | mariadb-git-11cfd2ed67ddce51e6fe0b357a660557aa372ffb.tar.gz | |
Merge host.loc:/home/uchum/work/mysql-5.0
into host.loc:/home/uchum/work/5.0-opt
sql/sql_delete.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_update.cc:
Auto merged
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 b00606aba4a..e7855946179 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1403,7 +1403,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"); @@ -1441,7 +1441,7 @@ static bool select_like_stmt_test(Prepared_statement *stmt, static bool select_like_stmt_test_with_open_n_lock(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_n_lock"); @@ -1630,7 +1630,7 @@ error: because mysql_handle_derived 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)-> |