From: reggie
Date: June 21 2006 10:57pm
Subject: bk commit into 5.1 tree (rburnett:1.2203)
List-Archive: http://lists.mysql.com/commits/8042
Message-Id: <200606212257.k5LMvJg7009874@bk-internal.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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.2203 06/06/22 00:57:12 rburnett@stripped +4 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt

  mysql-test/r/partition.result
    1.43 06/06/22 00:53:30 rburnett@stripped +0 -0
    Auto merged

  mysql-test/r/partition_mgm.result
    1.4 06/06/22 00:56:53 rburnett@stripped +2 -2

  sql/mysql_priv.h
    1.412 06/06/22 00:53:31 rburnett@stripped +0 -0
    Auto merged

  mysql-test/r/partition_error.result
    1.10 06/06/22 00:53:30 rburnett@stripped +0 -0
    Auto merged

# 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:	rburnett
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-kt/RESYNC

--- 1.411/sql/mysql_priv.h	2006-06-19 17:31:26 +02:00
+++ 1.412/sql/mysql_priv.h	2006-06-22 00:53:31 +02:00
@@ -862,7 +862,8 @@
 bool mysql_create_table(THD *thd,const char *db, const char *table_name,
                         HA_CREATE_INFO *create_info,
                         List<create_field> &fields, List<Key> &keys,
-                        bool tmp_table, uint select_field_count);
+                        bool tmp_table, uint select_field_count,
+                        bool use_copy_create_info);
 
 bool mysql_alter_table(THD *thd, char *new_db, char *new_name,
                        HA_CREATE_INFO *create_info,

--- 1.3/mysql-test/r/partition_mgm.result	2006-06-15 16:50:45 +02:00
+++ 1.4/mysql-test/r/partition_mgm.result	2006-06-22 00:56:53 +02:00
@@ -7,6 +7,12 @@
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 2  */
+hello/master-data/test/t1#P#p0.MYD
+hello/master-data/test/t1#P#p0.MYI
+hello/master-data/test/t1#P#p1.MYD
+hello/master-data/test/t1#P#p1.MYI
+hello/master-data/test/t1.frm
+hello/master-data/test/t1.par
 ALTER TABLE t1 COALESCE PARTITION 1;
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -14,3 +20,7 @@
   `f_date` date DEFAULT NULL,
   `f_varchar` varchar(30) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (CAST(YEAR(f_date) AS SIGNED INTEGER)) PARTITIONS 1  */
+hello/master-data/test/t1#P#p0.MYD
+hello/master-data/test/t1#P#p0.MYI
+hello/master-data/test/t1.frm
+hello/master-data/test/t1.par

--- 1.42/mysql-test/r/partition.result	2006-06-15 16:50:45 +02:00
+++ 1.43/mysql-test/r/partition.result	2006-06-22 00:53:30 +02:00
@@ -1,4 +1,18 @@
 drop table if exists t1;
+create table t1 (a int)
+partition by list (a)
+(partition p0 values in (1));
+create procedure pz()
+alter table t1 engine = myisam;
+call pz();
+call pz();
+drop procedure pz;
+drop table t1;
+create table t1 (a int)
+engine = csv
+partition by list (a)
+(partition p0 values in (null));
+ERROR HY000: CSV handler cannot be used in partitioned tables
 create table t1 (a bigint)
 partition by range (a)
 (partition p0 values less than (0xFFFFFFFFFFFFFFFF),

--- 1.9/mysql-test/r/partition_error.result	2006-06-20 22:38:38 +02:00
+++ 1.10/mysql-test/r/partition_error.result	2006-06-22 00:53:30 +02:00
@@ -8,7 +8,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY KEY (a) 
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY KEY (a)  */
 drop table t1;
 create table t1 (a int)
 engine = innodb
@@ -21,7 +21,7 @@
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (0) ENGINE = InnoDB)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 /*!50100 PARTITION BY LIST (a) (PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */
 drop table t1;
 partition by list (a)
 partitions 3