Commit 9f909e54 authored by Jan Lindström's avatar Jan Lindström Committed by Julius Goryavsky

MDEV-30197 : Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function...

MDEV-30197 : Missing DBUG_RETURN or DBUG_VOID_RETURN macro in function "Wsrep_schema::restore_view()"

Here user is starting server with unsupported client charset.
We need to create wsrep_schema tables using explicit latin1
charset to avoid errors in restoring view.
parent 1ac00c5e
...@@ -50,7 +50,7 @@ static const std::string create_cluster_table_str= ...@@ -50,7 +50,7 @@ static const std::string create_cluster_table_str=
"view_seqno BIGINT NOT NULL," "view_seqno BIGINT NOT NULL,"
"protocol_version INT NOT NULL," "protocol_version INT NOT NULL,"
"capabilities INT NOT NULL" "capabilities INT NOT NULL"
") ENGINE=InnoDB STATS_PERSISTENT=0"; ") ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1";
static const std::string create_members_table_str= static const std::string create_members_table_str=
"CREATE TABLE IF NOT EXISTS " + wsrep_schema_str + "." + members_table_str + "CREATE TABLE IF NOT EXISTS " + wsrep_schema_str + "." + members_table_str +
...@@ -59,7 +59,7 @@ static const std::string create_members_table_str= ...@@ -59,7 +59,7 @@ static const std::string create_members_table_str=
"cluster_uuid CHAR(36) NOT NULL," "cluster_uuid CHAR(36) NOT NULL,"
"node_name CHAR(32) NOT NULL," "node_name CHAR(32) NOT NULL,"
"node_incoming_address VARCHAR(256) NOT NULL" "node_incoming_address VARCHAR(256) NOT NULL"
") ENGINE=InnoDB STATS_PERSISTENT=0"; ") ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1";
#ifdef WSREP_SCHEMA_MEMBERS_HISTORY #ifdef WSREP_SCHEMA_MEMBERS_HISTORY
static const std::string cluster_member_history_table_str= "wsrep_cluster_member_history"; static const std::string cluster_member_history_table_str= "wsrep_cluster_member_history";
...@@ -72,7 +72,7 @@ static const std::string create_members_history_table_str= ...@@ -72,7 +72,7 @@ static const std::string create_members_history_table_str=
"last_view_seqno BIGINT NOT NULL," "last_view_seqno BIGINT NOT NULL,"
"node_name CHAR(32) NOT NULL," "node_name CHAR(32) NOT NULL,"
"node_incoming_address VARCHAR(256) NOT NULL" "node_incoming_address VARCHAR(256) NOT NULL"
") ENGINE=InnoDB STATS_PERSISTENT=0"; ") ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1";
#endif /* WSREP_SCHEMA_MEMBERS_HISTORY */ #endif /* WSREP_SCHEMA_MEMBERS_HISTORY */
static const std::string create_frag_table_str= static const std::string create_frag_table_str=
...@@ -84,7 +84,7 @@ static const std::string create_frag_table_str= ...@@ -84,7 +84,7 @@ static const std::string create_frag_table_str=
"flags INT NOT NULL, " "flags INT NOT NULL, "
"frag LONGBLOB NOT NULL, " "frag LONGBLOB NOT NULL, "
"PRIMARY KEY (node_uuid, trx_id, seqno)" "PRIMARY KEY (node_uuid, trx_id, seqno)"
") ENGINE=InnoDB STATS_PERSISTENT=0"; ") ENGINE=InnoDB STATS_PERSISTENT=0 CHARSET=latin1";
static const std::string delete_from_cluster_table= static const std::string delete_from_cluster_table=
"DELETE FROM " + wsrep_schema_str + "." + cluster_table_str; "DELETE FROM " + wsrep_schema_str + "." + cluster_table_str;
...@@ -96,21 +96,21 @@ static const std::string delete_from_members_table= ...@@ -96,21 +96,21 @@ static const std::string delete_from_members_table=
persistent statistics to be collected from these tables. */ persistent statistics to be collected from these tables. */
static const std::string alter_cluster_table= static const std::string alter_cluster_table=
"ALTER TABLE " + wsrep_schema_str + "." + cluster_table_str + "ALTER TABLE " + wsrep_schema_str + "." + cluster_table_str +
" STATS_PERSISTENT=0"; " STATS_PERSISTENT=0 CHARSET=latin1";
static const std::string alter_members_table= static const std::string alter_members_table=
"ALTER TABLE " + wsrep_schema_str + "." + members_table_str + "ALTER TABLE " + wsrep_schema_str + "." + members_table_str +
" STATS_PERSISTENT=0"; " STATS_PERSISTENT=0 CHARSET=latin1";
#ifdef WSREP_SCHEMA_MEMBERS_HISTORY #ifdef WSREP_SCHEMA_MEMBERS_HISTORY
static const std::string alter_members_history_table= static const std::string alter_members_history_table=
"ALTER TABLE " + wsrep_schema_str + "." + members_history_table_str + "ALTER TABLE " + wsrep_schema_str + "." + members_history_table_str +
" STATS_PERSISTENT=0"; " STATS_PERSISTENT=0 CHARSET=latin1";
#endif #endif
static const std::string alter_frag_table= static const std::string alter_frag_table=
"ALTER TABLE " + wsrep_schema_str + "." + sr_table_str + "ALTER TABLE " + wsrep_schema_str + "." + sr_table_str +
" STATS_PERSISTENT=0"; " STATS_PERSISTENT=0 CHARSET=latin1";
namespace Wsrep_schema_impl namespace Wsrep_schema_impl
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment