1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a lot of compiler warnings found by -Wunused

Browse Source
This commit is contained in:
Monty 2018-04-26 16:33:05 +03:00
parent 0bdc15d86e
commit 2ccd6716fc
34 changed files with 60 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqlbinlog.cc
View File

@ -2904,7 +2904,7 @@ static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,
stdin in binary mode. Errors on setting this mode result in stdin in binary mode. Errors on setting this mode result in
halting the function and printing an error message to stderr. halting the function and printing an error message to stderr.
*/ */
#if defined (__WIN__) || (_WIN64) #if defined (__WIN__) || defined(_WIN64)
if (_setmode(fileno(stdin), O_BINARY) == -1) if (_setmode(fileno(stdin), O_BINARY) == -1)
{ {
error("Could not set binary mode on stdin."); error("Could not set binary mode on stdin.");

4
config.h.cmake
View File

@ -433,11 +433,11 @@
#cmakedefine strtoll @strtoll@ #cmakedefine strtoll @strtoll@
#cmakedefine strtoull @strtoull@ #cmakedefine strtoull @strtoull@
#cmakedefine vsnprintf @vsnprintf@ #cmakedefine vsnprintf @vsnprintf@
#if (_MSC_VER > 1800) #if defined(_MSC_VER) && (_MSC_VER > 1800)
#define tzname _tzname #define tzname _tzname
#define P_tmpdir "C:\\TEMP" #define P_tmpdir "C:\\TEMP"
#endif #endif
#if (_MSC_VER > 1310) #if defined(_MSC_VER) && (_MSC_VER > 1310)
# define HAVE_SETENV # define HAVE_SETENV
#define setenv(a,b,c) _putenv_s(a,b) #define setenv(a,b,c) _putenv_s(a,b)
#endif #endif

2
extra/mariabackup/crc/crc-intel-pclmul.c
View File

@ -57,7 +57,7 @@ typedef uint8_t byte;
#if __GNUC__ >= 4 && defined(__x86_64__) && defined(HAVE_CLMUL_INSTRUCTION) #if __GNUC__ >= 4 && defined(__x86_64__) && defined(HAVE_CLMUL_INSTRUCTION)
#if _GCRY_GCC_VERSION >= 40400 /* 4.4 */ #if defined(_GCRY_GCC_VERSION) && _GCRY_GCC_VERSION >= 40400 /* 4.4 */
/* Prevent compiler from issuing SSE instructions between asm blocks. */ /* Prevent compiler from issuing SSE instructions between asm blocks. */
# pragma GCC target("no-sse") # pragma GCC target("no-sse")
#endif #endif

2
include/my_base.h
View File

@ -647,7 +647,7 @@ typedef ulong ha_rows;
#define HA_POS_ERROR (~ (ha_rows) 0) #define HA_POS_ERROR (~ (ha_rows) 0)
#define HA_OFFSET_ERROR (~ (my_off_t) 0) #define HA_OFFSET_ERROR (~ (my_off_t) 0)
#if SYSTEM_SIZEOF_OFF_T == 4 #if SIZEOF_OFF_T == 4
#define MAX_FILE_SIZE INT_MAX32 #define MAX_FILE_SIZE INT_MAX32
#else #else
#define MAX_FILE_SIZE LONGLONG_MAX #define MAX_FILE_SIZE LONGLONG_MAX

2
include/my_dir.h
View File

@ -76,7 +76,7 @@ typedef struct my_stat
#else #else
#if(_MSC_VER) #if defined(_MSC_VER)
#define MY_STAT struct _stati64 /* 64 bit file size */ #define MY_STAT struct _stati64 /* 64 bit file size */
#else #else
#define MY_STAT struct stat /* Original struct has what we need */ #define MY_STAT struct stat /* Original struct has what we need */

6
include/my_global.h
View File

@ -710,7 +710,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define closesocket(A) close(A) #define closesocket(A) close(A)
#endif #endif
#if (_MSC_VER) #if defined(_MSC_VER)
#if !defined(_WIN64) #if !defined(_WIN64)
inline double my_ulonglong2double(unsigned long long value) inline double my_ulonglong2double(unsigned long long value)
{ {
@ -1166,7 +1166,7 @@ typedef struct { const char *dli_fname, dli_fbase; } Dl_info;
/* Provide __func__ macro definition for platforms that miss it. */ /* Provide __func__ macro definition for platforms that miss it. */
#if !defined (__func__) #if !defined (__func__)
#if __STDC_VERSION__ < 199901L #if defined(__STDC_VERSION__) && __STDC_VERSION__ < 199901L
# if __GNUC__ >= 2 # if __GNUC__ >= 2
# define __func__ __FUNCTION__ # define __func__ __FUNCTION__
# else # else
@ -1258,7 +1258,7 @@ static inline double rint(double x)
CMake using getconf CMake using getconf
*/ */
#if !defined(CPU_LEVEL1_DCACHE_LINESIZE) || CPU_LEVEL1_DCACHE_LINESIZE == 0 #if !defined(CPU_LEVEL1_DCACHE_LINESIZE) || CPU_LEVEL1_DCACHE_LINESIZE == 0
#if CPU_LEVEL1_DCACHE_LINESIZE == 0 #if defined(CPU_LEVEL1_DCACHE_LINESIZE) && CPU_LEVEL1_DCACHE_LINESIZE == 0
#undef CPU_LEVEL1_DCACHE_LINESIZE #undef CPU_LEVEL1_DCACHE_LINESIZE
#endif #endif

7
sql/item.h
View File

@ -3180,17 +3180,10 @@ public:
Field *result_field; Field *result_field;
Item_null_result(THD *thd): Item_null(thd), result_field(0) {} Item_null_result(THD *thd): Item_null(thd), result_field(0) {}
bool is_result_field() { return result_field != 0; } bool is_result_field() { return result_field != 0; }
#if MARIADB_VERSION_ID < 100300
enum_field_types field_type() const
{
return result_field->type();
}
#else
const Type_handler *type_handler() const const Type_handler *type_handler() const
{ {
return result_field->type_handler(); return result_field->type_handler();
} }
#endif
void save_in_result_field(bool no_conversions) void save_in_result_field(bool no_conversions)
{ {
save_in_field(result_field, no_conversions); save_in_field(result_field, no_conversions);

2
sql/log.cc
View File

@ -2666,7 +2666,7 @@ bool MYSQL_LOG::open(
#ifdef EMBEDDED_LIBRARY #ifdef EMBEDDED_LIBRARY
"embedded library\n", "embedded library\n",
my_progname, server_version, MYSQL_COMPILATION_COMMENT my_progname, server_version, MYSQL_COMPILATION_COMMENT
#elif _WIN32 #elif defined(_WIN32)
"started with:\nTCP Port: %d, Named Pipe: %s\n", "started with:\nTCP Port: %d, Named Pipe: %s\n",
my_progname, server_version, MYSQL_COMPILATION_COMMENT, my_progname, server_version, MYSQL_COMPILATION_COMMENT,
mysqld_port, mysqld_unix_port mysqld_port, mysqld_unix_port

2
sql/log_event.cc
View File

@ -14516,7 +14516,7 @@ void Incident_log_event::pack_info(Protocol *protocol)
#endif /* MYSQL_CLIENT */ #endif /* MYSQL_CLIENT */
#if WITH_WSREP && !defined(MYSQL_CLIENT) #if defined(WITH_WSREP) && !defined(MYSQL_CLIENT)
/* /*
read the first event from (*buf). The size of the (*buf) is (*buf_len). read the first event from (*buf). The size of the (*buf) is (*buf_len).
At the end (*buf) is shitfed to point to the following event or NULL and At the end (*buf) is shitfed to point to the following event or NULL and

2
sql/mysqld.cc
View File

@ -8998,7 +8998,7 @@ static int mysql_init_variables(void)
#if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY) #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
have_ssl=SHOW_OPTION_YES; have_ssl=SHOW_OPTION_YES;
#if HAVE_YASSL #if defined(HAVE_YASSL)
have_openssl= SHOW_OPTION_NO; have_openssl= SHOW_OPTION_NO;
#else #else
have_openssl= SHOW_OPTION_YES; have_openssl= SHOW_OPTION_YES;

4
sql/opt_range_mrr.cc
View File

@ -135,7 +135,7 @@ static void step_down_to(SEL_ARG_RANGE_SEQ *arg, SEL_ARG *key_tree)
TRUE No more ranges in the sequence TRUE No more ranges in the sequence
*/ */
#if (_MSC_FULL_VER == 160030319) #if defined(_MSC_FULL_VER) && (_MSC_FULL_VER == 160030319)
/* /*
Workaround Visual Studio 2010 RTM compiler backend bug, the function enters Workaround Visual Studio 2010 RTM compiler backend bug, the function enters
infinite loop. infinite loop.
@ -315,7 +315,7 @@ walk_up_n_right:
return 0; return 0;
} }
#if (_MSC_FULL_VER == 160030319) #if defined(_MSC_FULL_VER) && (_MSC_FULL_VER == 160030319)
/* VS2010 compiler bug workaround */ /* VS2010 compiler bug workaround */
#pragma optimize("g", on) #pragma optimize("g", on)
#endif #endif

2
sql/sql_lex.h
View File

@ -173,7 +173,7 @@ struct LEX_TYPE
#define LEX_YYSTYPE void * #define LEX_YYSTYPE void *
#else #else
#include "lex_symbol.h" #include "lex_symbol.h"
#if MYSQL_LEX #ifdef MYSQL_LEX
#include "item_func.h" /* Cast_target used in sql_yacc.h */ #include "item_func.h" /* Cast_target used in sql_yacc.h */
#include "sql_get_diagnostics.h" /* Types used in sql_yacc.h */ #include "sql_get_diagnostics.h" /* Types used in sql_yacc.h */
#include "sp_pcontext.h" #include "sp_pcontext.h"

12
storage/innobase/btr/btr0cur.cc
View File

@ -75,18 +75,14 @@ enum btr_op_t {
BTR_DELMARK_OP /*!< Mark a record for deletion */ BTR_DELMARK_OP /*!< Mark a record for deletion */
}; };
/** Modification types for the B-tree operation. */ /** Modification types for the B-tree operation.
Note that the order must be DELETE, BOTH, INSERT !!
*/
enum btr_intention_t { enum btr_intention_t {
BTR_INTENTION_DELETE, BTR_INTENTION_DELETE,
BTR_INTENTION_BOTH, BTR_INTENTION_BOTH,
BTR_INTENTION_INSERT BTR_INTENTION_INSERT
}; };
#if BTR_INTENTION_DELETE > BTR_INTENTION_BOTH
#error "BTR_INTENTION_DELETE > BTR_INTENTION_BOTH"
#endif
#if BTR_INTENTION_BOTH > BTR_INTENTION_INSERT
#error "BTR_INTENTION_BOTH > BTR_INTENTION_INSERT"
#endif
/** For the index->lock scalability improvement, only possibility of clear /** For the index->lock scalability improvement, only possibility of clear
performance regression observed was caused by grown huge history list length. performance regression observed was caused by grown huge history list length.
@ -209,6 +205,7 @@ btr_rec_free_externally_stored_fields(
/*==================== B-TREE SEARCH =========================*/ /*==================== B-TREE SEARCH =========================*/
/**
#if MTR_MEMO_PAGE_S_FIX != RW_S_LATCH #if MTR_MEMO_PAGE_S_FIX != RW_S_LATCH
#error "MTR_MEMO_PAGE_S_FIX != RW_S_LATCH" #error "MTR_MEMO_PAGE_S_FIX != RW_S_LATCH"
#endif #endif
@ -218,6 +215,7 @@ btr_rec_free_externally_stored_fields(
#if MTR_MEMO_PAGE_SX_FIX != RW_SX_LATCH #if MTR_MEMO_PAGE_SX_FIX != RW_SX_LATCH
#error "MTR_MEMO_PAGE_SX_FIX != RW_SX_LATCH" #error "MTR_MEMO_PAGE_SX_FIX != RW_SX_LATCH"
#endif #endif
*/
/** Latches the leaf page or pages requested. /** Latches the leaf page or pages requested.
@param[in] block leaf page where the search converged @param[in] block leaf page where the search converged

6
storage/innobase/fil/fil0pagecompress.cc
View File

@ -100,7 +100,7 @@ fil_compress_page(
int comp_level = int(level); int comp_level = int(level);
ulint header_len = FIL_PAGE_DATA + FIL_PAGE_COMPRESSED_SIZE; ulint header_len = FIL_PAGE_DATA + FIL_PAGE_COMPRESSED_SIZE;
ulint write_size = 0; ulint write_size = 0;
#if HAVE_LZO #if defined(HAVE_LZO)
lzo_uint write_size_lzo = write_size; lzo_uint write_size_lzo = write_size;
#endif #endif
/* Cache to avoid change during function execution */ /* Cache to avoid change during function execution */
@ -122,12 +122,12 @@ fil_compress_page(
/* Both snappy and lzo compression methods require that /* Both snappy and lzo compression methods require that
output buffer used for compression is bigger than input output buffer used for compression is bigger than input
buffer. Increase the allocated buffer size accordingly. */ buffer. Increase the allocated buffer size accordingly. */
#if HAVE_SNAPPY #if defined(HAVE_SNAPPY)
if (comp_method == PAGE_SNAPPY_ALGORITHM) { if (comp_method == PAGE_SNAPPY_ALGORITHM) {
size = snappy_max_compressed_length(size); size = snappy_max_compressed_length(size);
} }
#endif #endif
#if HAVE_LZO #if defined(HAVE_LZO)
if (comp_method == PAGE_LZO_ALGORITHM) { if (comp_method == PAGE_LZO_ALGORITHM) {
size += LZO1X_1_15_MEM_COMPRESS; size += LZO1X_1_15_MEM_COMPRESS;
} }

2
storage/innobase/gis/gis0sea.cc
View File

@ -304,7 +304,7 @@ rtr_pcur_getnext_from_path(
rtr_info->thr); rtr_info->thr);
} }
new_split = true; new_split = true;
#if UNIV_GIS_DEBUG #if defined(UNIV_GIS_DEBUG)
fprintf(stderr, fprintf(stderr,
"GIS_DIAG: Splitted page found: %d, %ld\n", "GIS_DIAG: Splitted page found: %d, %ld\n",
static_cast<int>(need_parent), next_page_no); static_cast<int>(need_parent), next_page_no);

4
storage/innobase/include/dict0mem.h
View File

@ -866,8 +866,8 @@ struct dict_index_t{
in a clustered index record, if the fields in a clustered index record, if the fields
before it are known to be of a fixed size, before it are known to be of a fixed size,
0 otherwise */ 0 otherwise */
#if (1<<MAX_KEY_LENGTH_BITS) < MAX_KEY_LENGTH #if (1<<MAX_KEY_LENGTH_BITS) < HA_MAX_KEY_LENGTH
# error (1<<MAX_KEY_LENGTH_BITS) < MAX_KEY_LENGTH # error (1<<MAX_KEY_LENGTH_BITS) < HA_MAX_KEY_LENGTH
#endif #endif
unsigned n_user_defined_cols:10; unsigned n_user_defined_cols:10;
/*!< number of columns the user defined to /*!< number of columns the user defined to

1
storage/innobase/include/dict0types.h
View File

@ -28,6 +28,7 @@ Created 1/8/1996 Heikki Tuuri
#define dict0types_h #define dict0types_h
#include <ut0mutex.h> #include <ut0mutex.h>
#include <rem0types.h>
struct dict_sys_t; struct dict_sys_t;
struct dict_col_t; struct dict_col_t;

2
storage/innobase/page/page0page.cc
View File

@ -2536,7 +2536,7 @@ page_validate(
data_size += rec_offs_size(offsets); data_size += rec_offs_size(offsets);
#if UNIV_GIS_DEBUG #if defined(UNIV_GIS_DEBUG)
/* For spatial index, print the mbr info.*/ /* For spatial index, print the mbr info.*/
if (index->type & DICT_SPATIAL) { if (index->type & DICT_SPATIAL) {
rec_print_mbr_rec(stderr, rec, offsets); rec_print_mbr_rec(stderr, rec, offsets);

2
storage/mroonga/vendor/groonga/lib/alloc.c vendored
View File

@ -644,7 +644,7 @@ grn_ctx_free_lifo(grn_ctx *ctx, void *ptr,
} }
} }
#if USE_DYNAMIC_MALLOC_CHANGE #if defined(USE_DYNAMIC_MALLOC_CHANGE)
grn_malloc_func grn_malloc_func
grn_ctx_get_malloc(grn_ctx *ctx) grn_ctx_get_malloc(grn_ctx *ctx)
{ {

2
storage/mroonga/vendor/groonga/lib/grn.h vendored
View File

@ -259,7 +259,7 @@ typedef pthread_key_t grn_thread_key;
# define THREAD_SETSPECIFIC(key, value) pthread_setspecific(key, value) # define THREAD_SETSPECIFIC(key, value) pthread_setspecific(key, value)
# define THREAD_GETSPECIFIC(key) pthread_getspecific(key) # define THREAD_GETSPECIFIC(key) pthread_getspecific(key)
#if USE_UYIELD #if defined(USE_UYIELD)
extern int grn_uyield_count; extern int grn_uyield_count;
#define GRN_TEST_YIELD() do {\ #define GRN_TEST_YIELD() do {\
if (((++grn_uyield_count) & (0x20 - 1)) == 0) {\ if (((++grn_uyield_count) & (0x20 - 1)) == 0) {\

2
storage/rocksdb/rdb_buff.h
View File

@ -30,7 +30,7 @@
#define be16toh _byteswap_ushort #define be16toh _byteswap_ushort
#endif #endif
#if __APPLE__ #if defined(__APPLE__)
#include <libkern/OSByteOrder.h> #include <libkern/OSByteOrder.h>
#define htobe64(x) OSSwapHostToBigInt64(x) #define htobe64(x) OSSwapHostToBigInt64(x)
#define be64toh(x) OSSwapBigToHostInt64(x) #define be64toh(x) OSSwapBigToHostInt64(x)

2
storage/tokudb/PerconaFT/ft/serialize/block_allocator.cc
View File

@ -49,7 +49,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include "ft/serialize/block_allocator.h" #include "ft/serialize/block_allocator.h"
#include "ft/serialize/rbtree_mhs.h" #include "ft/serialize/rbtree_mhs.h"
#if TOKU_DEBUG_PARANOID #ifdef TOKU_DEBUG_PARANOID
#define VALIDATE() Validate() #define VALIDATE() Validate()
#else #else
#define VALIDATE() #define VALIDATE()

2
storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp
View File

@ -39,7 +39,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include "malloc_utils.hpp" #include "malloc_utils.hpp"
#if !HAVE_BITS_FUNCTEXCEPT_H #if !defined(HAVE_BITS_FUNCTEXCEPT_H)
namespace std { namespace std {

2
storage/tokudb/PerconaFT/ftcxx/malloc_utils.hpp
View File

@ -47,7 +47,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include <cassert> #include <cassert>
#include <cstdlib> #include <cstdlib>
#if HAVE_BITS_FUNCTEXCEPT_H #ifdef HAVE_BITS_FUNCTEXCEPT_H
# include <bits/functexcept.h> # include <bits/functexcept.h>

14
storage/tokudb/PerconaFT/portability/memory.cc
View File

@ -182,7 +182,7 @@ toku_memory_footprint(void * p, size_t touched)
void * void *
toku_malloc(size_t size) { toku_malloc(size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
return nullptr; return nullptr;
} }
@ -209,7 +209,7 @@ toku_malloc(size_t size) {
} }
void *toku_malloc_aligned(size_t alignment, size_t size) { void *toku_malloc_aligned(size_t alignment, size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
return nullptr; return nullptr;
} }
@ -245,7 +245,7 @@ toku_calloc(size_t nmemb, size_t size) {
void * void *
toku_realloc(void *p, size_t size) { toku_realloc(void *p, size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
if (p != nullptr) { if (p != nullptr) {
toku_free(p); toku_free(p);
@ -276,7 +276,7 @@ toku_realloc(void *p, size_t size) {
} }
void *toku_realloc_aligned(size_t alignment, void *p, size_t size) { void *toku_realloc_aligned(size_t alignment, void *p, size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
if (p != nullptr) { if (p != nullptr) {
toku_free(p); toku_free(p);
@ -345,7 +345,7 @@ toku_free(void *p) {
void * void *
toku_xmalloc(size_t size) { toku_xmalloc(size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
return nullptr; return nullptr;
} }
@ -375,7 +375,7 @@ void* toku_xmalloc_aligned(size_t alignment, size_t size)
// Fail with a resource_assert if the allocation fails (don't return an error code). // Fail with a resource_assert if the allocation fails (don't return an error code).
// Requires: alignment is a power of two. // Requires: alignment is a power of two.
{ {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
return nullptr; return nullptr;
} }
@ -409,7 +409,7 @@ toku_xcalloc(size_t nmemb, size_t size) {
void * void *
toku_xrealloc(void *v, size_t size) { toku_xrealloc(void *v, size_t size) {
#if __APPLE__ #if defined(__APPLE__)
if (size == 0) { if (size == 0) {
if (v != nullptr) { if (v != nullptr) {
toku_free(v); toku_free(v);

2
storage/tokudb/PerconaFT/portability/toku_assert.h
View File

@ -126,7 +126,7 @@ void db_env_do_backtrace(FILE *outf);
#define resource_assert_zero(a) assert_zero(a) // indicates resource must be available, otherwise unrecoverable #define resource_assert_zero(a) assert_zero(a) // indicates resource must be available, otherwise unrecoverable
#define resource_assert_equals(a, b) assert_equals(a, b) // indicates resource must be available, otherwise unrecoverable #define resource_assert_equals(a, b) assert_equals(a, b) // indicates resource must be available, otherwise unrecoverable
#if TOKU_DEBUG_PARANOID #if defined(TOKU_DEBUG_PARANOID)
#define paranoid_invariant(a) assert(a) #define paranoid_invariant(a) assert(a)
#define paranoid_invariant_null(a) assert_null(a) #define paranoid_invariant_null(a) assert_null(a)
#define paranoid_invariant_notnull(a) assert(a) #define paranoid_invariant_notnull(a) assert(a)

2
storage/tokudb/PerconaFT/portability/toku_portability.h
View File

@ -71,7 +71,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#if __FreeBSD__ #if defined(__FreeBSD__)
#include <stdarg.h> #include <stdarg.h>
#endif #endif

2
storage/tokudb/PerconaFT/util/scoped_malloc.cc
View File

@ -94,7 +94,7 @@ namespace toku {
} }
void destroy() { void destroy() {
#if TOKU_SCOPED_MALLOC_DEBUG #ifdef TOKU_SCOPED_MALLOC_DEBUG
printf("%s %p %p\n", __FUNCTION__, this, m_stack); printf("%s %p %p\n", __FUNCTION__, this, m_stack);
#endif #endif
if (m_stack != NULL) { if (m_stack != NULL) {

4
storage/tokudb/ha_tokudb.h
View File

@ -941,7 +941,7 @@ public:
public: public:
#endif #endif
#if TOKU_INCLUDE_ALTER_55 #if defined(TOKU_INCLUDE_ALTER_55)
public: public:
// Returns true of the 5.6 inplace alter table interface is used. // Returns true of the 5.6 inplace alter table interface is used.
bool try_hot_alter_table(); bool try_hot_alter_table();
@ -1037,7 +1037,7 @@ private:
#if TOKU_INCLUDE_WRITE_FRM_DATA #if TOKU_INCLUDE_WRITE_FRM_DATA
int write_frm_data(const uchar *frm_data, size_t frm_len); int write_frm_data(const uchar *frm_data, size_t frm_len);
#endif #endif
#if TOKU_INCLUDE_UPSERT #if defined(TOKU_INCLUDE_UPSERT)
private: private:
int fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds); int fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds);
bool check_fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds); bool check_fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds);

2
storage/tokudb/ha_tokudb_alter_55.cc
View File

@ -23,7 +23,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved." #ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
#if TOKU_INCLUDE_ALTER_55 #if defined(TOKU_INCLUDE_ALTER_55)
#include "ha_tokudb_alter_common.cc" #include "ha_tokudb_alter_common.cc"

2
storage/tokudb/ha_tokudb_update.cc
View File

@ -23,7 +23,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved." #ident "Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved."
#if TOKU_INCLUDE_UPSERT #if defined(TOKU_INCLUDE_UPSERT)
// Point updates and upserts // Point updates and upserts

10
storage/tokudb/hatoku_hton.cc
View File

@ -62,7 +62,7 @@ static bool tokudb_show_status(
THD* thd, THD* thd,
stat_print_fn* print, stat_print_fn* print,
enum ha_stat_type); enum ha_stat_type);
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
static void tokudb_handle_fatal_signal(handlerton* hton, THD* thd, int sig); static void tokudb_handle_fatal_signal(handlerton* hton, THD* thd, int sig);
#endif #endif
static int tokudb_close_connection(handlerton* hton, THD* thd); static int tokudb_close_connection(handlerton* hton, THD* thd);
@ -393,7 +393,7 @@ static int tokudb_init_func(void *p) {
tokudb_hton->panic = tokudb_end; tokudb_hton->panic = tokudb_end;
tokudb_hton->flush_logs = tokudb_flush_logs; tokudb_hton->flush_logs = tokudb_flush_logs;
tokudb_hton->show_status = tokudb_show_status; tokudb_hton->show_status = tokudb_show_status;
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
tokudb_hton->handle_fatal_signal = tokudb_handle_fatal_signal; tokudb_hton->handle_fatal_signal = tokudb_handle_fatal_signal;
#endif #endif
@ -1517,7 +1517,7 @@ static bool tokudb_show_status(
return false; return false;
} }
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
static void tokudb_handle_fatal_signal( static void tokudb_handle_fatal_signal(
TOKUDB_UNUSED(handlerton* hton), TOKUDB_UNUSED(handlerton* hton),
TOKUDB_UNUSD(THD* thd), TOKUDB_UNUSD(THD* thd),
@ -1599,7 +1599,7 @@ struct st_mysql_storage_engine tokudb_storage_engine = {
MYSQL_HANDLERTON_INTERFACE_VERSION MYSQL_HANDLERTON_INTERFACE_VERSION
}; };
#if TOKU_INCLUDE_LOCK_TIMEOUT_QUERY_STRING #if defined(TOKU_INCLUDE_LOCK_TIMEOUT_QUERY_STRING)
struct tokudb_search_txn_extra { struct tokudb_search_txn_extra {
bool match_found; bool match_found;
uint64_t match_txn_id; uint64_t match_txn_id;
@ -1768,7 +1768,7 @@ static void tokudb_lock_timeout_callback(
mysql_thread_id, mysql_thread_id,
(int)qs->length, (int)qs->length,
qs->str); qs->str);
#if TOKU_INCLUDE_LOCK_TIMEOUT_QUERY_STRING #if defined(TOKU_INCLUDE_LOCK_TIMEOUT_QUERY_STRING)
uint64_t blocking_thread_id = 0; uint64_t blocking_thread_id = 0;
if (tokudb_txn_id_to_client_id( if (tokudb_txn_id_to_client_id(
thd, thd,

12
storage/tokudb/tokudb_sysvars.cc
View File

@ -74,7 +74,7 @@ my_bool dir_per_db = FALSE;
char* version = (char*) TOKUDB_VERSION_STR; char* version = (char*) TOKUDB_VERSION_STR;
// file system reserve as a percentage of total disk space // file system reserve as a percentage of total disk space
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
char* gdb_path = NULL; char* gdb_path = NULL;
my_bool gdb_on_fatal = FALSE; my_bool gdb_on_fatal = FALSE;
#endif #endif
@ -411,7 +411,7 @@ static MYSQL_SYSVAR_BOOL(dir_per_db, dir_per_db,
0, "TokuDB store ft files in db directories", 0, "TokuDB store ft files in db directories",
NULL, tokudb_dir_per_db_update, FALSE); NULL, tokudb_dir_per_db_update, FALSE);
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
static MYSQL_SYSVAR_STR( static MYSQL_SYSVAR_STR(
gdb_path, gdb_path,
gdb_path, gdb_path,
@ -894,7 +894,7 @@ static MYSQL_THDVAR_ULONGLONG(
~0ULL, ~0ULL,
1); 1);
#if TOKU_INCLUDE_UPSERT #if defined(TOKU_INCLUDE_UPSERT)
static MYSQL_THDVAR_BOOL( static MYSQL_THDVAR_BOOL(
disable_slow_update, disable_slow_update,
PLUGIN_VAR_THDLOCAL, PLUGIN_VAR_THDLOCAL,
@ -951,7 +951,7 @@ st_mysql_sys_var* system_variables[] = {
MYSQL_SYSVAR(version), MYSQL_SYSVAR(version),
MYSQL_SYSVAR(write_status_frequency), MYSQL_SYSVAR(write_status_frequency),
MYSQL_SYSVAR(dir_per_db), MYSQL_SYSVAR(dir_per_db),
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
MYSQL_SYSVAR(gdb_path), MYSQL_SYSVAR(gdb_path),
MYSQL_SYSVAR(gdb_on_fatal), MYSQL_SYSVAR(gdb_on_fatal),
#endif #endif
@ -997,7 +997,7 @@ st_mysql_sys_var* system_variables[] = {
MYSQL_SYSVAR(rpl_unique_checks), MYSQL_SYSVAR(rpl_unique_checks),
MYSQL_SYSVAR(rpl_unique_checks_delay), MYSQL_SYSVAR(rpl_unique_checks_delay),
#if TOKU_INCLUDE_UPSERT #if defined(TOKU_INCLUDE_UPSERT)
MYSQL_SYSVAR(disable_slow_update), MYSQL_SYSVAR(disable_slow_update),
MYSQL_SYSVAR(disable_slow_upsert), MYSQL_SYSVAR(disable_slow_upsert),
#endif #endif
@ -1055,7 +1055,7 @@ my_bool disable_prefetching(THD* thd) {
my_bool disable_slow_alter(THD* thd) { my_bool disable_slow_alter(THD* thd) {
return (THDVAR(thd, disable_slow_alter) != 0); return (THDVAR(thd, disable_slow_alter) != 0);
} }
#if TOKU_INCLUDE_UPSERT #if defined(TOKU_INCLUDE_UPSERT)
my_bool disable_slow_update(THD* thd) { my_bool disable_slow_update(THD* thd) {
return (THDVAR(thd, disable_slow_update) != 0); return (THDVAR(thd, disable_slow_update) != 0);
} }

2
storage/tokudb/tokudb_sysvars.h
View File

@ -104,7 +104,7 @@ extern uint write_status_frequency;
extern my_bool dir_per_db; extern my_bool dir_per_db;
extern char* version; extern char* version;
#if TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL #if defined(TOKU_INCLUDE_HANDLERTON_HANDLE_FATAL_SIGNAL)
extern char* gdb_path; extern char* gdb_path;
extern my_bool gdb_on_fatal; extern my_bool gdb_on_fatal;
#endif #endif