mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1 sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_select.cc: Auto merged
This commit is contained in:
@ -1522,7 +1522,7 @@ int set_var::check(THD *thd)
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (value->check_cols(1) || value->fix_fields(thd, 0, &value))
|
||||
if (value->fix_fields(thd, 0, &value) || value->check_cols(1))
|
||||
return -1;
|
||||
if (var->check_update_type(value->result_type()))
|
||||
{
|
||||
|
Reference in New Issue
Block a user