diff options
| -rw-r--r-- | mysys/thr_lock.c | 11 | ||||
| -rw-r--r-- | sql/sql_signal.cc | 14 | ||||
| -rw-r--r-- | sql/wsrep_sst.cc | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 1 | ||||
| -rw-r--r-- | storage/federated/ha_federated.h | 1 | ||||
| -rw-r--r-- | storage/federatedx/federatedx_io.cc | 2 | ||||
| -rw-r--r-- | storage/federatedx/ha_federatedx.cc | 1 | ||||
| -rw-r--r-- | storage/federatedx/ha_federatedx.h | 1 | ||||
| -rw-r--r-- | strings/ctype-utf8.c | 31 |
9 files changed, 1 insertions, 63 deletions
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c index 45376f7c5fc..5c3437382a5 100644 --- a/mysys/thr_lock.c +++ b/mysys/thr_lock.c @@ -497,17 +497,6 @@ has_old_lock(THR_LOCK_DATA *data, THR_LOCK_INFO *owner) return 0; } -static inline my_bool have_specific_lock(THR_LOCK_DATA *data, - enum thr_lock_type type) -{ - for ( ; data ; data=data->next) - { - if (data->type == type) - return 1; - } - return 0; -} - static void wake_up_waiters(THR_LOCK *lock); diff --git a/sql/sql_signal.cc b/sql/sql_signal.cc index 5f4862f173c..1b7edbee54a 100644 --- a/sql/sql_signal.cc +++ b/sql/sql_signal.cc @@ -63,20 +63,6 @@ const LEX_STRING Diag_condition_item_names[]= { C_STRING_WITH_LEN("TRIGGER_SCHEMA") } }; -const LEX_STRING Diag_statement_item_names[]= -{ - { C_STRING_WITH_LEN("NUMBER") }, - { C_STRING_WITH_LEN("MORE") }, - { C_STRING_WITH_LEN("COMMAND_FUNCTION") }, - { C_STRING_WITH_LEN("COMMAND_FUNCTION_CODE") }, - { C_STRING_WITH_LEN("DYNAMIC_FUNCTION") }, - { C_STRING_WITH_LEN("DYNAMIC_FUNCTION_CODE") }, - { C_STRING_WITH_LEN("ROW_COUNT") }, - { C_STRING_WITH_LEN("TRANSACTIONS_COMMITTED") }, - { C_STRING_WITH_LEN("TRANSACTIONS_ROLLED_BACK") }, - { C_STRING_WITH_LEN("TRANSACTION_ACTIVE") } -}; - Set_signal_information::Set_signal_information( const Set_signal_information& set) diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index addbfeb99f6..a54b96a4aa2 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -184,8 +184,6 @@ bool wsrep_sst_donor_update (sys_var *self, THD* thd, enum_var_type type) return 0; } -static wsrep_uuid_t cluster_uuid = WSREP_UUID_UNDEFINED; - bool wsrep_before_SE() { return (wsrep_provider != NULL diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index d234aa03eda..a0b2cb1ab3a 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -408,7 +408,6 @@ static const int bulk_padding= 64; // bytes "overhead" in packet /* Variables used when chopping off trailing characters */ static const uint sizeof_trailing_comma= sizeof(", ") - 1; -static const uint sizeof_trailing_closeparen= sizeof(") ") - 1; static const uint sizeof_trailing_and= sizeof(" AND ") - 1; static const uint sizeof_trailing_where= sizeof(" WHERE ") - 1; diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index a23375cbe58..78f959634da 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -89,7 +89,6 @@ class ha_federated: public handler */ DYNAMIC_ARRAY results; bool position_called, table_will_be_deleted; - uint fetch_num; // stores the fetch num MYSQL_ROW_OFFSET current_position; // Current position used by ::position() int remote_error_number; char remote_error_buf[FEDERATED_QUERY_BUFFER_SIZE]; diff --git a/storage/federatedx/federatedx_io.cc b/storage/federatedx/federatedx_io.cc index 1e0348e3bf8..5baec617cda 100644 --- a/storage/federatedx/federatedx_io.cc +++ b/storage/federatedx/federatedx_io.cc @@ -54,8 +54,6 @@ static const io_schemes_st federated_io_schemes[] = { "null", instantiate_io_null } /* must be last element */ }; -const uint federated_io_schemes_count= array_elements(federated_io_schemes); - federatedx_io::federatedx_io(FEDERATEDX_SERVER *aserver) : server(aserver), owner_ptr(0), txn_next(0), idle_next(0), active(FALSE), busy(FALSE), readonly(TRUE) diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 50be6575a83..0c3d39c1ab5 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -337,7 +337,6 @@ static const int bulk_padding= 64; // bytes "overhead" in packet /* Variables used when chopping off trailing characters */ static const uint sizeof_trailing_comma= sizeof(", ") - 1; -static const uint sizeof_trailing_closeparen= sizeof(") ") - 1; static const uint sizeof_trailing_and= sizeof(" AND ") - 1; static const uint sizeof_trailing_where= sizeof(" WHERE ") - 1; diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index f3af7258623..56c34d9ef37 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -270,7 +270,6 @@ class ha_federatedx: public handler */ DYNAMIC_ARRAY results; bool position_called; - uint fetch_num; // stores the fetch num int remote_error_number; char remote_error_buf[FEDERATEDX_QUERY_BUFFER_SIZE]; bool ignore_duplicates, replace_duplicates; diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index efd862f5a1c..e2e3d96386e 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2009, 2019, MariaDB This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -4887,16 +4887,6 @@ static const uchar to_upper_utf8[] = { 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 }; -static inline int bincmp(const uchar *s, const uchar *se, - const uchar *t, const uchar *te) -{ - int slen= (int) (se-s), tlen= (int) (te-t); - int len=MY_MIN(slen,tlen); - int cmp= memcmp(s,t,len); - return cmp ? cmp : slen-tlen; -} - - static int my_utf8_uni(CHARSET_INFO *cs __attribute__((unused)), my_wc_t * pwc, const uchar *s, const uchar *e) { @@ -5059,14 +5049,6 @@ my_toupper_utf8mb3(MY_UNICASE_INFO *uni_plane, my_wc_t *wc) } -static inline void -my_tosort_utf8mb3(MY_UNICASE_INFO *uni_plane, my_wc_t *wc) -{ - MY_UNICASE_CHARACTER *page; - if ((page= uni_plane->page[(*wc >> 8) & 0xFF])) - *wc= page[*wc & 0xFF].sort; -} - static size_t my_caseup_utf8(CHARSET_INFO *cs, const char *src, size_t srclen, char *dst, size_t dstlen) { @@ -7306,17 +7288,6 @@ static uchar to_upper_utf8mb4[]= }; -static inline int -bincmp_utf8mb4(const uchar *s, const uchar *se, - const uchar *t, const uchar *te) -{ - int slen= (int) (se - s), tlen= (int) (te - t); - int len= MY_MIN(slen, tlen); - int cmp= memcmp(s, t, len); - return cmp ? cmp : slen - tlen; -} - - static int my_mb_wc_utf8mb4(CHARSET_INFO *cs __attribute__((unused)), my_wc_t * pwc, const uchar *s, const uchar *e) |