database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source 
The functional changes of commit 5836191c8f
(MDEV-21168) are omitted due to MDEV-742 having addressed the issue.
This commit is contained in:
Marko Mäkelä
2020-04-25 21:57:52 +03:00
parent 62903434eb a19782522b
commit fbe2712705
202 changed files with 2911 additions and 1669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_parse.cc
View File

@ -1751,7 +1751,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
{
mysqld_stmt_bulk_execute(thd, packet, packet_length);
#ifdef WITH_WSREP
if (WSREP_ON)
if (WSREP(thd))
{
(void)wsrep_after_statement(thd);
}
@ -1762,7 +1762,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
{
mysqld_stmt_execute(thd, packet, packet_length);
#ifdef WITH_WSREP
if (WSREP_ON)
if (WSREP(thd))
{
(void)wsrep_after_statement(thd);
}
@ -1820,7 +1820,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
break;
#ifdef WITH_WSREP
if (WSREP_ON)
if (WSREP(thd))
{
if (wsrep_mysql_parse(thd, thd->query(), thd->query_length(),
&parser_state,
@ -1922,7 +1922,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
parser_state.reset(beginning_of_next_stmt, length);
#ifdef WITH_WSREP
if (WSREP_ON)
if (WSREP(thd))
{
if (wsrep_mysql_parse(thd, beginning_of_next_stmt,
length, &parser_state,
@ -3530,7 +3530,7 @@ mysql_execute_command(THD *thd)
* and dirty reads (if configured)
*/
if (!(thd->wsrep_applier) &&
!(wsrep_ready_get() && wsrep_reject_queries == WSREP_REJECT_NONE) &&
!(wsrep_ready_get() && wsrep_reject_queries == WSREP_REJECT_NONE) &&
!(thd->variables.wsrep_dirty_reads &&
(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) == 0) &&
!wsrep_tables_accessible_when_detached(all_tables) &&