database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

moved ha_maria::implicit_commit() calls around

Browse Source
This commit is contained in:
Sergei Golubchik
2012-01-06 18:35:08 +01:00
parent 575c7f8329
commit ad2508eac4
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/safemalloc.c
View File

@@ -281,7 +281,7 @@ static int bad_ptr(const char *where, void *ptr)
magicend[3] != MAGICEND3) magicend[3] != MAGICEND3)
{ {
warn("Error: %s overrun buffer ", where); warn("Error: %s overrun buffer ", where);
fprintf(stderr, ", allocated at "); fprintf(stderr, "Allocated at ");
print_stack(irem->frame); print_stack(irem->frame);
return 1; return 1;
} }

5
sql/sql_base.cc
View File

@@ -1454,11 +1454,6 @@ void close_thread_tables(THD *thd)
TABLE *table; TABLE *table;
DBUG_ENTER("close_thread_tables"); 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 #ifdef EXTRA_DEBUG
DBUG_PRINT("tcache", ("open tables:")); DBUG_PRINT("tcache", ("open tables:"));
for (table= thd->open_tables; table; table= table->next) for (table= thd->open_tables; table; table= table->next)

9
sql/sql_parse.cc
View File

@@ -1052,10 +1052,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
! thd->is_error()) ! thd->is_error())
{ {
/* /*
Multiple queries exits, execute them individually Multiple queries exist, execute them individually
*/ */
char *beginning_of_next_stmt= (char*) parser_state.m_lip.found_semicolon; 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. */ /* Finalize server status flags after executing a statement. */
thd->update_server_status(); thd->update_server_status();
thd->protocol->end_statement(); thd->protocol->end_statement();
@@ -4473,6 +4477,9 @@ finish:
trans_commit_stmt(thd); trans_commit_stmt(thd);
thd->stmt_da->can_overwrite_status= FALSE; thd->stmt_da->can_overwrite_status= FALSE;
} }
#ifdef WITH_ARIA_STORAGE_ENGINE
ha_maria::implicit_commit(thd, FALSE);
#endif
} }
lex->unit.cleanup(); lex->unit.cleanup();