diff options
| author | unknown <evgen@moonbone.local> | 2007-06-03 09:17:31 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-06-03 09:17:31 +0400 |
| commit | 8b0afa63fb2d42bea3f992a57e8ebb883d914bee (patch) | |
| tree | ea5c661257049856524acb27131908465cf46830 /sql/item_func.cc | |
| parent | 45714d35adc12bf23a66028e47b5ee85306e13b1 (diff) | |
| parent | 684653b89eee128a1085caa3c58304d60683ccc0 (diff) | |
| download | mariadb-git-8b0afa63fb2d42bea3f992a57e8ebb883d914bee.tar.gz | |
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
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index c65477f3105..b9ee96e6c08 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4035,7 +4035,8 @@ bool Item_func_set_user_var::check(bool use_result_field) { 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) { case REAL_RESULT: |