diff options
| author | unknown <brian@avenger.(none)> | 2004-11-11 19:15:41 -0800 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-11-11 19:15:41 -0800 |
| commit | 04519f434b2f06f448608e6c1c1bb55f712f5913 (patch) | |
| tree | 55c91f595bc599a879424b1b16fca02de2bb2d4a /sql/item.h | |
| parent | aebe9454e24179713fc1fea7690f66e1cd416500 (diff) | |
| parent | 593c7ce9c2fb6a1410d87b797618b5b1f646f2d6 (diff) | |
| download | mariadb-git-04519f434b2f06f448608e6c1c1bb55f712f5913.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/test/5.0
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 329c25073ee..9c036c28408 100644 --- a/sql/item.h +++ b/sql/item.h @@ -32,6 +32,7 @@ class Item_field; enum Derivation { + DERIVATION_IGNORABLE= 4, DERIVATION_COERCIBLE= 3, DERIVATION_IMPLICIT= 2, DERIVATION_NONE= 1, @@ -99,6 +100,7 @@ public: { switch(derivation) { + case DERIVATION_IGNORABLE: return "IGNORABLE"; case DERIVATION_COERCIBLE: return "COERCIBLE"; case DERIVATION_IMPLICIT: return "IMPLICIT"; case DERIVATION_EXPLICIT: return "EXPLICIT"; @@ -577,6 +579,7 @@ public: max_length= 0; name= name_par ? name_par : (char*) "NULL"; fixed= 1; + collation.set(&my_charset_bin, DERIVATION_IGNORABLE); } enum Type type() const { return NULL_ITEM; } bool eq(const Item *item, bool binary_cmp) const; |