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

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-04-19 05:21:36 +04:00
parent f89a5c9a25 e2b03cd3b5
commit 7ba0cfc8ae
93 changed files with 581 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_parse.cc
View File

@ -3012,7 +3012,7 @@ static int mysql_create_routine(THD *thd, LEX *lex)
return false;
}
#ifdef WITH_WSREP
error:
error: /* Used by WSREP_TO_ISOLATION_BEGIN */
#endif
return true;
}