bk commit into 5.1 tree (gluh:1.2191) BUG#15336

[gluh]

Below is the list of changes that have just been committed into a local
5.1 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2191 06/03/20 18:58:21 gluh@stripped +3 -0
  Fix for bug#15336 Partitions: crash if create table as select
    added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()

  sql/ha_partition.cc
    1.39 06/03/20 18:58:09 gluh@stripped +1 -0
    Fix for bug#15336 Partitions: crash if create table as select
      added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()

  mysql-test/t/partition.test
    1.29 06/03/20 18:58:09 gluh@stripped +6 -0
    Fix for bug#15336 Partitions: crash if create table as select
      test case

  mysql-test/r/partition.result
    1.26 06/03/20 18:58:09 gluh@stripped +2 -0
    Fix for bug#15336 Partitions: crash if create table as select
      test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.1-new

--- 1.25/mysql-test/r/partition.result	Mon Mar 20 17:41:38 2006
+++ 1.26/mysql-test/r/partition.result	Mon Mar 20 18:58:09 2006
@@ -562,4 +562,6 @@ partition by list (case when s1 > 'cz' t
 (partition p1 values in (1),
 partition p2 values in (2));
 drop table t1;
+create table t1 (f1 int) partition by hash (f1) as select 1;
+drop table t1;
 End of 5.1 tests

--- 1.28/mysql-test/t/partition.test	Mon Mar 20 17:41:38 2006
+++ 1.29/mysql-test/t/partition.test	Mon Mar 20 18:58:09 2006
@@ -723,4 +723,10 @@ partition by list (case when s1 > 'cz' t
  partition p2 values in (2));
 drop table t1;
 
+#
+# Bug#15336 Partitions: crash if create table as select
+#
+create table t1 (f1 int) partition by hash (f1) as select 1;
+drop table t1;
+
 --echo End of 5.1 tests

--- 1.38/sql/ha_partition.cc	Mon Mar 13 18:15:13 2006
+++ 1.39/sql/ha_partition.cc	Mon Mar 20 18:58:09 2006
@@ -4703,6 +4703,7 @@ int ha_partition::extra(enum ha_extra_fu
     break;
   }
   case HA_EXTRA_NO_CACHE:
+  case HA_EXTRA_WRITE_CACHE:
   {
     m_extra_cache= FALSE;
     m_extra_cache_size= 0;