summaryrefslogtreecommitdiff
path: root/sql/sql_priv.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-12-30 13:56:19 +0200
committerMonty <monty@mariadb.org>2020-03-24 21:00:02 +0200
commit6a9e24d0465fb0e67ba7bbc333263437e7227d8c (patch)
tree02bdd98c5cd807e55c185a6827558ddd6c9993b4 /sql/sql_priv.h
parente5de1e26e723525aaab1cebc5c958c748eb36d9e (diff)
downloadmariadb-git-6a9e24d0465fb0e67ba7bbc333263437e7227d8c.tar.gz
Added support for replication for S3
MDEV-19964 S3 replication support Added new configure options: s3_slave_ignore_updates "If the slave has shares same S3 storage as the master" s3_replicate_alter_as_create_select "When converting S3 table to local table, log all rows in binary log" This allows on to configure slaves to have the S3 storage shared or independent from the master. Other thing: Added new session variable '@@sql_if_exists' to force IF_EXIST to DDL's.
Diffstat (limited to 'sql/sql_priv.h')
-rw-r--r--sql/sql_priv.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_priv.h b/sql/sql_priv.h
index 7be2692a33b..c3ea9226643 100644
--- a/sql/sql_priv.h
+++ b/sql/sql_priv.h
@@ -146,7 +146,7 @@
/** The following speeds up inserts to InnoDB tables by suppressing unique
key checks in some cases */
#define OPTION_RELAXED_UNIQUE_CHECKS (1ULL << 27) // THD, user, binlog
-#define SELECT_NO_UNLOCK (1ULL << 28) // SELECT, intern
+#define OPTION_IF_EXISTS (1ULL << 28) // binlog
#define OPTION_SCHEMA_TABLE (1ULL << 29) // SELECT, intern
/** Flag set if setup_tables already done */
#define OPTION_SETUP_TABLES_DONE (1ULL << 30) // intern
@@ -179,7 +179,7 @@
#define OPTION_RPL_SKIP_PARALLEL (1ULL << 38)
#define OPTION_NO_QUERY_CACHE (1ULL << 39) // SELECT, user
#define OPTION_PROCEDURE_CLAUSE (1ULL << 40) // Internal usage
-
+#define SELECT_NO_UNLOCK (1ULL << 41) // SELECT, intern
#define OPTION_LEX_FOUND_COMMENT (1ULL << 0) // intern, parser