Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
6da81921
Commit
6da81921
authored
Jun 10, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mysqltest: Allow HANDLER READ in --ps-protocol tests
adjust tests
parent
e7ca377c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
4 deletions
+7
-4
client/mysqltest.cc
client/mysqltest.cc
+1
-0
mysql-test/r/lock.result
mysql-test/r/lock.result
+1
-1
mysql-test/suite/handler/handler.inc
mysql-test/suite/handler/handler.inc
+2
-0
mysql-test/suite/handler/interface.result
mysql-test/suite/handler/interface.result
+1
-1
mysql-test/suite/handler/interface.test
mysql-test/suite/handler/interface.test
+1
-1
mysql-test/t/lock.test
mysql-test/t/lock.test
+1
-1
No files found.
client/mysqltest.cc
View file @
6da81921
...
...
@@ -8672,6 +8672,7 @@ void init_re(void)
"[[:space:]]*SELECT[[:space:]]|"
"[[:space:]]*CREATE[[:space:]]+TABLE[[:space:]]|"
"[[:space:]]*DO[[:space:]]|"
"[[:space:]]*HANDLER[[:space:]]+.*[[:space:]]+READ[[:space:]]|"
"[[:space:]]*SET[[:space:]]+OPTION[[:space:]]|"
"[[:space:]]*DELETE[[:space:]]+MULTI[[:space:]]|"
"[[:space:]]*UPDATE[[:space:]]+MULTI[[:space:]]|"
...
...
mysql-test/r/lock.result
View file @
6da81921
...
...
@@ -407,7 +407,7 @@ LOCK TABLE t1 WRITE;
HANDLER t1 OPEN;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
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;
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
UNLOCK TABLES;
...
...
mysql-test/suite/handler/handler.inc
View file @
6da81921
...
...
@@ -377,7 +377,9 @@ send optimize table t1;
# client 1
--
echo
proceed
with
the
normal
connection
connection
default
;
--
disable_ps_protocol
handler
t1
read
next
;
--
enable_ps_protocol
handler
t1
close
;
# client 2
--
echo
read
the
result
from
the
other
connection
...
...
mysql-test/suite/handler/interface.result
View file @
6da81921
...
...
@@ -269,7 +269,7 @@ handler t1 open;
lock table t1 write;
alter table t1 engine=csv;
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;
unlock tables;
drop table t1;
...
...
mysql-test/suite/handler/interface.test
View file @
6da81921
...
...
@@ -326,7 +326,7 @@ let $wait_condition=
info
=
"alter table t1 engine=csv"
;
--
source
include
/
wait_condition
.
inc
connection
default
;
--
error
ER_ILLEGAL_HA
--
error
ER_ILLEGAL_HA
,
ER_KEY_DOES_NOT_EXITS
handler
t1
read
a
next
;
handler
t1
close
;
connection
con1
;
...
...
mysql-test/t/lock.test
View file @
6da81921
...
...
@@ -481,7 +481,7 @@ LOCK TABLE t1 WRITE;
--
echo
# HANDLER commands are not allowed in LOCK TABLES mode
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER
t1
OPEN
;
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
,
ER_UNKNOWN_TABLE
HANDLER
t1
READ
FIRST
;
--
error
ER_LOCK_OR_ACTIVE_TRANSACTION
HANDLER
t1
CLOSE
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment