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.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 08:41:48 +02:00
parent af9649c722 bae21bfb5d
commit 32062cc61c
277 changed files with 16966 additions and 4246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_trigger.cc
View File

@ -621,10 +621,9 @@ end:
my_ok(thd);
DBUG_RETURN(result);
#ifdef WITH_WSREP
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(true);
#endif /* WITH_WSREP */
}