bk commit into 5.1-falcon tree (hakank:1.2509)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
5.1-falcon repository of hakan. When hakan 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@stripped, 2007-03-28 01:37:48+02:00, hakank@stripped +4 -0
  Adjusted test cases to reflect new INDEX behaviour.

  mysql-test/r/falcon_bug_22161.result@stripped, 2007-03-28 01:37:43+02:00, hakank@stripped +1 -4
    Adjusted test cases to reflect new INDEX behaviour.

  mysql-test/r/falcon_bug_23189.result@stripped, 2007-03-28 01:37:43+02:00, hakank@stripped +0 -3
    Adjusted test cases to reflect new INDEX behaviour.

  mysql-test/t/falcon_bug_22161.test@stripped, 2007-03-28 01:37:43+02:00, hakank@stripped +9 -3
    Adjusted test cases to reflect new INDEX behaviour.

  mysql-test/t/falcon_bug_23189.test@stripped, 2007-03-28 01:37:43+02:00, hakank@stripped +4 -0
    Adjusted test cases to reflect new INDEX behaviour.

# 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:	hakank
# Host:	lu0008.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.7/mysql-test/r/falcon_bug_22161.result	2007-03-28 01:38:01 +02:00
+++ 1.8/mysql-test/r/falcon_bug_22161.result	2007-03-28 01:38:01 +02:00
@@ -1,5 +1,5 @@
 SET storage_engine = Falcon;
-*** Bug #185 ***
+*** Bug #22161 ***
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (a text);
 INSERT INTO t1 VALUES (repeat('a',16384));
@@ -9,7 +9,4 @@ CREATE INDEX i1 ON t1 (a);
 ERROR 42000: BLOB column 'a' can't be used in key specification with the used table type
 ALTER TABLE t1 MODIFY COLUMN a varchar(30000);
 CREATE INDEX i1 ON t1 (a);
-Warnings:
-Warning	1071	Specified key was too long; max key length is 1100 bytes
-Warning	1071	Specified key was too long; max key length is 1100 bytes
 DROP TABLE t1;

--- 1.4/mysql-test/r/falcon_bug_23189.result	2007-03-28 01:38:01 +02:00
+++ 1.5/mysql-test/r/falcon_bug_23189.result	2007-03-28 01:38:01 +02:00
@@ -8,8 +8,5 @@ CREATE INDEX i ON t1 (a);
 CREATE TABLE t2 (a varchar(20000));
 INSERT INTO t2 VALUES (repeat('r',20000));
 CREATE INDEX i ON t2 (a);
-Warnings:
-Warning	1071	Specified key was too long; max key length is 1100 bytes
-Warning	1071	Specified key was too long; max key length is 1100 bytes
 DROP TABLE t1;
 DROP TABLE t2;

--- 1.5/mysql-test/t/falcon_bug_22161.test	2007-03-28 01:38:01 +02:00
+++ 1.6/mysql-test/t/falcon_bug_22161.test	2007-03-28 01:38:01 +02:00
@@ -1,8 +1,8 @@
 SET storage_engine = Falcon;
 #
-# Mantis bug #185: Duplicate key error with non-unique index after alter
+# Bug #22161: Duplicate key error with non-unique index after alter
 #
---echo *** Bug #185 ***
+--echo *** Bug #22161 ***
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
@@ -11,10 +11,16 @@ CREATE TABLE t1 (a text);
 INSERT INTO t1 VALUES (repeat('a',16384));
 ALTER TABLE t1 MODIFY COLUMN a varchar(30000);
 ALTER TABLE t1 MODIFY COLUMN a text;
--- error 1073
+--error 1073
 CREATE INDEX i1 ON t1 (a);
+
 ALTER TABLE t1 MODIFY COLUMN a varchar(30000);
+# FIXME: put in correct error code when we have proper error.
+# Disabling result log because of random string in error message.
+--disable_result_log
+--error 1005
 CREATE INDEX i1 ON t1 (a);
+--enable_result_log
 
 # Final cleanup
 DROP TABLE t1;

--- 1.3/mysql-test/t/falcon_bug_23189.test	2007-03-28 01:38:01 +02:00
+++ 1.4/mysql-test/t/falcon_bug_23189.test	2007-03-28 01:38:01 +02:00
@@ -14,7 +14,11 @@ CREATE INDEX i ON t1 (a);
 
 CREATE TABLE t2 (a varchar(20000));
 INSERT INTO t2 VALUES (repeat('r',20000));
+
+--disable_result_log
+--error 1005
 CREATE INDEX i ON t2 (a);
+--enable_result_log
 
 # Final cleanup.
 DROP TABLE t1;