diff options
| author | unknown <baker@bk-internal.mysql.com> | 2006-11-22 05:54:30 +0100 |
|---|---|---|
| committer | unknown <baker@bk-internal.mysql.com> | 2006-11-22 05:54:30 +0100 |
| commit | cd784a51dff0cb19874e34f5c8b1fcbc8cbfed36 (patch) | |
| tree | e4927fc312cc00e1028e872ff7e4b69f3657b0de /sql/mysql_priv.h | |
| parent | b894f480135de045414f9e7736e1ddc07d162332 (diff) | |
| parent | 5cffd57e26dec24976242746dcc7f0b477a02690 (diff) | |
| download | mariadb-git-cd784a51dff0cb19874e34f5c8b1fcbc8cbfed36.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e1aed7bf0d1..56228f08375 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -105,6 +105,17 @@ extern CHARSET_INFO *system_charset_info, *files_charset_info ; extern CHARSET_INFO *national_charset_info, *table_alias_charset; +enum Derivation +{ + DERIVATION_IGNORABLE= 5, + DERIVATION_COERCIBLE= 4, + DERIVATION_SYSCONST= 3, + DERIVATION_IMPLICIT= 2, + DERIVATION_NONE= 1, + DERIVATION_EXPLICIT= 0 +}; + + typedef struct my_locale_st { const char *name; |