diff options
| author | sergefp@mysql.com <> | 2004-05-21 04:27:50 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2004-05-21 04:27:50 +0400 |
| commit | fb17025b3ea4983feec4498ab1f807b22a95d099 (patch) | |
| tree | a744f3804c5f4a55fabbc3344ef1ec8b1c9e3b52 /sql/item.h | |
| parent | 3711c98b2ad162ff3f4694c6cedfd2d7c2c22aab (diff) | |
| download | mariadb-git-fb17025b3ea4983feec4498ab1f807b22a95d099.tar.gz | |
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index 471d502a6e1..062e1da990d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -220,7 +220,7 @@ public: virtual Item *real_item() { return this; } virtual Item *get_tmp_table_item(THD *thd) { return copy_or_same(thd); } - CHARSET_INFO *default_charset() const; + static CHARSET_INFO *default_charset(); virtual CHARSET_INFO *compare_collation() { return NULL; } virtual bool walk(Item_processor processor, byte *arg) @@ -413,7 +413,6 @@ public: void set_null(); void set_int(longlong i); void set_double(double i); - void set_value(const char *str, uint length); void set_value(const char *str, uint length, CHARSET_INFO *ci); void set_long_str(const char *str, ulong length); void set_long_binary(const char *str, ulong length); |