Commit 6405db2b authored by unknown's avatar unknown

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

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
parents 795137fe 1cfad390
...@@ -2562,7 +2562,7 @@ case $default_charset in ...@@ -2562,7 +2562,7 @@ case $default_charset in
;; ;;
cp1250) cp1250)
default_charset_default_collation="cp1250_general_ci" default_charset_default_collation="cp1250_general_ci"
default_charset_collations="cp1250_general_ci cp1250_czech_ci cp1250_bin" default_charset_collations="cp1250_general_ci cp1250_czech_cs cp1250_bin"
;; ;;
cp1251) cp1251)
default_charset_default_collation="cp1251_general_ci" default_charset_default_collation="cp1251_general_ci"
...@@ -2638,7 +2638,7 @@ case $default_charset in ...@@ -2638,7 +2638,7 @@ case $default_charset in
;; ;;
latin2) latin2)
default_charset_default_collation="latin2_general_ci" default_charset_default_collation="latin2_general_ci"
default_charset_collations="latin2_general_ci latin2_bin latin2_czech_ci latin2_hungarian_ci latin2_croatian_ci" default_charset_collations="latin2_general_ci latin2_bin latin2_czech_cs latin2_hungarian_ci latin2_croatian_ci"
;; ;;
latin5) latin5)
default_charset_default_collation="latin5_turkish_ci" default_charset_default_collation="latin5_turkish_ci"
......
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