diff options
| author | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
|---|---|---|
| committer | Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com> | 2012-02-29 14:15:15 +0530 |
| commit | a0238152c7cc44b24d7ceb17755a5e24bd8b511a (patch) | |
| tree | ffb1240e5cdf7d9be7936eb35ef77d4645b6297f /sql/item.h | |
| parent | be866add0622db4258a0659c1e01ea7ae2fb5445 (diff) | |
| parent | 9af695fb4587a6e53241d05635caaaa113ac95d8 (diff) | |
| download | mariadb-git-a0238152c7cc44b24d7ceb17755a5e24bd8b511a.tar.gz | |
Merge from 5.1 to 5.5
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 223a519fa33..bd43689e91b 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1948,7 +1948,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); |