1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update handler.* tests

Browse Source
This commit is contained in:
Sergei Golubchik 2013-07-12 21:41:20 +02:00
parent 224238a073
commit 8367241d5a
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/handler/aria.result
View File

@ -582,11 +582,11 @@ select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (a int not null) ENGINE=csv; create table t1 (a int not null) ENGINE=csv;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int);
@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl
handler t2 close; handler t2 close;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
handler t3 open; handler t3 open;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't reopen table: 't3'
# After UNLOCK TABLES handlers should be around and # After UNLOCK TABLES handlers should be around and
# we should be able to continue reading through them. # we should be able to continue reading through them.
unlock tables; unlock tables;

2
mysql-test/suite/handler/handler.inc
View File

@ -581,7 +581,7 @@ handler t1 open;
handler t1 read next; handler t1 read next;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION
handler t2 close; handler t2 close;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_CANT_REOPEN_TABLE
handler t3 open; handler t3 open;
--echo # After UNLOCK TABLES handlers should be around and --echo # After UNLOCK TABLES handlers should be around and
--echo # we should be able to continue reading through them. --echo # we should be able to continue reading through them.

16
mysql-test/suite/handler/heap.result
View File

@ -582,11 +582,11 @@ select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (a int not null) ENGINE=csv; create table t1 (a int not null) ENGINE=csv;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int);
@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl
handler t2 close; handler t2 close;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
handler t3 open; handler t3 open;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't reopen table: 't3'
# After UNLOCK TABLES handlers should be around and # After UNLOCK TABLES handlers should be around and
# we should be able to continue reading through them. # we should be able to continue reading through them.
unlock tables; unlock tables;
@ -1728,9 +1728,9 @@ a b
4 40 4 40
5 50 5 50
HANDLER t1 READ a FIRST; HANDLER t1 READ a FIRST;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
HANDLER t1 READ a LAST; HANDLER t1 READ a LAST;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
HANDLER t1 READ b FIRST LIMIT 2; HANDLER t1 READ b FIRST LIMIT 2;
a b a b
1 10 1 10
@ -1781,11 +1781,11 @@ create table t1 (f1 integer not null, key (f1)) engine=Memory;
insert into t1 values (1); insert into t1 values (1);
HANDLER t1 OPEN; HANDLER t1 OPEN;
HANDLER t1 READ f1 NEXT; HANDLER t1 READ f1 NEXT;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
HANDLER t1 READ f1 NEXT; HANDLER t1 READ f1 NEXT;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
HANDLER t1 READ f1 NEXT; HANDLER t1 READ f1 NEXT;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine MEMORY of the table `test`.`t1` doesn't have this option
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
DROP TABLE t1; DROP TABLE t1;
End of 5.3 tests End of 5.3 tests

6
mysql-test/suite/handler/innodb.result
View File

@ -583,11 +583,11 @@ select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (a int not null) ENGINE=csv; create table t1 (a int not null) ENGINE=csv;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int);
@ -743,7 +743,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl
handler t2 close; handler t2 close;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
handler t3 open; handler t3 open;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't reopen table: 't3'
# After UNLOCK TABLES handlers should be around and # After UNLOCK TABLES handlers should be around and
# we should be able to continue reading through them. # we should be able to continue reading through them.
unlock tables; unlock tables;

6
mysql-test/suite/handler/myisam.result
View File

@ -582,11 +582,11 @@ select * from t1;
ERROR 42S02: Table 'test.t1' doesn't exist ERROR 42S02: Table 'test.t1' doesn't exist
drop table if exists t1; drop table if exists t1;
Warnings: Warnings:
Note 1051 Unknown table 't1' Note 1051 Unknown table 'test.t1'
create table t1 (a int not null) ENGINE=csv; create table t1 (a int not null) ENGINE=csv;
--> client 2 --> client 2
handler t1 open; handler t1 open;
ERROR HY000: Table storage engine for 't1' doesn't have this option ERROR HY000: Storage engine CSV of the table `test`.`t1` doesn't have this option
--> client 1 --> client 1
drop table t1; drop table t1;
create table t1 (a int); create table t1 (a int);
@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl
handler t2 close; handler t2 close;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
handler t3 open; handler t3 open;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction ERROR HY000: Can't reopen table: 't3'
# After UNLOCK TABLES handlers should be around and # After UNLOCK TABLES handlers should be around and
# we should be able to continue reading through them. # we should be able to continue reading through them.
unlock tables; unlock tables;