At file:///home/psergey/bzr-new/maria-5.1-build1/ ------------------------------------------------------------ revno: 2764 revision-id: psergey@askmonty.org-20091007165611-nah5830oiz64lbnw parent: knielsen@knielsen-hq.org-20091007131559-afwjs2l485ghhhci committer: Sergey Petrunya branch nick: maria-5.1-build1 timestamp: Wed 2009-10-07 20:56:11 +0400 message: Fix pbxt test suite failures: - Update EXPLAIN results after table elimination - mysqlslap now specifies 'Engine=' in CREATE TABLE instead of using SET storage_engine=... - For some reason, mysqltest logs "connect" command differently when PBXT is the default storage engine. This is probably a bug in mysqltest which we can't be bothered to investigate at the moment, so add --replace === modified file 'mysql-test/suite/pbxt/r/connect.result' --- a/mysql-test/suite/pbxt/r/connect.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/connect.result 2009-10-07 16:56:11 +0000 @@ -61,8 +61,8 @@ Tables_in_test connect(localhost,test,,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) -connect(localhost,test,,"",MASTER_PORT,MASTER_SOCKET); -ERROR 28000: Access denied for user 'test'@'localhost' (using password: NO) +connect(localhost,,,,MASTER_PORT,MASTER_SOCKET); +ERROR 28000: Access denied for user ''@'localhost' (using password: NO) connect(localhost,test,zorro,test2,MASTER_PORT,MASTER_SOCKET); ERROR 28000: Access denied for user 'test'@'localhost' (using password: YES) connect(localhost,test,zorro,test,MASTER_PORT,MASTER_SOCKET); === modified file 'mysql-test/suite/pbxt/r/mysqlslap.result' --- a/mysql-test/suite/pbxt/r/mysqlslap.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/mysqlslap.result 2009-10-07 16:56:11 +0000 @@ -122,82 +122,76 @@ DROP SCHEMA IF EXISTS `mysqlslap`; CREATE SCHEMA `mysqlslap`; use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -select * from t1; -select * from t2; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -select * from t1; -select * from t2; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SHOW TABLES; -select * from t1; -select * from t2; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SHOW TABLES; -select * from t1; -select * from t2; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`heap`; -CREATE TABLE t1 (id int, name varchar(64)); -create table t2(foo1 varchar(32), foo2 varchar(32)); -INSERT INTO t1 VALUES (1, 'This is a test'); -insert into t2 values ('test', 'test2'); -SET AUTOCOMMIT=0; -SHOW TABLES; -SET AUTOCOMMIT=0; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -select * from t1; -COMMIT; -select * from t2; -COMMIT; -COMMIT; -SHOW TABLES; -DROP SCHEMA IF EXISTS `mysqlslap`; -DROP SCHEMA IF EXISTS `mysqlslap`; -CREATE SCHEMA `mysqlslap`; -use mysqlslap; -set storage_engine=`myisam`; -CREATE TABLE t1 (id int, name varchar(64)); +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +select * from t1; +select * from t2; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +select * from t1; +select * from t2; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SHOW TABLES; +select * from t1; +select * from t2; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SHOW TABLES; +select * from t1; +select * from t2; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = heap; +create table t2(foo1 varchar(32), foo2 varchar(32)); +INSERT INTO t1 VALUES (1, 'This is a test'); +insert into t2 values ('test', 'test2'); +SET AUTOCOMMIT=0; +SHOW TABLES; +SET AUTOCOMMIT=0; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +select * from t1; +COMMIT; +select * from t2; +COMMIT; +COMMIT; +SHOW TABLES; +DROP SCHEMA IF EXISTS `mysqlslap`; +DROP SCHEMA IF EXISTS `mysqlslap`; +CREATE SCHEMA `mysqlslap`; +use mysqlslap; +CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam; create table t2(foo1 varchar(32), foo2 varchar(32)); INSERT INTO t1 VALUES (1, 'This is a test'); insert into t2 values ('test', 'test2'); === modified file 'mysql-test/suite/pbxt/r/ps_11bugs.result' --- a/mysql-test/suite/pbxt/r/ps_11bugs.result 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/r/ps_11bugs.result 2009-10-07 16:56:11 +0000 @@ -121,8 +121,8 @@ explain select * from t1 where 3 in (select (1+1) union select 1); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables -2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL No tables used -3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL No tables used +2 DEPENDENT SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible HAVING +3 DEPENDENT UNION NULL NULL NULL NULL NULL NULL NULL Impossible HAVING NULL UNION RESULT ALL NULL NULL NULL NULL NULL select * from t1 where 3 in (select (1+1) union select 1); a === modified file 'mysql-test/suite/pbxt/r/select.result' --- a/mysql-test/suite/pbxt/r/select.result 2009-08-17 15:57:58 +0000 +++ b/mysql-test/suite/pbxt/r/select.result 2009-10-07 16:56:11 +0000 @@ -3585,7 +3585,6 @@ EXPLAIN SELECT t1.a FROM t1 LEFT JOIN t2 ON t2.b=t1.b WHERE t1.a=3; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 -1 SIMPLE t2 const b b 22 const 1 Using index DROP TABLE t1,t2; CREATE TABLE t1(id int PRIMARY KEY, b int, e int); CREATE TABLE t2(i int, a int, INDEX si(i), INDEX ai(a)); === modified file 'mysql-test/suite/pbxt/r/union.result' --- a/mysql-test/suite/pbxt/r/union.result 2009-08-17 15:57:58 +0000 +++ b/mysql-test/suite/pbxt/r/union.result 2009-10-07 16:56:11 +0000 @@ -480,7 +480,7 @@ 2 UNION t2 const PRIMARY PRIMARY 4 const 1 100.00 NULL UNION RESULT ALL NULL NULL NULL NULL NULL NULL Warnings: -Note 1003 (select '1' AS `a`,'1' AS `b` from `test`.`t1` where ('1' = 1)) union (select '1' AS `a`,'10' AS `b` from `test`.`t2` where ('1' = 1)) +Note 1003 (select '1' AS `a`,'1' AS `b` from `test`.`t1` where 1) union (select '1' AS `a`,'10' AS `b` from `test`.`t2` where 1) (select * from t1 where a=5) union (select * from t2 where a=1); a b 1 10 === modified file 'mysql-test/suite/pbxt/t/connect.test' --- a/mysql-test/suite/pbxt/t/connect.test 2009-04-02 10:03:14 +0000 +++ b/mysql-test/suite/pbxt/t/connect.test 2009-10-07 16:56:11 +0000 @@ -42,7 +42,7 @@ --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT --error 1045 connect (fail_con,localhost,test,,test2); ---replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT +--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT test "" --error 1045 connect (fail_con,localhost,test,,""); --replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT