diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc index f4e79f5b698..38b7669726a 100644 --- a/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc +++ b/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc @@ -17,44 +17,6 @@ #include "plugin_log.h" #include -/* keep it in sync with enum_server_command in my_command.h */ -const LEX_STRING command_name[]={ - { C_STRING_WITH_LEN("Sleep") }, - { C_STRING_WITH_LEN("Quit") }, - { C_STRING_WITH_LEN("Init DB") }, - { C_STRING_WITH_LEN("Query") }, - { C_STRING_WITH_LEN("Field List") }, - { C_STRING_WITH_LEN("Create DB") }, - { C_STRING_WITH_LEN("Drop DB") }, - { C_STRING_WITH_LEN("Refresh") }, - { C_STRING_WITH_LEN("Shutdown") }, - { C_STRING_WITH_LEN("Statistics") }, - { C_STRING_WITH_LEN("Processlist") }, - { C_STRING_WITH_LEN("Connect") }, - { C_STRING_WITH_LEN("Kill") }, - { C_STRING_WITH_LEN("Debug") }, - { C_STRING_WITH_LEN("Ping") }, - { C_STRING_WITH_LEN("Time") }, - { C_STRING_WITH_LEN("Delayed insert") }, - { C_STRING_WITH_LEN("Change user") }, - { C_STRING_WITH_LEN("Binlog Dump") }, - { C_STRING_WITH_LEN("Table Dump") }, - { C_STRING_WITH_LEN("Connect Out") }, - { C_STRING_WITH_LEN("Register Slave") }, - { C_STRING_WITH_LEN("Prepare") }, - { C_STRING_WITH_LEN("Execute") }, - { C_STRING_WITH_LEN("Long Data") }, - { C_STRING_WITH_LEN("Close stmt") }, - { C_STRING_WITH_LEN("Reset stmt") }, - { C_STRING_WITH_LEN("Set option") }, - { C_STRING_WITH_LEN("Fetch") }, - { C_STRING_WITH_LEN("Daemon") }, - { C_STRING_WITH_LEN("Binlog Dump GTID") }, - { C_STRING_WITH_LEN("Reset Connection") }, - { C_STRING_WITH_LEN("Error") } // Last command number -}; - - /* Sql_service_interface constructor */ Sql_service_interface::Sql_service_interface(enum cs_text_or_binary cs_txt_bin, const CHARSET_INFO *charset) diff --git a/sql/partitioning/partition_handler.cc b/sql/partitioning/partition_handler.cc index ea9c73fd6e3..1d550f41f3c 100644 --- a/sql/partitioning/partition_handler.cc +++ b/sql/partitioning/partition_handler.cc @@ -3070,7 +3070,7 @@ int Partition_helper::handle_unordered_next(uchar *buf, bool is_next_same) m_start_key.key, m_start_key.length); } - else if ((m_index_scan_type == PARTITION_READ_RANGE)) + else if (m_index_scan_type == PARTITION_READ_RANGE) { DBUG_ASSERT(buf == m_table->record[0]); error= read_range_next_in_part(m_part_spec.start_part, NULL);