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

[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-04-07 15:40:45+02:00, hakank@stripped +9 -0
  Mantis bug number to bugs.mysql.com bug number renaming.

  BitKeeper/deleted/.del-falcon_bug_136.result@stripped, 2007-04-07 15:39:03+02:00,
hakank@stripped +0 -0
    Delete: mysql-test/r/falcon_bug_136.result

  BitKeeper/deleted/.del-falcon_bug_136.test@stripped, 2007-04-07 15:38:58+02:00,
hakank@stripped +0 -0
    Delete: mysql-test/t/falcon_bug_136.test

  mysql-test/r/falcon_bug_27696.result@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +1 -1
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/r/falcon_bug_27696.result@stripped, 2007-04-07 14:40:51+02:00,
hakank@stripped +0 -0
    Rename: mysql-test/r/falcon_bug_134.result -> mysql-test/r/falcon_bug_27696.result

  mysql-test/r/falcon_bug_27697.result@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +11 -2
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/r/falcon_bug_27697.result@stripped, 2007-04-07 15:18:53+02:00,
hakank@stripped +0 -0
    Rename: mysql-test/r/falcon_bug_135.result -> mysql-test/r/falcon_bug_27697.result

  mysql-test/r/falcon_bugs.result@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +1 -17
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/t/disabled.def@stripped, 2007-04-07 15:40:43+02:00, hakank@stripped
+1 -4
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/t/falcon_bug_27696.test@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +2 -2
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/t/falcon_bug_27696.test@stripped, 2007-04-07 14:40:38+02:00,
hakank@stripped +0 -0
    Rename: mysql-test/t/falcon_bug_134.test -> mysql-test/t/falcon_bug_27696.test

  mysql-test/t/falcon_bug_27697.test@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +25 -4
    Mantis bug number to bugs.mysql.com bug number renaming.

  mysql-test/t/falcon_bug_27697.test@stripped, 2007-04-07 15:18:35+02:00,
hakank@stripped +0 -0
    Rename: mysql-test/t/falcon_bug_135.test -> mysql-test/t/falcon_bug_27697.test

  mysql-test/t/falcon_bugs.test@stripped, 2007-04-07 15:40:43+02:00,
hakank@stripped +2 -24
    Mantis bug number to bugs.mysql.com bug number renaming.

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

--- 1.1/mysql-test/r/falcon_bug_134.result	2006-07-18 19:43:25 +02:00
+++ 1.3/mysql-test/r/falcon_bug_27696.result	2007-04-07 15:40:43 +02:00
@@ -1,5 +1,5 @@
 SET STORAGE_ENGINE = Falcon;
-*** Bug #134 ***
+*** Bug #27696 ***
 SET NAMES UTF8;
 DROP TABLE IF EXISTS ä;
 DROP TABLE IF EXISTS ı;

--- 1.1/mysql-test/r/falcon_bug_135.result	2006-07-18 19:43:29 +02:00
+++ 1.3/mysql-test/r/falcon_bug_27697.result	2007-04-07 15:40:43 +02:00
@@ -1,5 +1,5 @@
-SET STORAGE_ENGINE = Falcon;
-*** Bug #135 ***
+*** Bug #27697 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS i;
 SET NAMES utf8;
 CREATE TABLE i (
@@ -9,8 +9,17 @@
 SELECT * FROM i WHERE i = 'i';
 i
 i
+SELECT * FROM i where i = 'I';
+i
+ı
 CREATE INDEX i ON i (i);
 SELECT * FROM i WHERE i = 'i';
 i
 i
+SELECT * FROM i where i = 'I';
+i
+ı
+SELECT count(*) FROM i;
+count(*)
+2
 DROP TABLE i;

--- 1.1/mysql-test/t/falcon_bug_134.test	2006-07-18 19:42:27 +02:00
+++ 1.3/mysql-test/t/falcon_bug_27696.test	2007-04-07 15:40:43 +02:00
@@ -1,8 +1,8 @@
 SET STORAGE_ENGINE = Falcon;
 #
-# Mantis bug #134: Tables with non-ASCII names can't be created
+# Bug #27696: Tables with non-ASCII names can't be created
 #
---echo *** Bug #134 ***
+--echo *** Bug #27696 ***
 SET NAMES UTF8;
 --disable_warnings
 DROP TABLE IF EXISTS ä;

--- 1.1/mysql-test/t/falcon_bug_135.test	2006-07-18 19:42:23 +02:00
+++ 1.3/mysql-test/t/falcon_bug_27697.test	2007-04-07 15:40:43 +02:00
@@ -1,8 +1,14 @@
-SET STORAGE_ENGINE = Falcon;
 #
-# Mantis bug #135: Non-western-collation searches fail if index exists
+# Bug #27697: Non-western-collation searches fail if index exists
 #
---echo *** Bug #135 ***
+--echo *** Bug #27697 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS i;
 --enable_warnings
@@ -12,9 +18,24 @@
   i char(1) CHARACTER SET utf8 COLLATE utf8_turkish_ci
 );
 INSERT INTO i VALUES ('i'),('ı');
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 SELECT * FROM i WHERE i = 'i';
+SELECT * FROM i where i = 'I';
+
 CREATE INDEX i ON i (i);
+
 SELECT * FROM i WHERE i = 'i';
+SELECT * FROM i where i = 'I';
+
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM i;
 
-# Final cleanup
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE i;

--- 1.33/mysql-test/r/falcon_bugs.result	2007-01-25 01:28:16 +01:00
+++ 1.34/mysql-test/r/falcon_bugs.result	2007-04-07 15:40:43 +02:00
@@ -32780,7 +32780,7 @@
 Warnings:
 Warning	1548	Leading spaces are removed from name ' '
 DROP VIEW v5y;
-*** Bug #134 ***
+*** Bug #27696 ***
 SET @@storage_engine = Falcon;
 SET names utf8;
 DROP TABLE IF EXISTS ä;
@@ -32789,22 +32789,6 @@
 CREATE TABLE ı (ı int);
 DROP TABLE ä;
 DROP TABLE ı;
-*** Bug #135 ***
-SET @@storage_engine = Falcon;
-DROP TABLE IF EXISTS i;
-SET names utf8;
-CREATE TABLE i (
-i char(1) CHARACTER SET utf8 COLLATE utf8_turkish_ci
-);
-INSERT INTO i VALUES ('i'),('ı');
-SELECT * FROM i WHERE i = 'i';
-i
-i
-CREATE INDEX i ON i (i);
-SELECT * FROM i WHERE i = 'i';
-i
-i
-DROP TABLE i;
 *** Bug #139 ***
 SET @@storage_engine = Falcon;
 DROP TABLE IF EXISTS t3;

--- 1.32/mysql-test/t/falcon_bugs.test	2007-01-27 00:52:49 +01:00
+++ 1.33/mysql-test/t/falcon_bugs.test	2007-04-07 15:40:43 +02:00
@@ -1161,9 +1161,9 @@
 DROP VIEW v5y;
 
 #
-# Mantis bug #134: Tables with non-ASCII names can't be created
+# Bug #27696: Tables with non-ASCII names can't be created
 #
---echo *** Bug #134 ***
+--echo *** Bug #27696 ***
 --source include/initialize_falcon.inc
 SET @@storage_engine = Falcon;
 SET names utf8;
@@ -1178,28 +1178,6 @@
 # Final cleanup.
 DROP TABLE ä;
 DROP TABLE ı;
-
-#
-# Mantis bug #135: Non-western-collation searches fail if index exists
-#
---echo *** Bug #135 ***
---source include/initialize_falcon.inc
-SET @@storage_engine = Falcon;
---disable_warnings
-DROP TABLE IF EXISTS i;
---enable_warnings
-
-SET names utf8;
-CREATE TABLE i (
-  i char(1) CHARACTER SET utf8 COLLATE utf8_turkish_ci
-);
-INSERT INTO i VALUES ('i'),('ı');
-SELECT * FROM i WHERE i = 'i';
-CREATE INDEX i ON i (i);
-SELECT * FROM i WHERE i = 'i';
-
-# Final cleanup.
-DROP TABLE i;
 
 #
 # Mantis bug #139: AND fails if index exists

--- 1.297/mysql-test/t/disabled.def	2007-04-05 16:13:44 +02:00
+++ 1.298/mysql-test/t/disabled.def	2007-04-07 15:40:43 +02:00
@@ -42,10 +42,6 @@
 handler_falcon      :                 2007-01-23 hakank Currently fails
 falcon-deadlock     : Bug JStar#0000222: missing automatic deadlock resolution
 #falcon_temporary_alter: Bug#22089 2006-10-28 hakank (Currently fails on PB)
-falcon_bug_133      : Bug#133 2006-09-28 hakank Trailing space in identifier problem.
Currently investigated.
-#falcon_bug_134      : Bug#134 2006-11-04 hakank Currently fails on PB Windows
-#falcon_bug_135      : Bug#135 2006-12-29 hakank Fails on PB Windows
-falcon_bug_136      : Bug#136 2006-08-24 hakank BUG#19733
 #falcon_bug_22089    : Bug#22089  2006-11-08 hakank Currently fails on PB
 falcon_bug_22144    : Bug#22144  2006-08-24 hakank Get pushbuild green
 falcon_bug_22151    : Bug#22151 2006-08-24 hakank (Get pushbuild green)
@@ -82,6 +78,7 @@
 falcon_bug_27350    : Bug#27350 2007-03-23 hakank Currently failing
 falcon_bug_27357    : Bug#27357 2007-03-23 hakank Currently failing
 falcon_bug_27426    : Bug#27426 2007-03-27 hakank Currently failing
+falcon_bug_27697    : Bug#27697 2007-04-07 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
 read_many_rows_falcon : Bug#23783 2006-10-30 ML Get pushbuild green