diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-11-13 12:44:53 +0100 |
| commit | 181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe (patch) | |
| tree | 2e35d48c7436cf853a6515a4dccc4e72660d82f3 /sql/mysql_priv.h | |
| parent | 383fbde53239a9d4fd4e444a0b6d8942305f74f5 (diff) | |
| parent | 7614eb0d1db4819ec6f1c3c59196d1dcb0d0c8d5 (diff) | |
| download | mariadb-git-181c9b4dd4c23c5ef4d8c2562c055e35b6267bfe.tar.gz | |
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
BitKeeper/etc/collapsed:
auto-union
sql/mysql_priv.h:
Auto merged
sql/slave.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 cd6c2a73ccc..ac0b9f56567 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -96,6 +96,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; |