diff options
| author | Monty <monty@mariadb.org> | 2019-12-30 13:56:19 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2020-03-24 21:00:02 +0200 |
| commit | 6a9e24d0465fb0e67ba7bbc333263437e7227d8c (patch) | |
| tree | 02bdd98c5cd807e55c185a6827558ddd6c9993b4 /sql/sql_union.cc | |
| parent | e5de1e26e723525aaab1cebc5c958c748eb36d9e (diff) | |
| download | mariadb-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_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index f8025cdf701..bb2ab527754 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1072,7 +1072,7 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg, bool st_select_lex_unit::prepare_join(THD *thd_arg, SELECT_LEX *sl, select_result *tmp_result, - ulong additional_options, + ulonglong additional_options, bool is_union_select) { DBUG_ENTER("st_select_lex_unit::prepare_join"); @@ -1278,7 +1278,7 @@ bool init_item_int(THD* thd, Item_int* &item) bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg, select_result *sel_result, - ulong additional_options) + ulonglong additional_options) { SELECT_LEX *lex_select_save= thd->lex->current_select; SELECT_LEX *sl, *first_sl= first_select(); |