After merge fix for Bug#12076 --with-extra-charsets has no effect

mysql-test/r/information_schema.result

@@ -201,34 +201,34 @@ latin1	cp1252 West European	latin1_swedish_ci	1
 select * from information_schema.COLLATIONS
 where COLLATION_NAME like 'latin1%';
 COLLATION_NAME	CHARACTER_SET_NAME	ID	IS_DEFAULT	IS_COMPILED	SORTLEN
-latin1_german1_ci	latin1	5			0
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin1_danish_ci	latin1	15			0
-latin1_german2_ci	latin1	31		Yes	2
-latin1_bin	latin1	47		Yes	1
-latin1_general_ci	latin1	48			0
-latin1_general_cs	latin1	49			0
-latin1_spanish_ci	latin1	94			0
+latin1_german1_ci	latin1	5		#	1
+latin1_swedish_ci	latin1	8	Yes	#	1
+latin1_danish_ci	latin1	15		#	1
+latin1_german2_ci	latin1	31		#	2
+latin1_bin	latin1	47		#	1
+latin1_general_ci	latin1	48		#	1
+latin1_general_cs	latin1	49		#	1
+latin1_spanish_ci	latin1	94		#	1
 SHOW COLLATION LIKE 'latin1%';
 Collation	Charset	Id	Default	Compiled	Sortlen
-latin1_german1_ci	latin1	5			0
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin1_danish_ci	latin1	15			0
-latin1_german2_ci	latin1	31		Yes	2
-latin1_bin	latin1	47		Yes	1
-latin1_general_ci	latin1	48			0
-latin1_general_cs	latin1	49			0
-latin1_spanish_ci	latin1	94			0
+latin1_german1_ci	latin1	5		#	1
+latin1_swedish_ci	latin1	8	Yes	#	1
+latin1_danish_ci	latin1	15		#	1
+latin1_german2_ci	latin1	31		#	2
+latin1_bin	latin1	47		#	1
+latin1_general_ci	latin1	48		#	1
+latin1_general_cs	latin1	49		#	1
+latin1_spanish_ci	latin1	94		#	1
 SHOW COLLATION WHERE collation like 'latin1%';
 Collation	Charset	Id	Default	Compiled	Sortlen
-latin1_german1_ci	latin1	5			0
-latin1_swedish_ci	latin1	8	Yes	Yes	1
-latin1_danish_ci	latin1	15			0
-latin1_german2_ci	latin1	31		Yes	2
-latin1_bin	latin1	47		Yes	1
-latin1_general_ci	latin1	48			0
-latin1_general_cs	latin1	49			0
-latin1_spanish_ci	latin1	94			0
+latin1_german1_ci	latin1	5		#	1
+latin1_swedish_ci	latin1	8	Yes	#	1
+latin1_danish_ci	latin1	15		#	1
+latin1_german2_ci	latin1	31		#	2
+latin1_bin	latin1	47		#	1
+latin1_general_ci	latin1	48		#	1
+latin1_general_cs	latin1	49		#	1
+latin1_spanish_ci	latin1	94		#	1
 select * from information_schema.COLLATION_CHARACTER_SET_APPLICABILITY
 where COLLATION_NAME like 'latin1%';
 COLLATION_NAME	CHARACTER_SET_NAME

mysql-test/t/information_schema.test

@@ -93,9 +93,12 @@ SHOW CHARACTER SET WHERE charset like 'latin1%';
 # Test for information_schema.COLLATIONS &
 # SHOW COLLATION
 
+--replace_column 5 #
 select * from information_schema.COLLATIONS
 where COLLATION_NAME like 'latin1%';
+--replace_column 5 #
 SHOW COLLATION LIKE 'latin1%';
+--replace_column 5 #
 SHOW COLLATION WHERE collation like 'latin1%';
 
 select * from information_schema.COLLATION_CHARACTER_SET_APPLICABILITY

strings/conf_to_src.c

@@ -221,15 +221,19 @@ void dispcset(FILE *f,CHARSET_INFO *cs)
   }
 
   fprintf(f,"  NULL,                       /* from_uni      */\n");
+  fprintf(f,"  my_unicase_default,         /* caseinfo      */\n");
   fprintf(f,"  NULL,                       /* state map     */\n");
   fprintf(f,"  NULL,                       /* ident map     */\n");
   fprintf(f,"  1,                          /* strxfrm_multiply*/\n");
+  fprintf(f,"  1,                          /* caseup_multiply*/\n");
+  fprintf(f,"  1,                          /* casedn_multiply*/\n");
   fprintf(f,"  1,                          /* mbminlen      */\n");
   fprintf(f,"  1,                          /* mbmaxlen      */\n");
   fprintf(f,"  0,                          /* min_sort_char */\n");
   fprintf(f,"  255,                        /* max_sort_char */\n");
+  fprintf(f,"  ' ',                        /* pad_char      */\n");
   fprintf(f,"  0,                          /* escape_with_backslash_is_dangerous */\n");
-            
+  
   fprintf(f,"  &my_charset_8bit_handler,\n");
   if (cs->state & MY_CS_BINSORT)
     fprintf(f,"  &my_collation_8bit_bin_handler,\n");