diff options
| author | unknown <brian@zim.(none)> | 2005-01-06 16:31:18 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-01-06 16:31:18 -0800 |
| commit | fb0f6c9de1d2f9ee027a0a0e34644689bdf2320b (patch) | |
| tree | 1a41a783d0e239690d3ca66cd2aec40c3fd23c2c | |
| parent | ae7cfe9ee8507d2d145c806cc07b39a712426331 (diff) | |
| download | mariadb-git-fb0f6c9de1d2f9ee027a0a0e34644689bdf2320b.tar.gz | |
Fix for compiling error in sql_parse
sql/sql_parse.cc:
Fixing merge issue with goto label missing.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 40db2499a81..71088830ed7 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -34,6 +34,7 @@ bk@mysql.r18.ru brian@avenger.(none) brian@brian-akers-computer.local brian@private-client-ip-101.oz.net +brian@zim.(none) carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index af62a81450a..4b484500527 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2564,7 +2564,7 @@ mysql_execute_command(THD *thd) TABLE_LIST *select_tables= lex->query_tables; if ((res= create_table_precheck(thd, select_tables, create_table))) - goto create_error; + goto unsent_create_error; #ifndef HAVE_READLINK 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) || append_file_to_dir(thd, &lex->create_info.index_file_name, create_table->table_name)) - goto create_error; + goto unsent_create_error; #endif /* 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)) { 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 (lex->create_info.used_fields & HA_CREATE_USED_UNION) @@ -2619,7 +2619,7 @@ mysql_execute_command(THD *thd) if (unique_table(tab, select_tables)) { 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; /* put tables back for PS rexecuting */ +unsent_create_error: lex->link_first_table_back(create_table, link_to_local); goto error; } |