summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-04-08 16:04:37 +0200
committerunknown <joerg@mysql.com>2005-04-08 16:04:37 +0200
commit7397aeb0500626867301e0342c0a2539019a7c90 (patch)
tree53311edd4390ad48af25cb5b800ef859724f131a /strings
parent3e801322d77ee657b6da75e8756c39457745b09a (diff)
parentb9f486cd022dc67e5118dfdca38052c7b13c10fa (diff)
downloadmariadb-git-7397aeb0500626867301e0342c0a2539019a7c90.tar.gz
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11
configure.in: Auto merged
Diffstat (limited to 'strings')
-rw-r--r--strings/ctype-utf8.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 83725878a50..230b44796e8 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -2375,7 +2375,7 @@ CHARSET_INFO my_charset_utf8_bin=
&my_collation_mb_bin_handler
};
-#ifdef HAVE_CYBOZU_COLLATION
+#ifdef HAVE_UTF8_GENERAL_CS
/*
* These functions bacically do the same as their original, except