database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2018-03-21 10:36:49 +02:00
parent 34b03da211 eee73ddfbb
commit 82aeb6b596
47 changed files with 1566 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.h
View File

@ -5726,11 +5726,15 @@ public:
sent by the user (ie: stored procedure).
*/
#define CF_SKIP_QUESTIONS (1U << 1)
#ifdef WITH_WSREP
/**
Do not check that wsrep snapshot is ready before allowing this command
*/
#define CF_SKIP_WSREP_CHECK (1U << 2)
#else
#define CF_SKIP_WSREP_CHECK 0
#endif /* WITH_WSREP */
/**
Do not allow it for COM_MULTI batch
*/