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 /storage/maria/maria_def.h | |
| 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 'storage/maria/maria_def.h')
| -rw-r--r-- | storage/maria/maria_def.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/maria/maria_def.h b/storage/maria/maria_def.h index 8f6106edb3d..8e7bef9493c 100644 --- a/storage/maria/maria_def.h +++ b/storage/maria/maria_def.h @@ -16,6 +16,8 @@ /* This file is included by all internal maria files */ #include <my_global.h> + +C_MODE_START #include "maria.h" /* Structs & some defines */ #include "ma_pagecache.h" #include <myisampack.h> /* packing of keys */ @@ -1378,7 +1380,7 @@ void _ma_remap_file(MARIA_HA *info, my_off_t size); MARIA_RECORD_POS _ma_write_init_default(MARIA_HA *info, const uchar *record); my_bool _ma_write_abort_default(MARIA_HA *info); int maria_delete_table_files(const char *name, my_bool temporary, - myf sync_dir); + myf flags); /* This cannot be in my_base.h as it clashes with HA_SPATIAL. @@ -1387,7 +1389,6 @@ int maria_delete_table_files(const char *name, my_bool temporary, */ #define HA_RTREE_INDEX 16384 /* For RTREE search */ -C_MODE_START #define MARIA_FLUSH_DATA 1 #define MARIA_FLUSH_INDEX 2 int _ma_flush_table_files(MARIA_HA *info, uint flush_data_or_index, @@ -1407,7 +1408,6 @@ void _ma_check_print_warning(HA_CHECK *param, const char *fmt, ...) void _ma_check_print_info(HA_CHECK *param, const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 2, 3); my_bool write_log_record_for_repair(const HA_CHECK *param, MARIA_HA *info); -C_MODE_END int _ma_flush_pending_blocks(MARIA_SORT_PARAM *param); int _ma_sort_ft_buf_flush(MARIA_SORT_PARAM *sort_param); @@ -1470,3 +1470,4 @@ static inline void unmap_file(MARIA_HA *info __attribute__((unused))) _ma_unmap_file(info); #endif } +C_MODE_END |