diff options
| author | unknown <paul@ice.snake.net> | 2004-06-23 10:44:54 -0500 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2004-06-23 10:44:54 -0500 |
| commit | 8f4847f3834ea4434607f0e6dcb23a53f222aec1 (patch) | |
| tree | 6b4fd0cfa220779a8db7858ee5b7c831c29134c0 /configure.in | |
| parent | f00cd26bfcae17b3b04c0a056c72d83d203c3fe4 (diff) | |
| parent | 4603a7b376c5347b8015970a171a443160c37aa3 (diff) | |
| download | mariadb-git-8f4847f3834ea4434607f0e6dcb23a53f222aec1.tar.gz | |
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
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 6958962cf8d..7734ef4bf58 100644 --- a/configure.in +++ b/configure.in @@ -2407,6 +2407,8 @@ do AC_DEFINE(USE_MB) AC_DEFINE(USE_MB_IDENT) ;; + binary) + ;; cp1250) AC_DEFINE(HAVE_CHARSET_cp1250) ;; @@ -2533,6 +2535,10 @@ case $default_charset in default_charset_default_collation="big5_chinese_ci" default_charset_collations="big5_chinese_ci big5_bin" ;; + binary) + default_charset_default_collation="binary" + default_charset_collations="binary" + ;; cp1250) default_charset_default_collation="cp1250_general_ci" default_charset_collations="cp1250_general_ci cp1250_czech_ci cp1250_bin" |