Skip to content

M
MariaDB
Commit 70742933 authored by paul@ice.snake.net's avatar paul@ice.snake.net
Browse files
Options

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
parents 547c5607 b112cbee
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 15 deletions
strings/ctype-uca.c
View file @ 70742933
...@@ -8420,7 +8420,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci= ...@@ -8420,7 +8420,7 @@ CHARSET_INFO my_charset_utf8_icelandic_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8447,7 +8447,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci= ...@@ -8447,7 +8447,7 @@ CHARSET_INFO my_charset_utf8_latvian_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8474,7 +8474,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci= ...@@ -8474,7 +8474,7 @@ CHARSET_INFO my_charset_utf8_romanian_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8501,7 +8501,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci= ...@@ -8501,7 +8501,7 @@ CHARSET_INFO my_charset_utf8_slovenian_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8528,7 +8528,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci= ...@@ -8528,7 +8528,7 @@ CHARSET_INFO my_charset_utf8_polish_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8555,7 +8555,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci= ...@@ -8555,7 +8555,7 @@ CHARSET_INFO my_charset_utf8_estonian_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8582,7 +8582,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci= ...@@ -8582,7 +8582,7 @@ CHARSET_INFO my_charset_utf8_spanish_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8609,7 +8609,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci= ...@@ -8609,7 +8609,7 @@ CHARSET_INFO my_charset_utf8_swedish_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8636,7 +8636,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci= ...@@ -8636,7 +8636,7 @@ CHARSET_INFO my_charset_utf8_turkish_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8663,7 +8663,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci= ...@@ -8663,7 +8663,7 @@ CHARSET_INFO my_charset_utf8_czech_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8691,7 +8691,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci= ...@@ -8691,7 +8691,7 @@ CHARSET_INFO my_charset_utf8_danish_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8718,7 +8718,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci= ...@@ -8718,7 +8718,7 @@ CHARSET_INFO my_charset_utf8_lithuanian_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8745,7 +8745,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci= ...@@ -8745,7 +8745,7 @@ CHARSET_INFO my_charset_utf8_slovak_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
...@@ -8772,7 +8772,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci= ...@@ -8772,7 +8772,7 @@ CHARSET_INFO my_charset_utf8_spanish2_uca_ci=
NULL, /* state_map */ NULL, /* state_map */
NULL, /* ident_map */ NULL, /* ident_map */
8, /* strxfrm_multiply */ 8, /* strxfrm_multiply */
2, /* mbminlen */ 1, /* mbminlen */
2, /* mbmaxlen */ 2, /* mbmaxlen */
9, /* min_sort_char */ 9, /* min_sort_char */
0xFFFF, /* max_sort_char */ 0xFFFF, /* max_sort_char */
......
support-files/mysql.spec.sh
View file @ 70742933
...@@ -397,7 +397,7 @@ useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" mysql 2> /dev/nul ...@@ -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 chown -R mysql $mysql_datadir
# Initiate databases # Initiate databases
mysql_install_db -IN-RPM --user=mysql mysql_install_db --rpm --user=mysql
# Change permissions again to fix any new files. # Change permissions again to fix any new files.
chown -R mysql $mysql_datadir chown -R mysql $mysql_datadir
...@@ -579,6 +579,11 @@ fi ...@@ -579,6 +579,11 @@ fi
# The spec file changelog only includes changes made to the spec file # The spec file changelog only includes changes made to the spec file
# itself # itself
%changelog %changelog
* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
- fixed server postinstall (mysql_install_db was called with the wrong
parameter)
* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com> * Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
- added mysql_tzinfo_to_sql to the server subpackage - added mysql_tzinfo_to_sql to the server subpackage
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7