diff options
| author | unknown <elliot@mysql.com> | 2005-08-17 04:32:29 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2005-08-17 04:32:29 -0400 |
| commit | 99cf8c38e0840f113988b9c131bfb04c864ffc42 (patch) | |
| tree | 867e0960e68a70a90ef68c0f2a5bb1a971cbd661 /sql/item.h | |
| parent | 0f7bb92df9198f9541b53e32cdf1324fe58a606c (diff) | |
| parent | a29b1d7151497b4777e4b4917f0eee001705a928 (diff) | |
| download | mariadb-git-99cf8c38e0840f113988b9c131bfb04c864ffc42.tar.gz | |
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
sql/item.h:
Auto merged
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 c71769b5129..ff34dfad025 100644 --- a/sql/item.h +++ b/sql/item.h @@ -591,7 +591,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(String *str, THD *thd) const; bool convert_str_value(THD *thd); |