Commit 6da81921 authored by Sergei Golubchik's avatar Sergei Golubchik

mysqltest: Allow HANDLER READ in --ps-protocol tests

adjust tests
parent e7ca377c
...@@ -8672,6 +8672,7 @@ void init_re(void) ...@@ -8672,6 +8672,7 @@ void init_re(void)
"[[:space:]]*SELECT[[:space:]]|" "[[:space:]]*SELECT[[:space:]]|"
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|" "[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
"[[:space:]]*DO[[:space:]]|" "[[:space:]]*DO[[:space:]]|"
"[[:space:]]*HANDLER[[:space:]]+.*[[:space:]]+READ[[:space:]]|"
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|" "[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|" "[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|" "[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
......
...@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE; ...@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE;
HANDLER t1 OPEN; HANDLER t1 OPEN;
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 t1 READ FIRST; HANDLER t1 READ FIRST;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction Got one of the listed errors
HANDLER t1 CLOSE; HANDLER t1 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
UNLOCK TABLES; UNLOCK TABLES;
......
...@@ -377,7 +377,9 @@ send optimize table t1; ...@@ -377,7 +377,9 @@ send optimize table t1;
# client 1 # client 1
--echo proceed with the normal connection --echo proceed with the normal connection
connection default; connection default;
--disable_ps_protocol
handler t1 read next; handler t1 read next;
--enable_ps_protocol
handler t1 close; handler t1 close;
# client 2 # client 2
--echo read the result from the other connection --echo read the result from the other connection
......
...@@ -269,7 +269,7 @@ handler t1 open; ...@@ -269,7 +269,7 @@ handler t1 open;
lock table t1 write; lock table t1 write;
alter table t1 engine=csv; alter table t1 engine=csv;
handler t1 read a next; handler t1 read a next;
ERROR HY000: Table storage engine for 't1' doesn't have this option Got one of the listed errors
handler t1 close; handler t1 close;
unlock tables; unlock tables;
drop table t1; drop table t1;
......
...@@ -326,7 +326,7 @@ let $wait_condition= ...@@ -326,7 +326,7 @@ let $wait_condition=
info = "alter table t1 engine=csv"; info = "alter table t1 engine=csv";
--source include/wait_condition.inc --source include/wait_condition.inc
connection default; connection default;
--error ER_ILLEGAL_HA --error ER_ILLEGAL_HA,ER_KEY_DOES_NOT_EXITS
handler t1 read a next; handler t1 read a next;
handler t1 close; handler t1 close;
connection con1; connection con1;
......
...@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE; ...@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE;
--echo # HANDLER commands are not allowed in LOCK TABLES mode --echo # HANDLER commands are not allowed in LOCK TABLES mode
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER t1 OPEN; HANDLER t1 OPEN;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION,ER_UNKNOWN_TABLE
HANDLER t1 READ FIRST; HANDLER t1 READ FIRST;
--error ER_LOCK_OR_ACTIVE_TRANSACTION --error ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER t1 CLOSE; HANDLER t1 CLOSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment