diff options
| author | monty@mashka.mysql.fi <> | 2002-12-11 09:18:43 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-12-11 09:18:43 +0200 |
| commit | a241d9a0f7c1a00c143adb98e2e251f324391430 (patch) | |
| tree | 6269df71542c5b73ad0eb4740601b29234482f8f /sql/item_func.cc | |
| parent | 48aa519fe7eb8203a6ce7ff2b4b4ddfca7ac2dc9 (diff) | |
| parent | d3eb993a27a973842d84d83db80e827a1f8948e2 (diff) | |
| download | mariadb-git-a241d9a0f7c1a00c143adb98e2e251f324391430.tar.gz | |
Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index c84b554b522..1ce5b038f3b 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1945,8 +1945,6 @@ static user_var_entry *get_variable(HASH *hash, LEX_STRING &name, bool Item_func_set_user_var::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) { - if (!thd) - thd=current_thd; // Should never happen if (Item_func::fix_fields(thd, tables, ref) || !(entry= get_variable(&thd->user_vars, name, 1))) return 1; |