1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Kent Boortz 2012-02-16 11:19:19 +01:00
commit 6a76908a6b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb/t/innodb_bug53756.test
View File

@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666);
# Request a crash on next execution of commit. # Request a crash on next execution of commit.
SET SESSION debug="+d,crash_commit_before"; SET SESSION debug="+d,crash_commit_before";
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Execute the statement that causes the crash. # Execute the statement that causes the crash.
--error 2013 --error 2013
COMMIT; COMMIT;
@ -154,9 +157,6 @@ COMMIT;
--echo # --echo #
--echo # Restart server. --echo # Restart server.
# #
# Write file to make mysql-test-run.pl start up the server again
--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
#
# Turn on reconnect # Turn on reconnect
--enable_reconnect --enable_reconnect
# #

4
sql/sql_show.cc
View File

@ -1162,7 +1162,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
handler *file= table->file; handler *file= table->file;
TABLE_SHARE *share= table->s; TABLE_SHARE *share= table->s;
HA_CREATE_INFO create_info; HA_CREATE_INFO create_info;
#ifdef WITH_PARTITION_STORAGE_ENGINE
bool show_table_options= FALSE; bool show_table_options= FALSE;
#endif /* WITH_PARTITION_STORAGE_ENGINE */
bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL |
MODE_ORACLE | MODE_ORACLE |
MODE_MSSQL | MODE_MSSQL |
@ -1378,7 +1380,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
packet->append(STRING_WITH_LEN("\n)")); packet->append(STRING_WITH_LEN("\n)"));
if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode) if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode)
{ {
#ifdef WITH_PARTITION_STORAGE_ENGINE
show_table_options= TRUE; show_table_options= TRUE;
#endif /* WITH_PARTITION_STORAGE_ENGINE */
/* TABLESPACE and STORAGE */ /* TABLESPACE and STORAGE */
if (share->tablespace || if (share->tablespace ||