bk commit into 5.1 tree (msvensson:1.2162)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2162 06/05/18 19:16:51 msvensson@shellback.(none) +4 -0
  Moving test that requires innodb to partition_innodb

  mysql-test/t/partition_innodb.test
    1.1 06/05/18 19:16:42 msvensson@shellback.(none) +9 -0
    New BitKeeper file ``mysql-test/t/partition_innodb.test''

  mysql-test/r/partition_innodb.result
    1.1 06/05/18 19:16:42 msvensson@shellback.(none) +5 -0
    New BitKeeper file ``mysql-test/r/partition_innodb.result''

  mysql-test/t/partition_innodb.test
    1.0 06/05/18 19:16:42 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/t/partition_innodb.test

  mysql-test/t/partition.test
    1.42 06/05/18 19:16:42 msvensson@shellback.(none) +0 -7
    Moving test that requires innodb to partition_innodb

  mysql-test/r/partition_innodb.result
    1.0 06/05/18 19:16:42 msvensson@shellback.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.1-new-maint/mysql-test/r/partition_innodb.result

  mysql-test/r/partition.result
    1.43 06/05/18 19:16:42 msvensson@shellback.(none) +0 -5
    Moving test that requires innodb to partition_innodb

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.42/mysql-test/r/partition.result	2006-05-13 07:29:56 +02:00
+++ 1.43/mysql-test/r/partition.result	2006-05-18 19:16:42 +02:00
@@ -643,11 +643,6 @@
 alter table t1 rebuild partition;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 drop table t1;
-create table t1 (a int) engine=innodb partition by hash(a) ;
-show table status like 't1';
-Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
-t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
-drop table t1;
 create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));
 insert into t2 values (null),(null),(null);
 select * from t2;

--- 1.41/mysql-test/t/partition.test	2006-05-12 21:42:22 +02:00
+++ 1.42/mysql-test/t/partition.test	2006-05-18 19:16:42 +02:00
@@ -757,13 +757,6 @@
 drop table t1;
 
 #
-# Bug #14673: Wrong InnoDB default row format
-#
-create table t1 (a int) engine=innodb partition by hash(a) ;
-show table status like 't1';
-drop table t1;
-
-#
 # Bug #14526: Partitions: indexed searches fail
 #
 create table t2 (s1 int not null auto_increment, primary key (s1)) partition by list (s1) (partition p1 values in (1),partition p2 values in (2),partition p3 values in (3),partition p4 values in (4));
--- New file ---
+++ mysql-test/r/partition_innodb.result	06/05/18 19:16:42
create table t1 (a int) engine=innodb partition by hash(a) ;
show table status like 't1';
Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
t1	InnoDB	10	Compact	2	8192	16384	0	0	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL	partitioned	
drop table t1;

--- New file ---
+++ mysql-test/t/partition_innodb.test	06/05/18 19:16:42
--source include/have_innodb.inc

#
# Bug #14673: Wrong InnoDB default row format
#
create table t1 (a int) engine=innodb partition by hash(a) ;
show table status like 't1';
drop table t1;