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
51296b53
Commit
51296b53
authored
Feb 10, 2005
by
pem@mysql.comhem.se
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc.
parent
c55a2de5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
sql/sql_parse.cc
sql/sql_parse.cc
+6
-0
No files found.
sql/sql_parse.cc
View file @
51296b53
...
@@ -2234,7 +2234,9 @@ mysql_execute_command(THD *thd)
...
@@ -2234,7 +2234,9 @@ mysql_execute_command(THD *thd)
/* Locked closure of all tables */
/* Locked closure of all tables */
TABLE_LIST
*
locked_tables
=
NULL
;
TABLE_LIST
*
locked_tables
=
NULL
;
/* Saved variable value */
/* Saved variable value */
#ifdef HAVE_INNOBASE_DB
my_bool
old_innodb_table_locks
=
thd
->
variables
.
innodb_table_locks
;
my_bool
old_innodb_table_locks
=
thd
->
variables
.
innodb_table_locks
;
#endif
DBUG_ENTER
(
"mysql_execute_command"
);
DBUG_ENTER
(
"mysql_execute_command"
);
/*
/*
...
@@ -2330,7 +2332,9 @@ mysql_execute_command(THD *thd)
...
@@ -2330,7 +2332,9 @@ mysql_execute_command(THD *thd)
{
{
if
((
locked_tables
=
sp_hash_to_table_list
(
thd
,
&
lex
->
sptabs
)))
if
((
locked_tables
=
sp_hash_to_table_list
(
thd
,
&
lex
->
sptabs
)))
{
{
#ifdef HAVE_INNOBASE_DB
thd
->
variables
.
innodb_table_locks
=
FALSE
;
thd
->
variables
.
innodb_table_locks
=
FALSE
;
#endif
sp_open_and_lock_tables
(
thd
,
locked_tables
);
sp_open_and_lock_tables
(
thd
,
locked_tables
);
}
}
}
}
...
@@ -4346,7 +4350,9 @@ cleanup:
...
@@ -4346,7 +4350,9 @@ cleanup:
if
(
locked_tables
)
if
(
locked_tables
)
{
{
#ifdef HAVE_INNOBASE_DB
thd
->
variables
.
innodb_table_locks
=
old_innodb_table_locks
;
thd
->
variables
.
innodb_table_locks
=
old_innodb_table_locks
;
#endif
if
(
thd
->
locked_tables
)
if
(
thd
->
locked_tables
)
sp_unlock_tables
(
thd
);
sp_unlock_tables
(
thd
);
}
}
...
...
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