From a1aa3da96a1fe8e5bb63705c7bfc0149f9274ddf Mon Sep 17 00:00:00 2001 From: "bar@mysql.com" <> Date: Wed, 30 Jun 2004 14:45:08 +0500 Subject: [PATCH 1/2] ctype-uca.c: mbminlen was wrong for UTF8. --- strings/ctype-uca.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c index a388e0cb2a2..5bb710946b1 100644 --- a/strings/ctype-uca.c +++ b/strings/ctype-uca.c @@ -8420,7 +8420,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8447,7 +8447,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8474,7 +8474,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8501,7 +8501,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8528,7 +8528,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8555,7 +8555,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8582,7 +8582,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8609,7 +8609,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8636,7 +8636,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8663,7 +8663,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8691,7 +8691,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8718,7 +8718,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8745,7 +8745,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ @@ -8772,7 +8772,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci= NULL, /* state_map */ NULL, /* ident_map */ 8, /* strxfrm_multiply */ - 2, /* mbminlen */ + 1, /* mbminlen */ 2, /* mbmaxlen */ 9, /* min_sort_char */ 0xFFFF, /* max_sort_char */ From 0cba9b482e6467a47bd97109d071c71039b34e73 Mon Sep 17 00:00:00 2001 From: "lenz@mysql.com" <> Date: Wed, 30 Jun 2004 14:01:31 +0200 Subject: [PATCH 2/2] - fixed server RPM postinstall (mysql_install_db was called with the wrong parameter) --- support-files/mysql.spec.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 0d6863d24cd..d5c43e61f9d 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -397,7 +397,7 @@ useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" mysql 2> /dev/nul chown -R mysql $mysql_datadir # Initiate databases -mysql_install_db -IN-RPM --user=mysql +mysql_install_db --rpm --user=mysql # Change permissions again to fix any new files. chown -R mysql $mysql_datadir @@ -579,6 +579,11 @@ fi # The spec file changelog only includes changes made to the spec file # itself %changelog +* Wed Jun 30 2004 Lenz Grimmer + +- fixed server postinstall (mysql_install_db was called with the wrong + parameter) + * Thu Jun 24 2004 Lenz Grimmer - added mysql_tzinfo_to_sql to the server subpackage