mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A fix (Bug #5232: CREATE TABLE ... SELECT can deadlock itself).

Browse source
This commit is contained in:
unknown 2004-08-27 16:43:01 +05:00
parent 1176c17553
commit bf26880291
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mysql-test/r/merge.result
View file

@ -610,3 +610,12 @@ x y
1 3
1 2
drop table t1,t2,t3;
create table t1 (a int);
create table t2 (a int);
insert into t1 values (0);
insert into t2 values (1);
create table t3 engine=merge union=(t1, t2) select * from t1;
INSERT TABLE 't1' isn't allowed in FROM table list
create table t3 engine=merge union=(t1, t2) select * from t2;
INSERT TABLE 't2' isn't allowed in FROM table list
drop table t1, t2;

14
mysql-test/t/merge.test
View file

@ -250,3 +250,17 @@ select * from t3 where x = 1 and y < 5 order by y;
# Bug is that followng query returns empty set while it must be same as above
select * from t3 where x = 1 and y < 5 order by y desc;
drop table t1,t2,t3;
#
# Bug#5232: CREATE TABLE ... SELECT
#
create table t1 (a int);
create table t2 (a int);
insert into t1 values (0);
insert into t2 values (1);
--error 1093
create table t3 engine=merge union=(t1, t2) select * from t1;
--error 1093
create table t3 engine=merge union=(t1, t2) select * from t2;
drop table t1, t2;

13
sql/sql_parse.cc
View file

@ -1655,6 +1655,19 @@ mysql_execute_command(void)
net_printf(&thd->net,ER_INSERT_TABLE_USED,tables->real_name);
DBUG_VOID_RETURN;
}
if (lex->create_info.used_fields & HA_CREATE_USED_UNION)
{
TABLE_LIST *tab;
for (tab= tables; tab; tab= tab->next)
{
if (check_dup(tables->db, tab->real_name,
(TABLE_LIST*)lex->create_info.merge_list.first))
{
net_printf(&thd->net, ER_INSERT_TABLE_USED, tab->real_name);
DBUG_VOID_RETURN;
}
}
}
if (tables->next)
{
TABLE_LIST *table;