Commit 6c200e14 authored by unknown's avatar unknown

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

into mysql.com:/usr/home/bar/mysql-4.1


configure.in:
  Auto merged
parents 6e59a589 bd8b08ee
...@@ -2714,7 +2714,7 @@ case $default_charset in ...@@ -2714,7 +2714,7 @@ case $default_charset in
;; ;;
latin1) latin1)
default_charset_default_collation="latin1_swedish_ci" default_charset_default_collation="latin1_swedish_ci"
default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_swedish_ci" default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_spanish_ci latin1_swedish_ci"
;; ;;
latin2) latin2)
default_charset_default_collation="latin2_general_ci" default_charset_default_collation="latin2_general_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