diff options
| author | unknown <bar@mysql.com> | 2005-07-14 16:11:55 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-07-14 16:11:55 +0500 |
| commit | 212345b40059af214beea95487bc218c61b87cec (patch) | |
| tree | 66a51596d0795c47c8b2857fd880f4b9f550c9a7 /sql/item.h | |
| parent | c0e325a35c65dc4f93c3f12d0a87a3ae4a5c698b (diff) | |
| parent | 86cb32b7b0cf3de0c697e75cfa0f5338601d6eb8 (diff) | |
| download | mariadb-git-212345b40059af214beea95487bc218c61b87cec.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.num-conv
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/item.cc:
After merge fix.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index ce151ec85bf..a10934e40fb 100644 --- a/sql/item.h +++ b/sql/item.h @@ -771,6 +771,7 @@ class Item_num: public Item { public: virtual Item_num *neg()= 0; + Item *safe_charset_converter(CHARSET_INFO *tocs); }; #define NO_CACHED_FIELD_INDEX ((uint)(-1)) @@ -1369,6 +1370,7 @@ public: // to prevent drop fixed flag (no need parent cleanup call) void cleanup() {} bool eq(const Item *item, bool binary_cmp) const; + virtual Item *safe_charset_converter(CHARSET_INFO *tocs); }; |