diff options
| author | unknown <bar@mysql.com> | 2005-02-23 17:03:34 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-02-23 17:03:34 +0400 |
| commit | 3fe941e4d3a8424f68563143c7b05b8d7bcac225 (patch) | |
| tree | 4816d63590de39ffa898bdb571300ca8a5b73c9c /include/config-win.h | |
| parent | e6944e4d32040d41474a7badc132ae0e7f50c7d2 (diff) | |
| parent | 2e199a1e8d8a458f08861b4bf00ceb21210351fe (diff) | |
| download | mariadb-git-3fe941e4d3a8424f68563143c7b05b8d7bcac225.tar.gz | |
Merge
include/config-win.h:
Auto merged
myisam/myisamchk.c:
Auto merged
mysys/errors.c:
Auto merged
include/mysys_err.h:
Merge from 4.1, attempt#2.
Diffstat (limited to 'include/config-win.h')
| -rw-r--r-- | include/config-win.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/config-win.h b/include/config-win.h index ba1a987f14c..e86e0f08596 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -408,4 +408,5 @@ inline double ulonglong2double(ulonglong value) #define HAVE_CHARSET_ucs2 1 #define HAVE_CHARSET_ujis 1 #define HAVE_CHARSET_utf8 1 +#define HAVE_UCA_COLLATIONS 1 |