bk commit into 5.1 tree (mikron:1.1958)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron 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.1958 05/11/14 21:51:18 mikron@stripped +3 -0
  WL #2604: Partition Management
  One more patch

  sql/ha_partition.cc
    1.10 05/11/14 21:51:08 mikron@stripped +1 -1
    Fix

  mysql-test/t/partition.test
    1.7 05/11/14 21:51:08 mikron@stripped +35 -0
    New test case

  mysql-test/r/partition.result
    1.7 05/11/14 21:51:07 mikron@stripped +23 -0
    New 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:	mikron
# Host:	c-430be253.1238-1-64736c10.cust.bredbandsbolaget.se
# Root:	/Users/mikron/wl2604_new

--- 1.6/mysql-test/r/partition.result	2005-11-14 15:16:25 +01:00
+++ 1.7/mysql-test/r/partition.result	2005-11-14 21:51:07 +01:00
@@ -220,3 +220,26 @@
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	OK
 drop table t1;
+CREATE TABLE t1 (a int)
+PARTITION BY HASH(a)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 PARTITION BY HASH (a) PARTITIONS 5 
+drop table t1;
+CREATE TABLE t1 (a int)
+PARTITION BY RANGE (a)
+(PARTITION x1 VALUES LESS THAN (2));
+insert into t1 values (1);
+update t1 set a = 5;
+ERROR HY000: Got error 1 from storage engine
+drop table t1;
+CREATE TABLE t1 (a int)
+PARTITION BY LIST (a)
+(PARTITION x1 VALUES IN (10), PARTITION x2 VALUES IN (20));
+analyze table t1;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	OK
+drop table t1;

--- 1.6/mysql-test/t/partition.test	2005-11-14 15:16:25 +01:00
+++ 1.7/mysql-test/t/partition.test	2005-11-14 21:51:08 +01:00
@@ -289,3 +289,38 @@
 
 drop table t1;
 
+#
+# Bug 14327: PARTITIONS clause gets lost in SHOW CREATE TABLE
+#
+CREATE TABLE t1 (a int)
+PARTITION BY HASH(a)
+PARTITIONS 5;
+
+SHOW CREATE TABLE t1;
+
+drop table t1;
+
+#
+# Bug #13446: Update to value outside of list values doesn't give error
+#
+CREATE TABLE t1 (a int)
+PARTITION BY RANGE (a)
+(PARTITION x1 VALUES LESS THAN (2));
+
+insert into t1 values (1);
+--error 1030
+update t1 set a = 5;
+
+drop table t1;
+
+#
+# Bug #13441: Analyze on partitioned table didn't work
+#
+CREATE TABLE t1 (a int)
+PARTITION BY LIST (a)
+(PARTITION x1 VALUES IN (10), PARTITION x2 VALUES IN (20));
+
+analyze table t1;
+
+drop table t1;
+

--- 1.9/sql/ha_partition.cc	2005-11-14 15:16:27 +01:00
+++ 1.10/sql/ha_partition.cc	2005-11-14 21:51:08 +01:00
@@ -722,7 +722,7 @@
                      part));
           if ((error= handle_opt_part(thd, check_opt, m_file[part], flag)))
           {
-            print_error(error, MYF(0));
+            m_file[part]->print_error(error, MYF(0));
             DBUG_RETURN(TRUE);
           }
         } while (++j < no_subparts);