Merge MWL#234: @@skip_replication feature to MariaDB 5.5.

This commit is contained in:
unknown 2012-03-01 12:41:49 +01:00
commit 22a504f897
23 changed files with 1158 additions and 89 deletions

View file

@ -151,6 +151,7 @@
Note! Reserved for use in MySQL Cluster
*/
#define OPTION_ALLOW_BATCH (ULL(1) << 36) // THD, intern (slave)
#define OPTION_SKIP_REPLICATION (ULL(1) << 37) // THD, user
/* The rest of the file is included in the server only */
#ifndef MYSQL_CLIENT