1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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

into sanja.is.com.ua:/home/bell/mysql/bk/work-multi-5.0
This commit is contained in:
bell@sanja.is.com.ua
2005-04-01 13:02:29 +03:00
15 changed files with 561 additions and 165 deletions

View File

@ -3232,16 +3232,6 @@ unsent_create_error:
if ((res= open_and_lock_tables(thd, all_tables)))
break;
if (!first_table->table)
{
DBUG_ASSERT(first_table->view &&
first_table->ancestor && first_table->ancestor->next_local);
my_error(ER_VIEW_DELETE_MERGE_VIEW, MYF(0),
first_table->view_db.str, first_table->view_name.str);
res= FALSE;
break;
}
if ((res= mysql_multi_delete_prepare(thd)))
goto error;