database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

merge 5.5

Browse Source
This commit is contained in:
Vladislav Vaintroub
2012-01-11 14:56:19 +01:00
parent 67cfb8a5c5 44c8745ff5
commit 6404fcbf9e
127 changed files with 426 additions and 25600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@@ -1055,10 +1055,14 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
! 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;
#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();
@@ -4476,6 +4480,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();