diff options
Diffstat (limited to 'storage/tokudb/tokudb_sysvars.h')
| -rw-r--r-- | storage/tokudb/tokudb_sysvars.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/storage/tokudb/tokudb_sysvars.h b/storage/tokudb/tokudb_sysvars.h index 52489cd82ff..2454f8fefd2 100644 --- a/storage/tokudb/tokudb_sysvars.h +++ b/storage/tokudb/tokudb_sysvars.h @@ -26,7 +26,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved. #ifndef _TOKUDB_SYSVARS_H #define _TOKUDB_SYSVARS_H -#if TOKU_INCLUDE_OPTION_STRUCTS +#if defined(TOKU_INCLUDE_OPTION_STRUCTS) && TOKU_INCLUDE_OPTION_STRUCTS struct ha_table_option_struct { uint row_format; }; @@ -44,7 +44,7 @@ static inline bool key_is_clustering(const KEY *key) { static inline bool key_is_clustering(const KEY *key) { return key->flags & HA_CLUSTERING; } -#endif +#endif // defined(TOKU_INCLUDE_OPTION_STRUCTS) && TOKU_INCLUDE_OPTION_STRUCTS namespace tokudb { namespace sysvars { @@ -104,10 +104,12 @@ extern uint write_status_frequency; extern my_bool dir_per_db; extern char* version; -#if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL) +#if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL) && \ + TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL extern char* gdb_path; extern my_bool gdb_on_fatal; -#endif +#endif // defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL) && + // TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL extern my_bool check_jemalloc; @@ -131,8 +133,8 @@ my_bool create_index_online(THD* thd); my_bool disable_hot_alter(THD* thd); my_bool disable_prefetching(THD* thd); my_bool disable_slow_alter(THD* thd); -my_bool disable_slow_update(THD* thd); -my_bool disable_slow_upsert(THD* thd); +my_bool enable_fast_update(THD* thd); +my_bool enable_fast_upsert(THD* thd); empty_scan_mode_t empty_scan(THD* thd); uint fanout(THD* thd); my_bool hide_default_row_format(THD* thd); @@ -152,11 +154,13 @@ my_bool prelock_empty(THD* thd); uint read_block_size(THD* thd); uint read_buf_size(THD* thd); row_format_t row_format(THD *thd); +#if defined(TOKU_INCLUDE_RFR) && TOKU_INCLUDE_RFR my_bool rpl_check_readonly(THD* thd); my_bool rpl_lookup_rows(THD* thd); ulonglong rpl_lookup_rows_delay(THD* thd); my_bool rpl_unique_checks(THD* thd); ulonglong rpl_unique_checks_delay(THD* thd); +#endif // defined(TOKU_INCLUDE_RFR) && TOKU_INCLUDE_RFR my_bool support_xa(THD* thd); extern st_mysql_sys_var* system_variables[]; |