diff options
| author | unknown <bar@mysql.com> | 2006-04-17 15:01:55 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-04-17 15:01:55 +0500 |
| commit | 9844f0abdb1b806df23b9e685bc21b46ec1d09e3 (patch) | |
| tree | 4e0f1d1aaa95ea0def5377d995ed94ab71512de8 /sql/item_timefunc.h | |
| parent | be4548d4a39c889bcf767b916fbf6aa45ca38a50 (diff) | |
| parent | 222e58056a9b81b3d5c9064dc61e50b56ecc51ea (diff) | |
| download | mariadb-git-9844f0abdb1b806df23b9e685bc21b46ec1d09e3.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/item_timefunc.cc:
After merge fix
Diffstat (limited to 'sql/item_timefunc.h')
| -rw-r--r-- | sql/item_timefunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.h b/sql/item_timefunc.h index 761faf85e63..b2f0dab0837 100644 --- a/sql/item_timefunc.h +++ b/sql/item_timefunc.h @@ -717,7 +717,7 @@ public: class Item_char_typecast :public Item_typecast { int cast_length; - CHARSET_INFO *cast_cs; + CHARSET_INFO *cast_cs, *from_cs; bool charset_conversion; String tmp_value; public: |