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

Fix for bug #1564: CREATE TABLE + UNION + same table name = crash

Browse Source
This commit is contained in:
unknown
2003-11-11 18:14:49 +04:00
parent 25f9971aaa
commit 1c45978512
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/union.result
View File

@ -419,4 +419,7 @@ a
3 3
(SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1; (SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;
Wrong usage/placement of 'SQL_CALC_FOUND_ROWS' Wrong usage/placement of 'SQL_CALC_FOUND_ROWS'
create temporary table t1 select a from t1 union select a from t2;
create table t1 select a from t1 union select a from t2;
INSERT TABLE 't1' isn't allowed in FROM table list
drop table t1,t2; drop table t1,t2;

3
mysql-test/t/union.test
View File

@ -223,4 +223,7 @@ SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a desc LIMIT 1;
--error 1234 --error 1234
(SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1; (SELECT * FROM t1) UNION all (SELECT SQL_CALC_FOUND_ROWS * FROM t2) LIMIT 1;
create temporary table t1 select a from t1 union select a from t2;
--error 1093
create table t1 select a from t1 union select a from t2;
drop table t1,t2; drop table t1,t2;

10
sql/sql_parse.cc
View File

@ -3496,6 +3496,9 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result)
return 0; return 0;
} }
/* We should skip first table if SQL command is SQLCOM_CREATE_TABLE */
bool skip_first= (lex->sql_command == SQLCOM_CREATE_TABLE);
bool first_added= 0;
SELECT_LEX *sl; SELECT_LEX *sl;
TABLE_LIST **new_table_list= result, *aux; TABLE_LIST **new_table_list= result, *aux;
@ -3512,9 +3515,11 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result)
TABLE_LIST *next; TABLE_LIST *next;
for (; aux; aux=next) for (; aux; aux=next)
{ {
TABLE_LIST *cursor; TABLE_LIST *cursor= *result;
if (first_added && skip_first)
cursor= cursor->next;
next= aux->next; next= aux->next;
for (cursor= *result; cursor; cursor=cursor->next) for ( ; cursor; cursor=cursor->next)
if (!strcmp(cursor->db,aux->db) && if (!strcmp(cursor->db,aux->db) &&
!strcmp(cursor->real_name,aux->real_name) && !strcmp(cursor->real_name,aux->real_name) &&
!strcmp(cursor->alias, aux->alias)) !strcmp(cursor->alias, aux->alias))
@ -3531,6 +3536,7 @@ static bool create_total_list(THD *thd, LEX *lex, TABLE_LIST **result)
*new_table_list= cursor; *new_table_list= cursor;
new_table_list= &cursor->next; new_table_list= &cursor->next;
*new_table_list=0; // end result list *new_table_list=0; // end result list
first_added= 1;
} }
else else
aux->shared=1; // Mark that it's used twice aux->shared=1; // Mark that it's used twice