From 5df64b263c5a6a809ec2ad8f4d0820cb7b864d98 Mon Sep 17 00:00:00 2001
From: unknown <gluh@eagle.intranet.mysql.r18.ru>
Date: Wed, 11 Jan 2006 15:04:18 +0400
Subject: [PATCH 1/2]   Additional fix for wl#2506

mysql-test/extra/binlog_tests/ctype_cp932.test:
    fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
    fixed test result
mysql-test/t/ctype_ucs.test:
    fixed test case
sql/sql_show.cc:
   Compilation with disabled partitioning is fixed
---
 mysql-test/extra/binlog_tests/ctype_cp932.test | 1 +
 mysql-test/r/binlog_stm_ctype_cp932.result     | 1 +
 mysql-test/t/ctype_ucs.test                    | 2 ++
 sql/sql_show.cc                                | 7 ++++++-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/mysql-test/extra/binlog_tests/ctype_cp932.test b/mysql-test/extra/binlog_tests/ctype_cp932.test
index ab1dd6d0108..ac90ceabf23 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 146fb2ca2d5..470ae3b5ab2 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 04de13f8228..d4ea8dd57ad 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 404a47a8dba..aaaaead8a82 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))

From 5c4a94b903067f47bea726a779c6a5c79f766649 Mon Sep 17 00:00:00 2001
From: unknown <jonas@perch.ndb.mysql.com>
Date: Wed, 11 Jan 2006 12:39:09 +0100
Subject: [PATCH 2/2] Fix handlerton alter_tablespace for example storage
 engine

---
 storage/example/ha_example.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 10eadf2c7a9..f4b1276198d 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -103,6 +103,7 @@ handlerton example_hton= {
   NULL,    /* Start Consistent Snapshot */
   NULL,    /* Flush logs */
   NULL,    /* Show status */
+  NULL,    /* Alter tablespace */
   HTON_CAN_RECREATE
 };