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

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
This commit is contained in:
unknown 2004-07-02 17:32:47 -05:00
commit d760bfd6b0
6 changed files with 21 additions and 4 deletions

View file

@ -2525,7 +2525,7 @@ done
case $default_charset in
armscii8)
default_charset_default_collation="armscii8_general_ci"
default_charset_collations="armscii8_general_ci armscii_bin"
default_charset_collations="armscii8_general_ci armscii8_bin"
;;
ascii)
default_charset_default_collation="ascii_general_ci"