Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/home/bkroot/mysql-5.1-new

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;

mysql-test/r/binlog_stm_ctype_cp932.result

@@ -11366,3 +11366,4 @@ col1
 a
 a
 a
+drop table t1;

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%';

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))

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
 };