diff options
| author | unknown <mskold@mysql.com> | 2005-02-23 20:08:21 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-23 20:08:21 +0100 |
| commit | e0b2dab77d0f8166c710c3b97faede85fa4e847c (patch) | |
| tree | 39850a76391a37d7bb293ee60cef5c74305a7ba9 /include | |
| parent | 137136d2a5c1339579fbe3138945827b529b668d (diff) | |
| parent | 29d2b6f6bc73058e6e7deb13f672ab5a68095f02 (diff) | |
| download | mariadb-git-e0b2dab77d0f8166c710c3b97faede85fa4e847c.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/log.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/mysys_err.h | 3 |
2 files changed, 3 insertions, 1 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 diff --git a/include/mysys_err.h b/include/mysys_err.h index 1fd7c2eddc6..1e489395c76 100644 --- a/include/mysys_err.h +++ b/include/mysys_err.h @@ -56,7 +56,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ #define EE_CANT_SYMLINK 25 #define EE_REALPATH 26 #define EE_SYNC 27 -#define EE_ERROR_LAST 27 /*Copy last error nr.*/ +#define EE_UNKNOWN_COLLATION 28 +#define EE_ERROR_LAST 28 /*Copy last error nr.*/ /* Add error numbers before EE_ERROR_LAST and change it accordingly. */ /* exit codes for all MySQL programs */ |