diff options
| author | serg@serg.mylan <> | 2005-01-10 16:03:06 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-01-10 16:03:06 +0100 |
| commit | 618d01e7880800827eb1dee834af9d0ca3df4c3c (patch) | |
| tree | 7216c78c85c3c0f32d991c7a7524d252036dce88 /sql/sql_show.cc | |
| parent | cf6e2214d8b4660c4fa2dfd16ed10f0a30409a43 (diff) | |
| download | mariadb-git-618d01e7880800827eb1dee834af9d0ca3df4c3c.tar.gz | |
bad merge fixed
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index ba13dd1ff04..88a56d26e35 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -817,6 +817,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(1); } + buffer.length(0); if (store_create_info(thd, table, &buffer)) DBUG_RETURN(-1); @@ -830,9 +831,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list) DBUG_RETURN(1); protocol->prepare_for_resend(); protocol->store(table->table_name, system_charset_info); - buffer.length(0); - if (store_create_info(thd, table, &buffer)) - DBUG_RETURN(-1); protocol->store(buffer.ptr(), buffer.length(), buffer.charset()); if (protocol->write()) DBUG_RETURN(1); |