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
ad2508ea
Commit
ad2508ea
authored
Jan 06, 2012
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moved ha_maria::implicit_commit() calls around
parent
575c7f83
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
mysys/safemalloc.c
mysys/safemalloc.c
+2
-2
sql/sql_base.cc
sql/sql_base.cc
+0
-5
sql/sql_parse.cc
sql/sql_parse.cc
+8
-1
No files found.
mysys/safemalloc.c
View file @
ad2508ea
...
...
@@ -280,8 +280,8 @@ static int bad_ptr(const char *where, void *ptr)
magicend
[
2
]
!=
MAGICEND2
||
magicend
[
3
]
!=
MAGICEND3
)
{
warn
(
"Error: %s overrun buffer"
,
where
);
fprintf
(
stderr
,
"
, a
llocated at "
);
warn
(
"Error: %s overrun buffer
"
,
where
);
fprintf
(
stderr
,
"
A
llocated at "
);
print_stack
(
irem
->
frame
);
return
1
;
}
...
...
sql/sql_base.cc
View file @
ad2508ea
...
...
@@ -1454,11 +1454,6 @@ void close_thread_tables(THD *thd)
TABLE
*
table
;
DBUG_ENTER
(
"close_thread_tables"
);
#ifdef WITH_ARIA_STORAGE_ENGINE
if
(
!
thd
->
in_sub_stmt
)
ha_maria
::
implicit_commit
(
thd
,
FALSE
);
#endif
#ifdef EXTRA_DEBUG
DBUG_PRINT
(
"tcache"
,
(
"open tables:"
));
for
(
table
=
thd
->
open_tables
;
table
;
table
=
table
->
next
)
...
...
sql/sql_parse.cc
View file @
ad2508ea
...
...
@@ -1052,10 +1052,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
!
thd
->
is_error
())
{
/*
Multiple queries exi
ts
, execute them individually
Multiple queries exi
st
, execute them individually
*/
char
*
beginning_of_next_stmt
=
(
char
*
)
parser_state
.
m_lip
.
found_semicolon
;
#ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria
::
implicit_commit
(
thd
,
FALSE
);
#endif
/* Finalize server status flags after executing a statement. */
thd
->
update_server_status
();
thd
->
protocol
->
end_statement
();
...
...
@@ -4473,6 +4477,9 @@ finish:
trans_commit_stmt
(
thd
);
thd
->
stmt_da
->
can_overwrite_status
=
FALSE
;
}
#ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria
::
implicit_commit
(
thd
,
FALSE
);
#endif
}
lex
->
unit
.
cleanup
();
...
...
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