Commit 44d76a49 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0

into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
parents a9853184 8c39a4f4
...@@ -1043,6 +1043,7 @@ static int mysql_test_delete(Prepared_statement *stmt, ...@@ -1043,6 +1043,7 @@ static int mysql_test_delete(Prepared_statement *stmt,
if (!open_and_lock_tables(thd, table_list)) if (!open_and_lock_tables(thd, table_list))
{ {
bool res;
if (!table_list->table) if (!table_list->table)
{ {
DBUG_ASSERT(table_list->view && DBUG_ASSERT(table_list->view &&
...@@ -1052,9 +1053,9 @@ static int mysql_test_delete(Prepared_statement *stmt, ...@@ -1052,9 +1053,9 @@ static int mysql_test_delete(Prepared_statement *stmt,
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
mysql_prepare_delete(thd, table_list, &lex->select_lex.where); res= mysql_prepare_delete(thd, table_list, &lex->select_lex.where);
lex->unit.cleanup(); lex->unit.cleanup();
DBUG_RETURN(FALSE); DBUG_RETURN(res);
} }
/* TODO: here we should send types of placeholders to the client. */ /* TODO: here we should send types of placeholders to the client. */
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment