diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2012-02-16 11:19:19 +0100 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2012-02-16 11:19:19 +0100 |
| commit | 62bf500cf22145402e8b9e04dd986560c9c14136 (patch) | |
| tree | 2726af6950623382983f0f31aaffae75347aa120 | |
| parent | 7a35cb91500a69c479c8eabc5d81e896d4401dd2 (diff) | |
| parent | ee9359840f659ce15a27aee1b2133e6f56b0b304 (diff) | |
| download | mariadb-git-62bf500cf22145402e8b9e04dd986560c9c14136.tar.gz | |
Merge
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb_bug53756.test | 6 | ||||
| -rw-r--r-- | sql/sql_show.cc | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/innodb_bug53756.test b/mysql-test/suite/innodb/t/innodb_bug53756.test index ae23e9d41a3..6f8fd70ecad 100644 --- a/mysql-test/suite/innodb/t/innodb_bug53756.test +++ b/mysql-test/suite/innodb/t/innodb_bug53756.test @@ -139,6 +139,9 @@ INSERT INTO bug_53756 VALUES (666,666); # Request a crash on next execution of commit. 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. --error 2013 COMMIT; @@ -154,9 +157,6 @@ COMMIT; --echo # --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 --enable_reconnect # diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 887115b38ad..d7462e65ce7 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -1162,7 +1162,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, handler *file= table->file; TABLE_SHARE *share= table->s; HA_CREATE_INFO create_info; +#ifdef WITH_PARTITION_STORAGE_ENGINE bool show_table_options= FALSE; +#endif /* WITH_PARTITION_STORAGE_ENGINE */ bool foreign_db_mode= (thd->variables.sql_mode & (MODE_POSTGRESQL | MODE_ORACLE | MODE_MSSQL | @@ -1378,7 +1380,9 @@ int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet, packet->append(STRING_WITH_LEN("\n)")); if (!(thd->variables.sql_mode & MODE_NO_TABLE_OPTIONS) && !foreign_db_mode) { +#ifdef WITH_PARTITION_STORAGE_ENGINE show_table_options= TRUE; +#endif /* WITH_PARTITION_STORAGE_ENGINE */ /* TABLESPACE and STORAGE */ if (share->tablespace || |