Commit 8b0afa63 authored by unknown's avatar unknown

Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql

into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql


sql/item_func.cc:
  Manually merged
parents 45714d35 684653b8
...@@ -4035,7 +4035,8 @@ bool ...@@ -4035,7 +4035,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");
DBUG_ASSERT(!use_result_field || result_field); if (use_result_field && !result_field)
use_result_field= FALSE;
switch (cached_result_type) { switch (cached_result_type) {
case REAL_RESULT: case REAL_RESULT:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment