diff options
| author | bar@mysql.com <> | 2006-04-17 15:01:55 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2006-04-17 15:01:55 +0500 |
| commit | 3fef2ba6aa8b4a54d14a2c4550edd2e5dfea2d2f (patch) | |
| tree | 4e0f1d1aaa95ea0def5377d995ed94ab71512de8 /sql/item_timefunc.h | |
| parent | 8a7adb196d0e6dd5a5d2a9059510d184df79b504 (diff) | |
| parent | 941e529c59f36216514fd3380dc8083fe04bb5fa (diff) | |
| download | mariadb-git-3fef2ba6aa8b4a54d14a2c4550edd2e5dfea2d2f.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b18691
into mysql.com:/usr/home/bar/mysql-5.0
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: |