codership/mysql-wsrep#348 Increase MYSQL_MAX_VARIABLE_VALUE_LEN

Increased MYSQL_MAX_VARIABLE_VALUE_LEN to 4096 in order to allow longer wsrep_provider_option strings. Recorded main.show_check.
MariaDB · Jan 31, 2019 · 5e0117f · 5e0117f
1 parent c28d7ac
commit 5e0117f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cmake/wsrep.cmake b/cmake/wsrep.cmake
@@ -54,7 +54,7 @@ ENDIF()
 
 OPTION(WITH_WSREP "WSREP replication API (to use, e.g. Galera Replication library)" ON)
 IF (WITH_WSREP)
-  SET(WSREP_C_FLAGS   "-DWITH_WSREP -DWSREP_PROC_INFO -DMYSQL_MAX_VARIABLE_VALUE_LEN=2048")
+  SET(WSREP_C_FLAGS   "-DWITH_WSREP -DWSREP_PROC_INFO -DMYSQL_MAX_VARIABLE_VALUE_LEN=4096")
   SET(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${WSREP_C_FLAGS}")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WSREP_C_FLAGS}")
   SET(COMPILATION_COMMENT "${COMPILATION_COMMENT}, wsrep_${WSREP_VERSION}")

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
@@ -101,19 +101,19 @@ drop table t1;
 show variables like "wait_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	5	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	4096	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "WAIT_timeout%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	12	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	5	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	4096	5	Y	0	0	8
 Variable_name	Value
 wait_timeout	28800
 show variables like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def	information_schema	VARIABLES	VARIABLES	VARIABLE_NAME	Variable_name	253	64	0	N	1	0	8
-def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	2048	0	Y	0	0	8
+def	information_schema	VARIABLES	VARIABLES	VARIABLE_VALUE	Value	253	4096	0	Y	0	0	8
 Variable_name	Value
 show table status from test like "this_doesn't_exists%";
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

diff --git a/scripts/mysql_config.pl b/scripts/mysql_config.pl
@@ -53,7 +53,7 @@
 my $basedir;
 
 my $socket  = '/tmp/mysql.sock';
-my $version = '5.5.61';
+my $version = '5.5.62';
 
 sub which
 {