diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-07-27 22:43:33 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-07-27 22:43:33 +0500 |
commit | 8feaed2ae75ea20a6f6e94aac7dd404fd2953835 (patch) | |
tree | 5b32826bab6d3dc94b70e85c621bbf3ff46e5035 /sql/item_strfunc.h | |
parent | 54c9742922864ee711e024bb93307c553d66fb38 (diff) | |
parent | d27bf14ed7aab39b8b83d0eed34cb3ba4417de35 (diff) | |
download | mariadb-git-8feaed2ae75ea20a6f6e94aac7dd404fd2953835.tar.gz |
Merge mysql.com:/home/hf/work/29878/my50-29878
into mysql.com:/home/hf/work/29878/my51-29878
mysql-test/suite/rpl/r/rpl_session_var.result:
Auto merged
mysql-test/suite/rpl/t/rpl_session_var.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.h:
Auto merged
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 6d2d9c199c9..ea9517976a8 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -427,6 +427,10 @@ public: } const char *func_name() const { return "user"; } const char *fully_qualified_func_name() const { return "user()"; } + int save_in_field(Field *field, bool no_conversions) + { + return save_str_value_in_field(field, &str_value); + } }; |