mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for compiling error in sql_parse

Browse source
This commit is contained in:
brian@zim.(none) 2005-01-06 16:31:18 -08:00
parent 5010be1d8b
commit 75f282df27
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -34,6 +34,7 @@ bk@mysql.r18.ru
brian@avenger.(none) brian@avenger.(none)
brian@brian-akers-computer.local brian@brian-akers-computer.local
brian@private-client-ip-101.oz.net brian@private-client-ip-101.oz.net
brian@zim.(none)
carsten@tsort.bitbybit.dk carsten@tsort.bitbybit.dk
cps@silver_beast.(none) cps@silver_beast.(none)
davida@isil.mysql.com davida@isil.mysql.com

9
sql/sql_parse.cc
View file

@ -2564,7 +2564,7 @@ mysql_execute_command(THD *thd)
TABLE_LIST *select_tables= lex->query_tables; TABLE_LIST *select_tables= lex->query_tables;
if ((res= create_table_precheck(thd, select_tables, create_table))) if ((res= create_table_precheck(thd, select_tables, create_table)))
goto create_error; goto unsent_create_error;
#ifndef HAVE_READLINK #ifndef HAVE_READLINK
lex->create_info.data_file_name=lex->create_info.index_file_name=0; lex->create_info.data_file_name=lex->create_info.index_file_name=0;
@ -2574,7 +2574,7 @@ mysql_execute_command(THD *thd)
create_table->table_name) || create_table->table_name) ||
append_file_to_dir(thd, &lex->create_info.index_file_name, append_file_to_dir(thd, &lex->create_info.index_file_name,
create_table->table_name)) create_table->table_name))
goto create_error; goto unsent_create_error;
#endif #endif
/* /*
If we are using SET CHARSET without DEFAULT, add an implicit If we are using SET CHARSET without DEFAULT, add an implicit
@ -2606,7 +2606,7 @@ mysql_execute_command(THD *thd)
unique_table(create_table, select_tables)) unique_table(create_table, select_tables))
{ {
my_error(ER_UPDATE_TABLE_USED, MYF(0), create_table->table_name); my_error(ER_UPDATE_TABLE_USED, MYF(0), create_table->table_name);
goto create_error; goto unsent_create_error;
} }
/* If we create merge table, we have to test tables in merge, too */ /* If we create merge table, we have to test tables in merge, too */
if (lex->create_info.used_fields & HA_CREATE_USED_UNION) if (lex->create_info.used_fields & HA_CREATE_USED_UNION)
@ -2619,7 +2619,7 @@ mysql_execute_command(THD *thd)
if (unique_table(tab, select_tables)) if (unique_table(tab, select_tables))
{ {
my_error(ER_UPDATE_TABLE_USED, MYF(0), tab->table_name); my_error(ER_UPDATE_TABLE_USED, MYF(0), tab->table_name);
goto create_error; goto unsent_create_error;
} }
} }
} }
@ -2666,6 +2666,7 @@ mysql_execute_command(THD *thd)
break; break;
/* put tables back for PS rexecuting */ /* put tables back for PS rexecuting */
unsent_create_error:
lex->link_first_table_back(create_table, link_to_local); lex->link_first_table_back(create_table, link_to_local);
goto error; goto error;
} }