| List: | Commits | « Previous MessageNext Message » | |
| From: | Hakan Kuecuekyilmaz | Date: | February 6 2008 4:21pm |
| Subject: | bk commit into 6.0 tree (hakank:1.2806) | ||
| View as plain text | |||
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, 2008-02-06 16:21:13+01:00, hakank@lu0011.(none) +18 -0 Reworked test case accoring to our test template. Also fixed side effects in some tests. BitKeeper/deleted/.del-falcon_bug_22155.result@stripped, 2008-02-06 12:20:31+01:00, hakank@lu0011.(none) +0 -0 Delete: mysql-test/suite/falcon/r/falcon_bug_22155.result BitKeeper/deleted/.del-falcon_bug_22155.test@stripped, 2008-02-06 12:20:20+01:00, hakank@lu0011.(none) +0 -0 Delete: mysql-test/suite/falcon/t/falcon_bug_22155.test mysql-test/suite/falcon/r/falcon_bug_22156.result@stripped, 2008-02-06 16:21:10+01:00, hakank@lu0011.(none) +1 -1 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22156.result@stripped, 2008-02-06 12:21:48+01:00, hakank@lu0011.(none) +0 -0 Rename: BitKeeper/deleted/.del-falcon_bug_22156.result -> mysql-test/suite/falcon/r/falcon_bug_22156.result BitKeeper/deleted/.del-falcon_bug_22156.result@stripped, 2008-02-06 12:18:43+01:00, hakank@lu0011.(none) +0 -0 Delete: mysql-test/suite/falcon/r/falcon_bug_22156.result mysql-test/suite/falcon/r/falcon_bug_22160.result@stripped, 2008-02-06 16:21:10+01:00, hakank@lu0011.(none) +14 -5 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22161.result@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +4 -1 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22164.result@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +14 -12 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22165.result@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +10 -9 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22166.result@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +8 -3 Adjusted result file. mysql-test/suite/falcon/r/falcon_bug_22167.result@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +32 -18 Adjusted result file. mysql-test/suite/falcon/t/disabled.def@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +1 -2 Removed duplicate test case. mysql-test/suite/falcon/t/falcon_bug_22156.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +19 -2 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22156.test@stripped, 2008-02-06 12:21:59+01:00, hakank@lu0011.(none) +0 -0 Rename: BitKeeper/deleted/.del-falcon_bug_22156.test -> mysql-test/suite/falcon/t/falcon_bug_22156.test BitKeeper/deleted/.del-falcon_bug_22156.test@stripped, 2008-02-06 12:18:35+01:00, hakank@lu0011.(none) +0 -0 Delete: mysql-test/suite/falcon/t/falcon_bug_22156.test mysql-test/suite/falcon/t/falcon_bug_22160.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +31 -10 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22161.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +19 -2 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22164.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +33 -26 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22165.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +12 -10 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22166.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +22 -5 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_22167.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +53 -35 Reworked test case accoring to our test template. mysql-test/suite/falcon/t/falcon_bug_32413.test@stripped, 2008-02-06 16:21:11+01:00, hakank@lu0011.(none) +0 -1 Reworked test case accoring to our test template. diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22155.result b/mysql-test/suite/falcon/r/falcon_bug_22155.result --- a/mysql-test/suite/falcon/r/falcon_bug_22155.result 2007-09-20 17:42:56 +02:00 +++ /dev/null Wed Dec 31 16:00:00 196900 @@ -1,15 +0,0 @@ -SET storage_engine = Falcon; -*** Bug #22155 *** -DROP DATABASE IF EXISTS jstar18; -DROP DATABASE IF EXISTS jstar19; -CREATE SCHEMA jstar18; -CREATE SCHEMA jstar19; -USE jstar18; -CREATE TABLE t1 (s1 int) Engine MyISAM; -RENAME TABLE t1 TO jstar19.t1; -RENAME TABLE jstar19.t1 TO t1; -CREATE TABLE t2 (s1 int); -RENAME TABLE t2 TO jstar19.t2; -RENAME TABLE jstar19.t2 TO t2; -DROP DATABASE jstar18; -DROP DATABASE jstar19; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22156.result b/mysql-test/suite/falcon/r/falcon_bug_22156.result --- a/mysql-test/suite/falcon/r/falcon_bug_22156.result 2007-09-20 17:42:56 +02:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22156.result 2008-02-06 16:21:10 +01:00 @@ -1,5 +1,5 @@ -SET storage_engine = Falcon; *** Bug #22156 *** +SET @@storage_engine = 'Falcon'; DROP DATABASE IF EXISTS TEST_DB; DROP DATABASE IF EXISTS test_db; CREATE SCHEMA test_db; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22160.result b/mysql-test/suite/falcon/r/falcon_bug_22160.result --- a/mysql-test/suite/falcon/r/falcon_bug_22160.result 2007-11-21 06:37:47 +01:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22160.result 2008-02-06 16:21:10 +01:00 @@ -1,23 +1,32 @@ -SET @@storage_engine = Falcon; *** Bug #22160 *** +SET @@storage_engine = 'Falcon'; +SELECT @@GLOBAL.falcon_consistent_read INTO @previous_falcon_consistent_read; SET TRANSACTION ISOLATION LEVEL REPEATABLE READ; -SET GLOBAL FALCON_CONSISTENT_READ=ON; +SET GLOBAL falcon_consistent_read = ON; DROP DATABASE IF EXISTS db64; CREATE DATABASE db64; -SET @@storage_engine = Falcon; USE db64; +# Establish connection conn1 +SET @@storage_engine = 'Falcon'; USE db64; +# Switch to connection default CREATE TABLE t1 (s1 int, primary key (s1)); SET @@autocommit = 0; INSERT INTO t1 VALUES (1); +# Switch to connection conn1 SET @@autocommit = 0; SELECT * FROM t1; s1 +# Switch to connection default COMMIT; +# Switch to connection conn1 REPLACE INTO t1 VALUES (1); ERROR HY000: Record has changed since last read in table 't1' -SELECT * FROM t1; -s1 COMMIT; +# Switch to connection default +SELECT count(*) FROM t1; +count(*) +1 DROP DATABASE db64; +SET GLOBAL falcon_consistent_read = @previous_falcon_consistent_read; USE test; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22161.result b/mysql-test/suite/falcon/r/falcon_bug_22161.result --- a/mysql-test/suite/falcon/r/falcon_bug_22161.result 2007-10-05 18:57:29 +02:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22161.result 2008-02-06 16:21:11 +01:00 @@ -1,5 +1,5 @@ -SET storage_engine = Falcon; *** Bug #22161 *** +SET @@storage_engine = 'Falcon'; DROP TABLE IF EXISTS t1; CREATE TABLE t1 (a text); INSERT INTO t1 VALUES (repeat('a',16384)); @@ -13,4 +13,7 @@ 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 Warning 1071 Specified key was too long; max key length is 1100 bytes +SELECT count(*) FROM t1; +count(*) +1 DROP TABLE t1; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22164.result b/mysql-test/suite/falcon/r/falcon_bug_22164.result --- a/mysql-test/suite/falcon/r/falcon_bug_22164.result 2007-09-20 17:42:57 +02:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22164.result 2008-02-06 16:21:11 +01:00 @@ -1,24 +1,23 @@ -SET @@storage_engine = Falcon; -#---- Bug 22164 ---- +*** Bug #22164 *** +SET @@storage_engine = 'Falcon'; DROP SCHEMA IF EXISTS testdb_2; CREATE SCHEMA testdb_2; -# Establish connection session2 (root) -connect(localhost,root,,test,MYSQL_PORT,MYSQL_SOCK); -SET @@storage_engine = Falcon; +# Establish connection conn1 +SET @@storage_engine = 'Falcon'; USE testdb_2; -#-------- Switch to connection default (root) -------- +# Switch to connection default CREATE TABLE t2 (COL5 BIGINT); GRANT UPDATE (COL5) ON t2 TO testdb_2@localhost; -CREATE TABLE t1( f1 BIGINT); -#-------- Switch to connection session2 (root) -------- +CREATE TABLE t1 (f1 BIGINT); +# Switch to connection conn1 CREATE TABLE t3 (COL5 DECIMAL(7,2)); GRANT ALL PRIVILEGES ON t3 TO root@localhost; -#------- Switch to connection default (root) ------- +# Switch to connection default SET @@autocommit = 0; INSERT INTO testdb_2.t3 SET COL5 = 100.3; SELECT * FROM t1; f1 -INSERT INTO t1 VALUES( 1 ); +INSERT INTO t1 VALUES (1); SELECT * FROM t1; f1 1 @@ -26,9 +25,12 @@ ROLLBACK WORK; # !!! ------- Why do I get a result set after ROLLBACK ? -------- !!! SELECT * FROM t1; f1 -#-------- Switch to connection session2 (root) -------- +SELECT count(*) FROM t1; +count(*) +0 +# Switch to connection conn1 REVOKE ALL PRIVILEGES ON t3 FROM root@localhost; -#------- Switch to connection default (root) ------- +# Switch to connection default REVOKE ALL PRIVILEGES ON t2 FROM testdb_2@localhost; DROP USER testdb_2@localhost; DROP SCHEMA testdb_2; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22165.result b/mysql-test/suite/falcon/r/falcon_bug_22165.result --- a/mysql-test/suite/falcon/r/falcon_bug_22165.result 2008-02-04 17:14:23 +01:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22165.result 2008-02-06 16:21:11 +01:00 @@ -23,12 +23,13 @@ COMMIT; SET v = v + 1; end while; end// -CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp)// -CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1()// -CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1()// -SET GLOBAL event_scheduler = 1// -SET GLOBAL event_scheduler = 0// -DROP EVENT db1.e1// -DROP EVENT db1.e2// -DROP PROCEDURE db1.p1// -DROP DATABASE db1// +CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp); +CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1(); +CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1(); +SET GLOBAL event_scheduler = 1; +SET GLOBAL event_scheduler = 0; +DROP EVENT db1.e1; +DROP EVENT db1.e2; +DROP PROCEDURE db1.p1; +DROP DATABASE db1; +USE test; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22166.result b/mysql-test/suite/falcon/r/falcon_bug_22166.result --- a/mysql-test/suite/falcon/r/falcon_bug_22166.result 2007-09-20 17:42:57 +02:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22166.result 2008-02-06 16:21:11 +01:00 @@ -1,6 +1,11 @@ -SET STORAGE_ENGINE = Falcon; *** Bug #22166 *** -DROP TABLE IF EXISTS t,T; +SET @@storage_engine = 'Falcon'; +DROP TABLE IF EXISTS t; +DROP TABLE IF EXISTS T; CREATE TABLE t(id int); CREATE TABLE T(id int); -DROP TABLE t,T; +SELECT count(*) FROM t; +count(*) +0 +DROP TABLE t; +DROP TABLE T; diff -Nrup a/mysql-test/suite/falcon/r/falcon_bug_22167.result b/mysql-test/suite/falcon/r/falcon_bug_22167.result --- a/mysql-test/suite/falcon/r/falcon_bug_22167.result 2007-09-20 17:42:57 +02:00 +++ b/mysql-test/suite/falcon/r/falcon_bug_22167.result 2008-02-06 16:21:11 +01:00 @@ -1,29 +1,43 @@ -#---- Bug 22167 ---- -SET STORAGE_ENGINE='Falcon'; -drop table if exists t1; -create table t1 (id int not null , +*** Bug #22167 *** +SET @@storage_engine = 'Falcon'; +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; +CREATE TABLE t1 ( +id int not null, name char(20) not null, -primary key (id)); -insert into t1 (id, name) values (1, 'Tim'), (2, 'Monty'); -select id, name from t1 order by id; +primary key (id) +); +CREATE TABLE t2 ( +id int unsigned not null auto_increment, +code tinyint unsigned not null, +name char(20) not null, +primary key (id), +key (code), +unique (name) +); +INSERT INTO t1 (id, name) VALUES (1, 'Tim'), (2, 'Monty'); +SELECT id, name FROM t1 ORDER BY id; id name 1 Tim 2 Monty -update ignore t1 set id = 8, name = 'Sinisa' where id < 3; -select count(*) from t1 where name = 'Sinisa'; +UPDATE IGNORE t1 SET id = 8, name = 'Sinisa' WHERE id < 3; +SELECT count(*) FROM t1 WHERE name = 'Sinisa'; count(*) 1 -drop table t1; -create table t1 (id int unsigned not null auto_increment, -code tinyint unsigned not null, name char(20) not null, -primary key (id), key (code), unique (name)); -insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'); -select id, code, name from t1 order by id; +INSERT INTO t2 (code, name) VALUES (1, 'Tim'), (1, 'Monty'); +SELECT id, code, name FROM t2 ORDER BY id; id code name 1 1 Tim 2 1 Monty -update ignore t1 set id = 8, name = 'Sinisa' where id < 3; -select count(*) from t1 where name = 'Sinisa'; +UPDATE IGNORE t2 SET id = 8, name = 'Sinisa' WHERE id < 3; +SELECT count(*) FROM t2 WHERE name = 'Sinisa'; count(*) 1 -drop table t1; +SELECT count(*) FROM t1; +count(*) +2 +SELECT count(*) FROM t2; +count(*) +2 +DROP TABLE t1; +DROP TABLE t2; 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 2008-02-05 15:10:20 +01:00 +++ b/mysql-test/suite/falcon/t/disabled.def 2008-02-06 16:21:11 +01:00 @@ -10,8 +10,7 @@ # ############################################################################## -falcon_bug_22156 : Bug#22156 2006-11-04 hakank Case sensitivity problem -falcon_bug_22166 : Bug#22166 2006-08-24 hakank Get pushbuild green +falcon_bug_22166 : Bug#22166 2006-08-24 hakank Open bug falcon_bug_22169 : Bug#22169 2006-08-24 hakank Too long run time for PB falcon_bug_22182 : Disabled until runtime team provides RENAME DATABASE replacement. See WL#4030 falcon_bug_22187 : Bug#22187 2006-08-24 hakank Get pushbuild green diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22155.test b/mysql-test/suite/falcon/t/falcon_bug_22155.test --- a/mysql-test/suite/falcon/t/falcon_bug_22155.test 2007-09-29 06:30:36 +02:00 +++ /dev/null Wed Dec 31 16:00:00 196900 @@ -1,26 +0,0 @@ ---source include/have_falcon.inc -SET storage_engine = Falcon; -# -# Bug #22155: Double rename failure -# ---echo *** Bug #22155 *** ---disable_warnings -DROP DATABASE IF EXISTS jstar18; -DROP DATABASE IF EXISTS jstar19; ---enable_warnings - -CREATE SCHEMA jstar18; -CREATE SCHEMA jstar19; - -USE jstar18; -CREATE TABLE t1 (s1 int) Engine MyISAM; -RENAME TABLE t1 TO jstar19.t1; -RENAME TABLE jstar19.t1 TO t1; - -CREATE TABLE t2 (s1 int); -RENAME TABLE t2 TO jstar19.t2; -RENAME TABLE jstar19.t2 TO t2; - -# Final cleanup -DROP DATABASE jstar18; -DROP DATABASE jstar19; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22156.test b/mysql-test/suite/falcon/t/falcon_bug_22156.test --- a/mysql-test/suite/falcon/t/falcon_bug_22156.test 2007-09-29 06:30:36 +02:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22156.test 2008-02-06 16:21:11 +01:00 @@ -1,21 +1,38 @@ --source include/have_falcon.inc -SET storage_engine = Falcon; # # Bug #22156: DROP SCHEMA test_db; # damages informations about table TEST_DB.t1 # Note: Makes problems on Windows. # --echo *** Bug #22156 *** + +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; + --disable_warnings DROP DATABASE IF EXISTS TEST_DB; DROP DATABASE IF EXISTS test_db; --enable_warnings +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # CREATE SCHEMA test_db; CREATE SCHEMA TEST_DB; CREATE TABLE TEST_DB.t1 (f1 int); DROP DATABASE test_db; DROP DATABASE TEST_DB; -# Final cleanup +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +# Check not suitable here. +#SELECT count(*) FROM t1; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # USE test; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22160.test b/mysql-test/suite/falcon/t/falcon_bug_22160.test --- a/mysql-test/suite/falcon/t/falcon_bug_22160.test 2007-11-21 06:38:38 +01:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22160.test 2008-02-06 16:21:11 +01:00 @@ -1,46 +1,67 @@ --source include/have_falcon.inc -#--disable_abort_on_error -SET @@storage_engine = Falcon; # # Bug #22160: REPLACE crash with two interleaving transactions # --echo *** Bug #22160 *** +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; + +SELECT @@GLOBAL.falcon_consistent_read INTO @previous_falcon_consistent_read; SET TRANSACTION ISOLATION LEVEL REPEATABLE READ; -SET GLOBAL FALCON_CONSISTENT_READ=ON; +SET GLOBAL falcon_consistent_read = ON; --disable_warnings DROP DATABASE IF EXISTS db64; --enable_warnings + CREATE DATABASE db64; +USE db64; +--echo # Establish connection conn1 connect (conn1,localhost,root,,); -SET @@storage_engine = Falcon; +eval SET @@storage_engine = $engine; USE db64; +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # +--echo # Switch to connection default connection default; -USE db64; CREATE TABLE t1 (s1 int, primary key (s1)); SET @@autocommit = 0; INSERT INTO t1 VALUES (1); +--echo # Switch to connection conn1 connection conn1; SET @@autocommit = 0; SELECT * FROM t1; +--echo # Switch to connection default connection default; COMMIT; +--echo # Switch to connection conn1 connection conn1; --real_sleep 1 ---error 1020 +--error ER_CHECKREAD REPLACE INTO t1 VALUES (1); -SELECT * FROM t1; COMMIT; -# Final cleanup -disconnect conn1; +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +--echo # Switch to connection default connection default; +SELECT count(*) FROM t1; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # +disconnect conn1; DROP DATABASE db64; +SET GLOBAL falcon_consistent_read = @previous_falcon_consistent_read; USE test; - diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22161.test b/mysql-test/suite/falcon/t/falcon_bug_22161.test --- a/mysql-test/suite/falcon/t/falcon_bug_22161.test 2007-10-05 14:21:26 +02:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22161.test 2008-02-06 16:21:11 +01:00 @@ -1,14 +1,24 @@ --source include/have_falcon.inc -SET storage_engine = Falcon; # # Bug #22161: Duplicate key error with non-unique index after alter # --echo *** Bug #22161 *** + +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; + --disable_warnings DROP TABLE IF EXISTS t1; --enable_warnings CREATE TABLE t1 (a text); + +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # INSERT INTO t1 VALUES (repeat('a',16384)); ALTER TABLE t1 MODIFY COLUMN a varchar(30000); ALTER TABLE t1 MODIFY COLUMN a text; @@ -17,5 +27,12 @@ CREATE INDEX i1 ON t1 (a); ALTER TABLE t1 MODIFY COLUMN a varchar(30000); CREATE INDEX i1 ON t1 (a); -# Final cleanup +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +SELECT count(*) FROM t1; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # DROP TABLE t1; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22164.test b/mysql-test/suite/falcon/t/falcon_bug_22164.test --- a/mysql-test/suite/falcon/t/falcon_bug_22164.test 2007-09-29 06:30:36 +02:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22164.test 2008-02-06 16:21:11 +01:00 @@ -1,67 +1,74 @@ --source include/have_falcon.inc -SET @@storage_engine = Falcon; # -# Test derived from the NIST testsuite +# Bug #22164: ROLLBACK does not work under strange conditions +# Test derived from the NIST testsuite # ---echo #---- Bug 22164 ---- +--echo *** Bug #22164 *** + +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; ---disable_abort_on_error --disable_warnings DROP SCHEMA IF EXISTS testdb_2; --enable_warnings CREATE SCHEMA testdb_2; ---echo # Establish connection session2 (root) ---replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK -connect (session2,localhost,root,,test); -SET @@storage_engine = Falcon; +--echo # Establish connection conn1 +connect (conn1,localhost,root,,); +eval SET @@storage_engine = $engine; USE testdb_2; ---echo #-------- Switch to connection default (root) -------- +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # +--echo # Switch to connection default connection default; -# --source suite/nist/t/schema/schema1.mysql CREATE TABLE t2 (COL5 BIGINT); GRANT UPDATE (COL5) ON t2 TO testdb_2@localhost; -CREATE TABLE t1( f1 BIGINT); - -connection default; +CREATE TABLE t1 (f1 BIGINT); ---echo #-------- Switch to connection session2 (root) -------- -#--source suite/nist/t/schema/schema2.mysql -connection session2; +--echo # Switch to connection conn1 +connection conn1; CREATE TABLE t3 (COL5 DECIMAL(7,2)); GRANT ALL PRIVILEGES ON t3 TO root@localhost; ---echo #------- Switch to connection default (root) ------- +--echo # Switch to connection default connection default; -# --source suite/nist/t/sql/dml040.mysql SET @@autocommit = 0; INSERT INTO testdb_2.t3 SET COL5 = 100.3; -#--source suite/nist/t/sql/dml045.mysql - SELECT * FROM t1; -INSERT INTO t1 VALUES( 1 ); +INSERT INTO t1 VALUES (1); SELECT * FROM t1; ROLLBACK WORK; --echo # !!! ------- Why do I get a result set after ROLLBACK ? -------- !!! SELECT * FROM t1; -# Final cleanup. ---echo #-------- Switch to connection session2 (root) -------- -connection session2; +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +SELECT count(*) FROM t1; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # +--echo # Switch to connection conn1 +connection conn1; REVOKE ALL PRIVILEGES ON t3 FROM root@localhost; ---echo #------- Switch to connection default (root) ------- +--echo # Switch to connection default connection default; REVOKE ALL PRIVILEGES ON t2 FROM testdb_2@localhost; DROP USER testdb_2@localhost; DROP SCHEMA testdb_2; DROP TABLE t2; DROP TABLE t1; -disconnect session2; +disconnect conn1; USE test; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22165.test b/mysql-test/suite/falcon/t/falcon_bug_22165.test --- a/mysql-test/suite/falcon/t/falcon_bug_22165.test 2008-02-04 17:14:23 +01:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22165.test 2008-02-06 16:21:11 +01:00 @@ -37,17 +37,19 @@ begin SET v = v + 1; end while; end// -CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp)// +delimiter ;// + +CREATE TABLE t1 (a bigint, b varchar(1000), c timestamp); -CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1()// -CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1()// +CREATE EVENT e1 ON SCHEDULE EVERY 1 second DO CALL db1.p1(); +CREATE EVENT e2 ON SCHEDULE EVERY 1 second DO CALL db1.p1(); # ----------------------------------------------------- # # --- Test --- # # ----------------------------------------------------- # -SET GLOBAL event_scheduler = 1// +SET GLOBAL event_scheduler = 1; --sleep 60 -SET GLOBAL event_scheduler = 0// +SET GLOBAL event_scheduler = 0; # ----------------------------------------------------- # # --- Check --- # @@ -58,8 +60,8 @@ SET GLOBAL event_scheduler = 0// # ----------------------------------------------------- # # --- Final cleanup --- # # ----------------------------------------------------- # -DROP EVENT db1.e1// -DROP EVENT db1.e2// -DROP PROCEDURE db1.p1// -DROP DATABASE db1// -delimiter ;// +DROP EVENT db1.e1; +DROP EVENT db1.e2; +DROP PROCEDURE db1.p1; +DROP DATABASE db1; +USE test; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22166.test b/mysql-test/suite/falcon/t/falcon_bug_22166.test --- a/mysql-test/suite/falcon/t/falcon_bug_22166.test 2007-09-29 06:30:36 +02:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22166.test 2008-02-06 16:21:11 +01:00 @@ -1,16 +1,33 @@ --source include/have_falcon.inc -SET STORAGE_ENGINE = Falcon; # # Bug #22166: Case insensitive table names -# https://intranet.mysql.com/~mmatthews/mantis/view.php?id=199 # --echo *** Bug #22166 *** + +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; + --disable_warnings -DROP TABLE IF EXISTS t,T; +DROP TABLE IF EXISTS t; +DROP TABLE IF EXISTS T; --enable_warnings +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # CREATE TABLE t(id int); CREATE TABLE T(id int); -# Final cleanup -DROP TABLE t,T; +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +SELECT count(*) FROM t; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # +DROP TABLE t; +DROP TABLE T; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_22167.test b/mysql-test/suite/falcon/t/falcon_bug_22167.test --- a/mysql-test/suite/falcon/t/falcon_bug_22167.test 2007-09-29 06:30:36 +02:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_22167.test 2008-02-06 16:21:11 +01:00 @@ -1,40 +1,58 @@ --source include/have_falcon.inc ---echo #---- Bug 22167 ---- -SET STORAGE_ENGINE='Falcon'; - -# # -# This test is derived from innodb.test # -# # - ---enable_abort_on_error +# +# Bug #22167: update ignore feature is missing +# +--echo *** Bug #22167 *** + +# ----------------------------------------------------- # +# --- Initialisation --- # +# ----------------------------------------------------- # +let $engine = 'Falcon'; +eval SET @@storage_engine = $engine; --disable_warnings -drop table if exists t1; +DROP TABLE IF EXISTS t1; +DROP TABLE IF EXISTS t2; --enable_warnings -# Heavy simplified testcase -create table t1 (id int not null , - name char(20) not null, - primary key (id)); - -insert into t1 (id, name) values (1, 'Tim'), (2, 'Monty'); -select id, name from t1 order by id; - -update ignore t1 set id = 8, name = 'Sinisa' where id < 3; -select count(*) from t1 where name = 'Sinisa'; - -drop table t1; - - -# Slightly simplified original testcase -create table t1 (id int unsigned not null auto_increment, - code tinyint unsigned not null, name char(20) not null, - primary key (id), key (code), unique (name)); - -insert into t1 (code, name) values (1, 'Tim'), (1, 'Monty'); -select id, code, name from t1 order by id; - -update ignore t1 set id = 8, name = 'Sinisa' where id < 3; -select count(*) from t1 where name = 'Sinisa'; - -drop table t1; +CREATE TABLE t1 ( + id int not null, + name char(20) not null, + primary key (id) +); + +CREATE TABLE t2 ( + id int unsigned not null auto_increment, + code tinyint unsigned not null, + name char(20) not null, + primary key (id), + key (code), + unique (name) +); + +# ----------------------------------------------------- # +# --- Test --- # +# ----------------------------------------------------- # +INSERT INTO t1 (id, name) VALUES (1, 'Tim'), (2, 'Monty'); +SELECT id, name FROM t1 ORDER BY id; + +UPDATE IGNORE t1 SET id = 8, name = 'Sinisa' WHERE id < 3; +SELECT count(*) FROM t1 WHERE name = 'Sinisa'; + +INSERT INTO t2 (code, name) VALUES (1, 'Tim'), (1, 'Monty'); +SELECT id, code, name FROM t2 ORDER BY id; + +UPDATE IGNORE t2 SET id = 8, name = 'Sinisa' WHERE id < 3; +SELECT count(*) FROM t2 WHERE name = 'Sinisa'; + +# ----------------------------------------------------- # +# --- Check --- # +# ----------------------------------------------------- # +SELECT count(*) FROM t1; +SELECT count(*) FROM t2; + +# ----------------------------------------------------- # +# --- Final cleanup --- # +# ----------------------------------------------------- # +DROP TABLE t1; +DROP TABLE t2; diff -Nrup a/mysql-test/suite/falcon/t/falcon_bug_32413.test b/mysql-test/suite/falcon/t/falcon_bug_32413.test --- a/mysql-test/suite/falcon/t/falcon_bug_32413.test 2008-02-01 15:12:02 +01:00 +++ b/mysql-test/suite/falcon/t/falcon_bug_32413.test 2008-02-06 16:21:11 +01:00 @@ -19,7 +19,6 @@ DROP TABLE IF EXISTS t2; # ----------------------------------------------------- # # --- Test --- # # ----------------------------------------------------- # - # Set a very low record cache size. SET GLOBAL falcon_record_memory_max = 16 * 1024 * 1024;
| Thread | ||
|---|---|---|
| • bk commit into 6.0 tree (hakank:1.2806) | Hakan Kuecuekyilmaz | 6 Feb |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.671 sec. using MySQL 5.1.14-beta-log