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

Merge with 4.0 to get latest bug fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-09-04 15:59:49 +03:00
parent dfd310fc00 38f462ae6f
commit 9d8555c0f0
32 changed files with 431 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_parse.cc
View File

@ -2335,6 +2335,21 @@ mysql_execute_command(THD *thd)
net_printf(thd,ER_UPDATE_TABLE_USED, create_table->real_name);
goto create_error;
}
if (lex->create_info.used_fields & HA_CREATE_USED_UNION)
{
TABLE_LIST *tab;
for (tab= tables; tab; tab= tab->next)
{
if (find_real_table_in_list((TABLE_LIST*) lex->create_info.
merge_list.first,
tables->db, tab->real_name))
{
net_printf(thd, ER_UPDATE_TABLE_USED, tab->real_name);
goto create_error;
}
}
}
if (tables && check_table_access(thd, SELECT_ACL, tables,0))
goto create_error; // Error message is given
select_lex->options|= SELECT_NO_UNLOCK;