Merge mysql.com:/usr/home/bar/mysql-5.0 (fb559d43) · Commits · Software / OSDI20 Artifacts / mariadb

strings/conf_to_src.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@

		#define ROW_LEN 16
		#define ROW16_LEN 8
		#define MAX_BUF 16*1024
		#define MAX_BUF 64*1024

		static CHARSET_INFO all_charsets[256];

		@@ -156,6 +156,7 @@ static int my_read_charset_file(const char *filename)
		}

		len=read(fd,buf,MAX_BUF);
		DBUG_ASSERT(len < MAX_BUF);
		close(fd);

		if (my_parse_charset_xml(buf,len,add_collation))

strings/ctype-extra.c

+66 −0

Original line number	Diff line number	Diff line
		@@ -8527,6 +8527,72 @@ CHARSET_INFO compiled_charsets[] = {
		}
		,
		#endif
		#ifdef HAVE_CHARSET_geostd8
		{
		92,0,0,
		MY_CS_COMPILED\|MY_CS_PRIMARY,
		"geostd8", /* cset name */
		"geostd8_general_ci", /* coll name */
		"", /* comment */
		NULL, /* tailoring */
		ctype_geostd8_general_ci, /* ctype */
		to_lower_geostd8_general_ci, /* lower */
		to_upper_geostd8_general_ci, /* upper */
		sort_order_geostd8_general_ci, /* sort_order */
		NULL, /* contractions */
		NULL, /* sort_order_big*/
		to_uni_geostd8_general_ci, /* to_uni */
		NULL, /* from_uni */
		my_unicase_default, /* caseinfo */
		NULL, /* state map */
		NULL, /* ident map */
		1, /* strxfrm_multiply*/
		1, /* caseup_multiply*/
		1, /* casedn_multiply*/
		1, /* mbminlen */
		1, /* mbmaxlen */
		0, /* min_sort_char */
		255, /* max_sort_char */
		' ', /* pad_char */
		0, /* escape_with_backslash_is_dangerous */
		&my_charset_8bit_handler,
		&my_collation_8bit_simple_ci_handler,
		}
		,
		#endif
		#ifdef HAVE_CHARSET_geostd8
		{
		93,0,0,
		MY_CS_COMPILED\|MY_CS_BINSORT,
		"geostd8", /* cset name */
		"geostd8_bin", /* coll name */
		"", /* comment */
		NULL, /* tailoring */
		ctype_geostd8_bin, /* ctype */
		to_lower_geostd8_bin, /* lower */
		to_upper_geostd8_bin, /* upper */
		NULL, /* sort_order */
		NULL, /* contractions */
		NULL, /* sort_order_big*/
		to_uni_geostd8_bin, /* to_uni */
		NULL, /* from_uni */
		my_unicase_default, /* caseinfo */
		NULL, /* state map */
		NULL, /* ident map */
		1, /* strxfrm_multiply*/
		1, /* caseup_multiply*/
		1, /* casedn_multiply*/
		1, /* mbminlen */
		1, /* mbmaxlen */
		0, /* min_sort_char */
		255, /* max_sort_char */
		' ', /* pad_char */
		0, /* escape_with_backslash_is_dangerous */
		&my_charset_8bit_handler,
		&my_collation_8bit_bin_handler,
		}
		,
		#endif
		#ifdef HAVE_CHARSET_latin1
		{
		94,0,0,