bk commit into 5.0 tree (ingo:1.1913)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.1913 05/08/29 21:06:45 ingo@stripped +3 -0
  After merge fix.

  mysql-test/t/key.test
    1.24 05/08/29 21:06:39 ingo@stripped +3 -0
    After merge fix.

  mysql-test/r/key.result
    1.28 05/08/29 21:06:39 ingo@stripped +1 -0
    After merge fix.

  mysql-test/r/innodb.result
    1.130 05/08/29 21:06:39 ingo@stripped +1 -1
    After merge fix.
    Test for bug 11816 has four more inserts.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-5000

--- 1.129/mysql-test/r/innodb.result	2005-08-29 18:18:24 +02:00
+++ 1.130/mysql-test/r/innodb.result	2005-08-29 21:06:39 +02:00
@@ -1765,7 +1765,7 @@
 Innodb_rows_deleted	2070
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	31718
+Innodb_rows_inserted	31722
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530

--- 1.27/mysql-test/r/key.result	2005-08-29 18:18:24 +02:00
+++ 1.28/mysql-test/r/key.result	2005-08-29 21:06:39 +02:00
@@ -345,6 +345,7 @@
 2	 		Test String
 3	 
 	Test String
+drop table t1;
 create table t1 (a varchar(10), b varchar(10), key(a(10),b(10)));
 show create table t1;
 Table	Create Table

--- 1.23/mysql-test/t/key.test	2005-08-29 18:18:25 +02:00
+++ 1.24/mysql-test/t/key.test	2005-08-29 21:06:39 +02:00
@@ -340,6 +340,9 @@
 insert into t1 values (3,' \n\tTest String');
 update t1 set c2 = 'New Test String' where c1 = 1;
 select * from t1;
+drop table t1;
+
+#
 # If we use a partial field for a key that is actually the length of the
 # field, and we extend the field, we end up with a key that includes the
 # whole new length of the field.