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

Merge olga.mysql.com:/home/igor/mysql-5.0-opt

Browse Source 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
This commit is contained in:
igor@olga.mysql.com 2007-06-02 14:37:42 -07:00
commit 91da3132b5
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: