diff options
Diffstat (limited to 'mysql-test/suite/handler')
| -rw-r--r-- | mysql-test/suite/handler/aria.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/handler/handler.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/handler/heap.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/handler/innodb.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/handler/myisam.result | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/mysql-test/suite/handler/aria.result b/mysql-test/suite/handler/aria.result index 630b16433a4..ab50da321db 100644 --- a/mysql-test/suite/handler/aria.result +++ b/mysql-test/suite/handler/aria.result @@ -582,7 +582,7 @@ select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table t1 (a int not null) ENGINE=csv; --> client 2 handler t1 open; @@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl handler t2 close; ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction 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 # we should be able to continue reading through them. unlock tables; diff --git a/mysql-test/suite/handler/handler.inc b/mysql-test/suite/handler/handler.inc index e099d22e3ce..d3134746033 100644 --- a/mysql-test/suite/handler/handler.inc +++ b/mysql-test/suite/handler/handler.inc @@ -581,7 +581,7 @@ handler t1 open; handler t1 read next; --error ER_LOCK_OR_ACTIVE_TRANSACTION handler t2 close; ---error ER_LOCK_OR_ACTIVE_TRANSACTION +--error ER_CANT_REOPEN_TABLE handler t3 open; --echo # After UNLOCK TABLES handlers should be around and --echo # we should be able to continue reading through them. diff --git a/mysql-test/suite/handler/heap.result b/mysql-test/suite/handler/heap.result index 55f9fd41c7a..4b5af7afa72 100644 --- a/mysql-test/suite/handler/heap.result +++ b/mysql-test/suite/handler/heap.result @@ -582,7 +582,7 @@ select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table t1 (a int not null) ENGINE=csv; --> client 2 handler t1 open; @@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl handler t2 close; ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction 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 # we should be able to continue reading through them. unlock tables; diff --git a/mysql-test/suite/handler/innodb.result b/mysql-test/suite/handler/innodb.result index d4103ddd6ff..4338c018052 100644 --- a/mysql-test/suite/handler/innodb.result +++ b/mysql-test/suite/handler/innodb.result @@ -583,7 +583,7 @@ select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table t1 (a int not null) ENGINE=csv; --> client 2 handler t1 open; @@ -743,7 +743,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl handler t2 close; ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction 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 # we should be able to continue reading through them. unlock tables; diff --git a/mysql-test/suite/handler/myisam.result b/mysql-test/suite/handler/myisam.result index 980b87768da..fcf6d4c133c 100644 --- a/mysql-test/suite/handler/myisam.result +++ b/mysql-test/suite/handler/myisam.result @@ -582,7 +582,7 @@ select * from t1; ERROR 42S02: Table 'test.t1' doesn't exist drop table if exists t1; Warnings: -Note 1051 Unknown table 't1' +Note 1051 Unknown table 'test.t1' create table t1 (a int not null) ENGINE=csv; --> client 2 handler t1 open; @@ -741,7 +741,7 @@ ERROR HY000: Can't execute the given command because you have active locked tabl handler t2 close; ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction 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 # we should be able to continue reading through them. unlock tables; |