database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge host.loc:/home/uchum/work/mysql-5.0

Browse Source 
into  host.loc:/home/uchum/work/5.0-opt
This commit is contained in:
gshchepa/uchum@host.loc
2008-03-27 15:52:55 +04:00
parent c941b9f349 792074bff0
commit 7edeebc9ab
35 changed files with 291 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_prepare.cc
View File

@ -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)->