bk commit into 6.0 tree (hakank:1.2748) BUG#33081

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 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-12-10 11:58:37+01:00, hakank@lu0011.(none) +3 -0
  Added test case for Bug# 33081.

  mysql-test/suite/falcon/r/falcon_bug_33081.result@stripped, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +11 -0
    New BitKeeper file ``mysql-test/suite/falcon/r/falcon_bug_33081.result''

  mysql-test/suite/falcon/r/falcon_bug_33081.result@stripped, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +0 -0

  mysql-test/suite/falcon/t/disabled.def@stripped, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +1 -0
    Bug# 33081 is currently failing.

  mysql-test/suite/falcon/t/falcon_bug_33081.test@stripped, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +34 -0
    New BitKeeper file ``mysql-test/suite/falcon/t/falcon_bug_33081.test''

  mysql-test/suite/falcon/t/falcon_bug_33081.test@stripped, 2007-12-10 11:58:33+01:00, hakank@lu0011.(none) +0 -0

diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_33081.result b/mysql-test/suite/falcon/r/falcon_bug_33081.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/r/falcon_bug_33081.result	2007-12-10 11:58:33 +01:00
@@ -0,0 +1,11 @@
+*** Bug #33081 ***
+SET @@storage_engine = 'Falcon';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a char(5) CHARACTER SET ucs2);
+INSERT INTO t1 (a) VALUES ('a!'), (null);
+CREATE INDEX i1 on t1(a(1));
+ALTER TABLE t1 MODIFY COLUMN a varbinary(20);
+SELECT count(*) FROM t1;
+count(*)
+2
+DROP TABLE t1;
diff -Nrup a/mysql-test/suite/falcon/t/disabled.def b/mysql-test/suite/falcon/t/disabled.def
--- a/mysql-test/suite/falcon/t/disabled.def	2007-12-05 11:04:59 +01:00
+++ b/mysql-test/suite/falcon/t/disabled.def	2007-12-10 11:58:33 +01:00
@@ -35,6 +35,7 @@ falcon_bug_30878    : Bug#30878 2007-09-
 falcon_bug_30480_A  : Bug#30282 2007-09-07 klewis Currently failing
 falcon_bug_30480_B  : Bug#30282 2007-09-07 klewis Currently failing
 falcon_bug_32413    : Bug#32413 2007-11-15 cpowers Does not play nicely with other tests
+falcon_bug_33081    : Bug#33081 2007-12-10 hakank Currently failing
 falcon_page_size_1  : Bug#23220 2007-02-19 hakank Currently failing
 falcon_page_size_2  : Bug#23220 2007-02-19 hakank Currently failing
 falcon_page_size_4  : Bug#32921 2007-12-03 hakank Currently failing
diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_33081.test b/mysql-test/suite/falcon/t/falcon_bug_33081.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/falcon/t/falcon_bug_33081.test	2007-12-10 11:58:33 +01:00
@@ -0,0 +1,34 @@
+--source include/have_falcon.inc
+#
+# Bug #33081: Falcon: crash and database corruption when altering indexed ucs2 column
+#
+--echo *** Bug #33081 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (a char(5) CHARACTER SET ucs2);
+INSERT INTO t1 (a) VALUES ('a!'), (null);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+CREATE INDEX i1 on t1(a(1));
+ALTER TABLE t1 MODIFY COLUMN a varbinary(20);
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
+DROP TABLE t1;