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

post merge

Browse Source
This commit is contained in:
unknown
2004-11-21 19:33:49 +02:00
parent 3bc1fcd409
commit c9497e2365
11 changed files with 96 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_load.cc
View File

@ -121,9 +121,12 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
table_list->lock_type= lock_type;
if ((res= open_and_lock_tables(thd, table_list)))
DBUG_RETURN(res);
if (setup_tables(thd, table_list, &unused_conds))
if (setup_tables(thd, table_list, &unused_conds,
&thd->lex->select_lex.leaf_tables, 0))
DBUG_RETURN(-1);
if (!table_list->updatable || check_key_in_view(thd, table_list))
if (!table_list->table || // do not suport join view
!table_list->updatable || // and derived tables
check_key_in_view(thd, table_list))
{
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "LOAD");
DBUG_RETURN(-1);