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

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

View File

@ -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: