diff options
| author | unknown <knielsen@knielsen-hq.org> | 2012-08-24 14:02:32 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2012-08-24 14:02:32 +0200 |
| commit | fc666a0df6c69a620d3cffacd78e2569fb0ac410 (patch) | |
| tree | a956401c47c0464ad21f91d7e864af1ab89e0469 /sql/item_func.h | |
| parent | e44a800d91a887119d3b612276b37f09b076fee1 (diff) | |
| parent | 96703a63da2211cefcc480fa4f135acd94743622 (diff) | |
| download | mariadb-git-fc666a0df6c69a620d3cffacd78e2569fb0ac410.tar.gz | |
merge from 5.2
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index abaf07c51d5..670039ef9b9 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1582,7 +1582,7 @@ public: my_decimal *val_decimal(my_decimal *decimal_buffer); /* fix_fields() binds variable name with its entry structure */ bool fix_fields(THD *thd, Item **ref); - virtual void print(String *str, enum_query_type query_type); + void print_for_load(THD *thd, String *str); void set_null_value(CHARSET_INFO* cs); void set_value(const char *str, uint length, CHARSET_INFO* cs); }; |