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

Merge 10.2 into 10.3

Browse Source 
main.derived_cond_pushdown: Move all 10.3 tests to the end,
trim trailing white space, and add an "End of 10.3 tests" marker.
Add --sorted_result to tests where the ordering is not deterministic.

main.win_percentile: Add --sorted_result to tests where the
ordering is no longer deterministic.
This commit is contained in:
Marko Mäkelä
2018-11-06 09:40:39 +02:00
parent e058a251c1 bdfe2784d5
commit df563e0c03
375 changed files with 23445 additions and 10440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_admin.cc
View File

@ -1325,6 +1325,7 @@ bool Sql_cmd_analyze_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@ -1382,6 +1383,7 @@ bool Sql_cmd_optimize_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@ -1417,5 +1419,6 @@ bool Sql_cmd_repair_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}