diff --git a/mysql-test/extra/binlog_tests/ctype_cp932.test b/mysql-test/extra/binlog_tests/ctype_cp932.test index ab1dd6d01088bdd8cf1ca991f9c5a966202e9ed4..ac90ceabf236f4946d839ecc8f92880be186aada 100644 --- a/mysql-test/extra/binlog_tests/ctype_cp932.test +++ b/mysql-test/extra/binlog_tests/ctype_cp932.test @@ -434,3 +434,4 @@ insert into t1 values ('ab'); select * from t1; insert into t1 values ('abc'); select * from t1; +drop table t1; diff --git a/mysql-test/r/binlog_stm_ctype_cp932.result b/mysql-test/r/binlog_stm_ctype_cp932.result index 146fb2ca2d5ba15e03e5422025bb9e636eb5120b..470ae3b5ab239b854b3bd2ad2ec198d1f824e113 100755 --- a/mysql-test/r/binlog_stm_ctype_cp932.result +++ b/mysql-test/r/binlog_stm_ctype_cp932.result @@ -11366,3 +11366,4 @@ col1 a a a +drop table t1; diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index 04de13f822823435d2fdb55a36e8c2d82791b472..d4ea8dd57adb3f7f774b46eba84e8c67ecbea70a 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -424,7 +424,9 @@ drop table t1; # # Bug #14583 Bug on query using a LIKE on indexed field with ucs2_bin collation # +--disable_warnings create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB; +--enable_warnings insert into t1 values('a'); create index t1f1 on t1(f1); select f1 from t1 where f1 like 'a%'; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 404a47a8dba36e3560d3bd0a6614c1b17b24f0de..aaaaead8a82ea2b2b480b1de6c025738128a46f5 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3582,18 +3582,22 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables, TIME time; TABLE *show_table= tables->table; handler *file= show_table->file; +#ifdef WITH_PARTITION_STORAGE_ENGINE partition_info *part_info= show_table->part_info; +#endif DBUG_ENTER("get_schema_partitions_record"); if (res) { +#ifdef WITH_PARTITION_STORAGE_ENGINE if (part_info) push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, thd->net.last_errno, thd->net.last_error); +#endif thd->clear_error(); DBUG_RETURN(0); } - +#ifdef WITH_PARTITION_STORAGE_ENGINE if (part_info) { partition_element *part_elem; @@ -3750,6 +3754,7 @@ static int get_schema_partitions_record(THD *thd, struct st_table_list *tables, DBUG_RETURN(0); } else +#endif { store_schema_partitions_record(thd, table, 0, file, 0); if(schema_table_store_record(thd, table))