bk commit into 5.1 tree (msvensson:1.2388)

[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.2388 06/05/18 12:55:34 msvensson@shellback.(none) +4 -0
  Move innodb dependent test from create to mysql_innodb

  mysql-test/t/innodb_mysql.test
    1.4 06/05/18 12:55:25 msvensson@shellback.(none) +9 -0
    Move innodb dependent test from create to mysql_innodb

  mysql-test/t/create.test
    1.80 06/05/18 12:55:25 msvensson@shellback.(none) +0 -7
    Move innodb dependent test from create to mysql_innodb

  mysql-test/r/innodb_mysql.result
    1.4 06/05/18 12:55:25 msvensson@shellback.(none) +6 -0
    Move innodb dependent test from create to mysql_innodb

  mysql-test/r/create.result
    1.119 06/05/18 12:53:40 msvensson@shellback.(none) +0 -6
    Move innodb dependent test from create to mysql_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.3/mysql-test/r/innodb_mysql.result	2006-05-06 11:14:49 +02:00
+++ 1.4/mysql-test/r/innodb_mysql.result	2006-05-18 12:55:25 +02:00
@@ -54,3 +54,9 @@
 slai_id
 12
 drop table t1, t2;
+create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
+character set utf8 collate utf8_general_ci;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 765 bytes
+insert into t1 values('aaa');
+drop table t1;

--- 1.3/mysql-test/t/innodb_mysql.test	2006-05-06 11:14:50 +02:00
+++ 1.4/mysql-test/t/innodb_mysql.test	2006-05-18 12:55:25 +02:00
@@ -57,3 +57,12 @@
   c.c_id = 218 and expiredate is null;
 
 drop table t1, t2;
+
+
+#
+# Bug#17530: Incorrect key truncation on table creation caused server crash.
+#
+create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
+  character set utf8 collate utf8_general_ci;
+insert into t1 values('aaa');
+drop table t1;

--- 1.118/mysql-test/r/create.result	2006-03-31 10:17:36 +02:00
+++ 1.119/mysql-test/r/create.result	2006-05-18 12:53:40 +02:00
@@ -772,9 +772,3 @@
   `i` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
 drop table t1;
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
-character set utf8 collate utf8_general_ci;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 765 bytes
-insert into t1 values('aaa');
-drop table t1;

--- 1.79/mysql-test/t/create.test	2006-03-31 10:17:36 +02:00
+++ 1.80/mysql-test/t/create.test	2006-05-18 12:55:25 +02:00
@@ -667,12 +667,5 @@
 show create table t1;
 drop table t1;
 
-#
-# Bug#17530: Incorrect key truncation on table creation caused server crash.
-#
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
-  character set utf8 collate utf8_general_ci;
-insert into t1 values('aaa');
-drop table t1;
 
 # End of 5.0 tests