diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-09 12:52:25 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-09 12:52:25 +0200 |
| commit | d68e1032369189dd869d69dbced8d493ce52fd77 (patch) | |
| tree | d3c1e37bae62a884fc201f284f48cd2d27f05630 /sql/set_var.cc | |
| parent | 53d4a5661b0ee2c4184f8d74cc0477bdb9ff4d2d (diff) | |
| parent | 83e693021536b29dede64dbe58a660f5f0458599 (diff) | |
| download | mariadb-git-d68e1032369189dd869d69dbced8d493ce52fd77.tar.gz | |
merge
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc index 04fe2a8ea46..90c42035a91 100644 --- a/sql/set_var.cc +++ b/sql/set_var.cc @@ -2500,7 +2500,7 @@ int set_var_user::check(THD *thd) { /* Item_func_set_user_var can't substitute something else on its place => - 0 can be passed as last argument + 0 can be passed as last argument (reference on item) */ return (user_var_item->fix_fields(thd, 0, (Item**) 0) || user_var_item->check()) ? -1 : 0; |