database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +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

5
sql/sql_parse.cc
View File

@@ -3077,9 +3077,7 @@ static int mysql_create_routine(THD *thd, LEX *lex)
#endif
return false;
}
#ifdef WITH_WSREP
error: /* Used by WSREP_TO_ISOLATION_BEGIN */
#endif
WSREP_ERROR_LABEL:
return true;
}
@@ -6298,6 +6296,7 @@ end_with_restore_list:
goto finish;
error:
WSREP_ERROR_LABEL:
res= TRUE;
finish: