Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
This commit is contained in:
commit
f4e20490a4
@ -4063,8 +4063,8 @@ bool
|
||||
Item_func_set_user_var::check(bool use_result_field)
|
||||
{
|
||||
DBUG_ENTER("Item_func_set_user_var::check");
|
||||
if (use_result_field)
|
||||
DBUG_ASSERT(result_field);
|
||||
if (use_result_field && !result_field)
|
||||
use_result_field= FALSE;
|
||||
|
||||
switch (cached_result_type) {
|
||||
case REAL_RESULT:
|
||||
|
Loading…
x
Reference in New Issue
Block a user