database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

bad merge fixed

Browse Source
This commit is contained in:
serg@serg.mylan
2005-01-10 16:03:06 +01:00
parent cf6e2214d8
commit 618d01e788
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_show.cc
View File

@@ -817,6 +817,7 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
buffer.length(0);
if (store_create_info(thd, table, &buffer)) if (store_create_info(thd, table, &buffer))
DBUG_RETURN(-1); DBUG_RETURN(-1);
@@ -830,9 +831,6 @@ mysqld_show_create(THD *thd, TABLE_LIST *table_list)
DBUG_RETURN(1); DBUG_RETURN(1);
protocol->prepare_for_resend(); protocol->prepare_for_resend();
protocol->store(table->table_name, system_charset_info); 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()); protocol->store(buffer.ptr(), buffer.length(), buffer.charset());
if (protocol->write()) if (protocol->write())
DBUG_RETURN(1); DBUG_RETURN(1);