diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-18 14:23:05 +0200 |
| commit | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch) | |
| tree | 0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /sql/item.h | |
| parent | 5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff) | |
| parent | 57f824b0990b0a8708665a4a9ede245ce6064539 (diff) | |
| download | mariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz | |
5.1 merge
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 0445cd4a9d5..4f1bd10612a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1828,7 +1828,7 @@ public: */ void (*set_param_func)(Item_param *param, uchar **pos, ulong len); - const String *query_val_str(String *str) const; + const String *query_val_str(THD *thd, String *str) const; bool convert_str_value(THD *thd); |