diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-12-14 20:36:51 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-12-14 20:36:51 +0200 |
| commit | 511fd82b26bd581de99393a3962af432a835aa9f (patch) | |
| tree | 6153b86559951f222470de87b1c387bcde6fbcda /sql | |
| parent | 43c8a6ac19c48dad77aae7deb4eb0ef22a5b0ba7 (diff) | |
| parent | 1a985a17c064eb25a69b5936547752b2df7bda9a (diff) | |
| download | mariadb-git-511fd82b26bd581de99393a3962af432a835aa9f.tar.gz | |
Merge with 5.2
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 21036554c91..0e8b919db53 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -760,7 +760,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) Protocol *protocol= thd->protocol; char buff[2048]; String buffer(buff, sizeof(buff), system_charset_info); - char *save_db, *save_table_name; bool retval= TRUE; // Assume error List<Item> field_list; DBUG_ENTER("mysqld_show_create"); @@ -770,10 +769,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) /* We want to preserve the tree for views. */ thd->lex->context_analysis_only|= CONTEXT_ANALYSIS_ONLY_VIEW; - /* Store original names if called from SP */ - save_db= table_list->db; - save_table_name= table_list->table_name; - { Show_create_error_handler view_error_suppressor(thd, table_list); thd->push_internal_handler(&view_error_suppressor); @@ -857,11 +852,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) retval= FALSE; // ok error: - /* Restore table list if called by stored procedure */ - table_list->db= save_db; - table_list->table_name= save_table_name; DBUG_RETURN(retval); - } bool mysqld_show_create_db(THD *thd, char *dbname, |