summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <bar@mysql.com>2004-12-06 10:58:40 +0400
committerunknown <bar@mysql.com>2004-12-06 10:58:40 +0400
commit77a9eede5d2c4dca4973afd266b0b1218b196d4e (patch)
tree1c80b950585b6d3df9a1615454b8ba1034159187 /configure.in
parent80b3339f6912dea66c98efd8b54de9f176cd7e99 (diff)
parent1b3c814d424330160bb12d03e2c47ccbcd5869df (diff)
downloadmariadb-git-77a9eede5d2c4dca4973afd266b0b1218b196d4e.tar.gz
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1 configure.in: Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 4aa4b3c9845..aa3a9d74271 100644
--- a/configure.in
+++ b/configure.in
@@ -2714,7 +2714,7 @@ case $default_charset in
;;
latin1)
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)
default_charset_default_collation="latin2_general_ci"