1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
This commit is contained in:
evgen@moonbone.local 2007-06-03 01:25:24 +04:00
commit f4e20490a4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/item_func.cc
View File

@ -4063,8 +4063,8 @@ bool
Item_func_set_user_var::check(bool use_result_field) Item_func_set_user_var::check(bool use_result_field)
{ {
DBUG_ENTER("Item_func_set_user_var::check"); DBUG_ENTER("Item_func_set_user_var::check");
if (use_result_field) if (use_result_field && !result_field)
DBUG_ASSERT(result_field); use_result_field= FALSE;
switch (cached_result_type) { switch (cached_result_type) {
case REAL_RESULT: case REAL_RESULT: