MySQL Lists: commits: bzr push into mysql-6.0-falcon branch (hky:2819 to 2822)

List:	Commits	« Previous Message Next Message »
From:	Hakan Kuecuekyilmaz	Date:	September 14 2008 7:32pm
Subject:	bzr push into mysql-6.0-falcon branch (hky:2819 to 2822)
View as plain text
 2822 Hakan Kuecuekyilmaz	2008-09-14
      Rescued another test from falcon_team suite.
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_30826.result => mysql-test/suite/falcon/r/falcon_bug_30826.result
  mysql-test/suite/falcon_team/t/falcon_bug_30826.test => mysql-test/suite/falcon/t/falcon_bug_30826.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_30826.result
  mysql-test/suite/falcon/t/falcon_bug_30826.test

 2821 Hakan Kuecuekyilmaz	2008-09-13
      Rescued another test from falcon_team suite.
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result => mysql-test/suite/falcon/r/falcon_bug_30480_B.result
  mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test => mysql-test/suite/falcon/t/falcon_bug_30480_B.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_30480_B.result
  mysql-test/suite/falcon/t/falcon_bug_30480_B.test

 2820 Hakan Kuecuekyilmaz	2008-09-13
      Rescued another test from falcon_team suite.
renamed:
  mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result => mysql-test/suite/falcon/r/falcon_bug_30480_A.result
  mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test => mysql-test/suite/falcon/t/falcon_bug_30480_A.test
modified:
  mysql-test/suite/falcon/r/falcon_bug_30480_A.result
  mysql-test/suite/falcon/t/falcon_bug_30480_A.test

 2819 Vladislav Vaintroub	2008-09-12
      Bug#39421 - messages during recovery about exceptions from ReadFile.
      Fix:
      Ignore ERROR_HANDLE_EOF coming from ReadFile(). Read should just return 0 
      like it does in Posix case.
modified:
  storage/falcon/SerialLogFile.cpp

=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result' => 'mysql-test/suite/falcon/r/falcon_bug_30480_A.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result	2008-04-23 08:50:47 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30480_A.result	2008-09-12 23:28:15 +0000
@@ -1,21 +1,18 @@
-SET storage_engine = Falcon;
 *** Bug #30480 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1);
 SET NAMES utf8;
-CREATE INDEX id on t1 (s1);
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1)) partition by key(s1);
 INSERT INTO t1 VALUES (0x8e);
 INSERT INTO t1 VALUES ('AA');
+INSERT INTO t2 VALUES (0x8e);
+INSERT INTO t2 VALUES ('AA');
 SELECT s1, HEX(s1) FROM t1;
 s1	HEX(s1)
 Ž	8E
 AA	4141
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1) partition by key(s1);
-SET NAMES utf8;
-CREATE INDEX id on t2 (s1);
-INSERT INTO t2 VALUES (0x8e);
-INSERT INTO t2 VALUES ('AA');
 SELECT s1, HEX(s1) FROM t2;
 s1	HEX(s1)
 Ž	8E
@@ -26,4 +23,11 @@ AA	4141
 SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'A%';
 s1	HEX(s1)
 AA	4141
+SELECT count(*) FROM t1;
+count(*)
+2
+SELECT count(*) FROM t2;
+count(*)
+2
 DROP TABLE t1;
+DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result' => 'mysql-test/suite/falcon/r/falcon_bug_30480_B.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30480_B.result	2008-09-12 23:44:47 +0000
@@ -1,11 +1,12 @@
-SET storage_engine = Falcon;
 *** Bug #30480 ***
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
 SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
 SELECT s1, HEX(s1) FROM t1;
 s1	HEX(s1)
 c	0063
@@ -17,10 +18,6 @@ s1	HEX(s1)
 SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
 s1	HEX(s1)
 Ã	00C3
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
 SELECT s1, HEX(s1) FROM t2;
 s1	HEX(s1)
 c	0063
@@ -32,5 +29,11 @@ s1	HEX(s1)
 SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
 s1	HEX(s1)
 Ã	00C3
+SELECT count(*) FROM t1;
+count(*)
+3
+SELECT count(*) FROM t2;
+count(*)
+3
 DROP TABLE t1;
 DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/r/falcon_bug_30826.result' => 'mysql-test/suite/falcon/r/falcon_bug_30826.result'
--- a/mysql-test/suite/falcon_team/r/falcon_bug_30826.result	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/r/falcon_bug_30826.result	2008-09-14 14:09:45 +0000
@@ -1,20 +1,27 @@
 *** Bug #30826 ***
-SET @@storage_engine = Falcon;
+SET @@storage_engine = 'Falcon';
 DROP TABLE IF EXISTS t1;
 ------- Test 1 - optimize with records  -------
-CREATE TABLE  t1 (PRIMARY KEY  (`id`), 
-`id` BIGINT NOT NULL  AUTO_INCREMENT ,
-`field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE  t1 (
+`id` BIGINT NOT NULL  AUTO_INCREMENT PRIMARY KEY,
+`field1` CHAR(50) NOT NULL)
 PARTITION BY Hash (id) PARTITIONS 4;
 INSERT INTO t1 (`id`, `field1`) VALUES('3','value3');
 INSERT INTO t1 (`id`, `field1`) VALUES('5','value5');
 INSERT INTO t1 (`id`, `field1`) VALUES('7','value7');
 ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
+SELECT count(*) FROM t1;
+count(*)
+3
 ------- Test 2 - optimize without records ------
 DROP TABLE t1;
-CREATE TABLE  t1 (PRIMARY KEY  (`id`), 
-`id` BIGINT NOT NULL  AUTO_INCREMENT ,
-`field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE  t1 (
+`id` BIGINT NOT NULL  AUTO_INCREMENT PRIMARY KEY,
+`field1` CHAR(50) NOT NULL)
 PARTITION BY Hash (id) PARTITIONS 4;
 ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
 DROP TABLE t1;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test' => 'mysql-test/suite/falcon/t/falcon_bug_30480_A.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30480_A.test	2008-09-12 23:28:15 +0000
@@ -1,45 +1,46 @@
 --source include/have_falcon.inc
---disable_abort_on_error
-SET storage_engine = Falcon;
+
 #
 # Bug #30480: Falcon: searches fail if LIKE and key partition
 #
 --echo *** Bug #30480 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 --enable_warnings
 
-###########################################################################
-# Description:
-# create a Falcon table with a latin1 column with a default collation.
-# The table is partitioned and indexed.
-# insert two rows, containing '� and 'AA'.
-# search for LIKE 'A%'.
-# get no rows, even though I inserted 'AA'.
-#
-# The result is similar to Bug#28527
-# But Bug#28527 requires an ascii() function, which should soon be
-# illegal, so it will probably disappear. 
-# This is different: a key partition, no
-# ascii() function, a non-ASCII value, and a default collation.
-
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1);
 SET NAMES utf8;
-CREATE INDEX id on t1 (s1);
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1, INDEX id (s1)) partition by key(s1);
 INSERT INTO t1 VALUES (0x8e);
 INSERT INTO t1 VALUES ('AA');
-SELECT s1, HEX(s1) FROM t1;
-
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET latin1) partition by key(s1);
-SET NAMES utf8;
-CREATE INDEX id on t2 (s1);
 INSERT INTO t2 VALUES (0x8e);
 INSERT INTO t2 VALUES ('AA');
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
+SELECT s1, HEX(s1) FROM t1;
 SELECT s1, HEX(s1) FROM t2;
 
 SELECT s1, HEX(s1) FROM t1 WHERE s1 like 'A%';
 SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'A%';
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE t1;
+DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test' => 'mysql-test/suite/falcon/t/falcon_bug_30480_B.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test	2008-04-20 00:05:17 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30480_B.test	2008-09-12 23:44:47 +0000
@@ -1,36 +1,46 @@
 --source include/have_falcon.inc
---disable_abort_on_error
-SET storage_engine = Falcon;
+
 #
 # Bug #30480: Falcon: searches fail if LIKE and key partition
 #
 --echo *** Bug #30480 ***
+
+# ----------------------------------------------------- #
+# --- Initialisation                                --- #
+# ----------------------------------------------------- #
+let $engine = 'Falcon';
+eval SET @@storage_engine = $engine;
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 --enable_warnings
 
-###########################################################################
-# Here is another test case, this time with a ucs2 column.
-# The character 'A with tilde', '�, is U+00C3.
-# Both selects should return 0x00c3.
-
-CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2);
-CREATE INDEX i1 on t1 (s1);
-INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
 SET NAMES utf8;
+CREATE TABLE t1 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1));
+CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2, INDEX i1 (s1)) partition by key(s1);
+INSERT INTO t1 VALUES ('c'),('c'),(0x00c3);
+INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
+
+# ----------------------------------------------------- #
+# --- Test                                          --- #
+# ----------------------------------------------------- #
 SELECT s1, HEX(s1) FROM t1;
 SELECT s1, HEX(s1) FROM t1 WHERE s1 like 'Ã%';
 SELECT s1, HEX(s1) FROM t1 WHERE s1 = 'Ã';
 
-CREATE TABLE t2 (s1 varchar(5) CHARACTER SET ucs2) partition by key(s1);
-CREATE INDEX i1 on t2 (s1);
-INSERT INTO t2 VALUES ('c'),('c'),(0x00c3);
-SET NAMES utf8;
 SELECT s1, HEX(s1) FROM t2;
 SELECT s1, HEX(s1) FROM t2 WHERE s1 like 'Ã%';
 SELECT s1, HEX(s1) FROM t2 WHERE s1 = 'Ã';
 
-# Final cleanup.
+# ----------------------------------------------------- #
+# --- Check                                         --- #
+# ----------------------------------------------------- #
+SELECT count(*) FROM t1;
+SELECT count(*) FROM t2;
+
+# ----------------------------------------------------- #
+# --- Final cleanup                                 --- #
+# ----------------------------------------------------- #
 DROP TABLE t1;
 DROP TABLE t2;

=== renamed file 'mysql-test/suite/falcon_team/t/falcon_bug_30826.test' => 'mysql-test/suite/falcon/t/falcon_bug_30826.test'
--- a/mysql-test/suite/falcon_team/t/falcon_bug_30826.test	2008-04-28 21:07:04 +0000
+++ b/mysql-test/suite/falcon/t/falcon_bug_30826.test	2008-09-14 14:09:45 +0000
@@ -1,5 +1,6 @@
 --source include/have_falcon.inc
 --source include/have_partition.inc
+
 #
 # Bug #30826: Falcon: crash if OPTIMIZE PARTITION and no records
 #
@@ -8,7 +9,7 @@
 # ----------------------------------------------------- #
 # --- Initialisation                                --- #
 # ----------------------------------------------------- #
-SET @@storage_engine = Falcon;
+SET @@storage_engine = 'Falcon';
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
@@ -18,37 +19,29 @@ DROP TABLE IF EXISTS t1;
 # --- Test 1 - optimize with records                --- #
 # ----------------------------------------------------- #
 --echo ------- Test 1 - optimize with records  -------
-CREATE TABLE  t1 (PRIMARY KEY  (`id`), 
-   `id` BIGINT NOT NULL  AUTO_INCREMENT ,
-   `field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE  t1 (
+   `id` BIGINT NOT NULL  AUTO_INCREMENT PRIMARY KEY,
+   `field1` CHAR(50) NOT NULL)
    PARTITION BY Hash (id) PARTITIONS 4;
 
 INSERT INTO t1 (`id`, `field1`) VALUES('3','value3');
 INSERT INTO t1 (`id`, `field1`) VALUES('5','value5');
 INSERT INTO t1 (`id`, `field1`) VALUES('7','value7');
 
-#at the moment, alter table returns not implemented, will return 0 after WL#4176 is done
---disable_result_log
---error 0,ER_CHECK_NOT_IMPLEMENTED
 ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
---enable_result_log
+SELECT count(*) FROM t1;
 
 # ----------------------------------------------------- #
-# --- Test 2 - optimize without records                --- #
+# --- Test 2 - optimize without records             --- #
 # ----------------------------------------------------- #
 --echo ------- Test 2 - optimize without records ------
 DROP TABLE t1;
-CREATE TABLE  t1 (PRIMARY KEY  (`id`), 
-   `id` BIGINT NOT NULL  AUTO_INCREMENT ,
-   `field1` CHAR(50) NOT NULL)ENGINE = FALCON
+CREATE TABLE  t1 (
+   `id` BIGINT NOT NULL  AUTO_INCREMENT PRIMARY KEY,
+   `field1` CHAR(50) NOT NULL)
    PARTITION BY Hash (id) PARTITIONS 4;
 
-# This caused Falcon to crash...
-#at the moment, alter table returns not implemented, will return 0 after WL#4176 is done
---disable_result_log
---error 0,ER_CHECK_NOT_IMPLEMENTED
 ALTER TABLE t1 OPTIMIZE PARTITION `p1`;
---enable_result_log
 
 
 # ----------------------------------------------------- #
Thread
• bzr push into mysql-6.0-falcon branch (hky:2819 to 2822)	Hakan Kuecuekyilmaz	14 Sep