diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:54:45 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-03-27 15:54:45 +0400 |
| commit | a451de2f5949cfb1109be2c8608c5aed65a074de (patch) | |
| tree | 26a1228ee041cd494460792a2e5f3bff5c0f0b7b /sql/sql_prepare.cc | |
| parent | 321f392f629479eedf63062f85283e911ce05d7e (diff) | |
| parent | b90296c70ac526be823d76ffdb2ef2e8cac87179 (diff) | |
| download | mariadb-git-a451de2f5949cfb1109be2c8608c5aed65a074de.tar.gz | |
Merge host.loc:/home/uchum/work/mysql-5.1
into host.loc:/home/uchum/work/5.1-opt
client/mysqltest.c:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.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 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)-> |