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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1f9259df
Commit
1f9259df
authored
Nov 01, 2014
by
Olivier Bertrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fix MDEV-6988 and MDEV-6994
modified: storage/connect/ha_connect.cc
parent
ea5d7a5c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
storage/connect/ha_connect.cc
storage/connect/ha_connect.cc
+4
-0
No files found.
storage/connect/ha_connect.cc
View file @
1f9259df
...
@@ -3835,6 +3835,8 @@ MODE ha_connect::CheckMode(PGLOBAL g, THD *thd,
...
@@ -3835,6 +3835,8 @@ MODE ha_connect::CheckMode(PGLOBAL g, THD *thd,
case
SQLCOM_OPTIMIZE
:
case
SQLCOM_OPTIMIZE
:
newmode
=
MODE_READ
;
newmode
=
MODE_READ
;
break
;
break
;
case
SQLCOM_FLUSH
:
locked
=
0
;
case
SQLCOM_DROP_TABLE
:
case
SQLCOM_DROP_TABLE
:
case
SQLCOM_RENAME_TABLE
:
case
SQLCOM_RENAME_TABLE
:
newmode
=
MODE_ANY
;
newmode
=
MODE_ANY
;
...
@@ -4014,6 +4016,8 @@ int ha_connect::external_lock(THD *thd, int lock_type)
...
@@ -4014,6 +4016,8 @@ int ha_connect::external_lock(THD *thd, int lock_type)
// This is unlocking, do it by closing the table
// This is unlocking, do it by closing the table
if
(
xp
->
CheckQueryID
()
&&
sqlcom
!=
SQLCOM_UNLOCK_TABLES
if
(
xp
->
CheckQueryID
()
&&
sqlcom
!=
SQLCOM_UNLOCK_TABLES
&&
sqlcom
!=
SQLCOM_LOCK_TABLES
&&
sqlcom
!=
SQLCOM_LOCK_TABLES
&&
sqlcom
!=
SQLCOM_FLUSH
&&
sqlcom
!=
SQLCOM_BEGIN
&&
sqlcom
!=
SQLCOM_DROP_TABLE
)
{
&&
sqlcom
!=
SQLCOM_DROP_TABLE
)
{
sprintf
(
g
->
Message
,
"external_lock: unexpected command %d"
,
sqlcom
);
sprintf
(
g
->
Message
,
"external_lock: unexpected command %d"
,
sqlcom
);
push_warning
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
0
,
g
->
Message
);
push_warning
(
thd
,
Sql_condition
::
WARN_LEVEL_WARN
,
0
,
g
->
Message
);
...
...
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