diff options
| author | kaa@kaamos.(none) <> | 2008-02-17 14:57:01 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-02-17 14:57:01 +0300 |
| commit | 5647dee19259115e9c7015f885547d5cdaedf81f (patch) | |
| tree | 32ec9a2109f5937fa7bbd8c249cb71d6546ed347 /sql/item_func.cc | |
| parent | a1a94e238f267e83679119631404f87ece799679 (diff) | |
| parent | 6736c1b9e7bfde20314eeeaadb34a4f4b99c69eb (diff) | |
| download | mariadb-git-5647dee19259115e9c7015f885547d5cdaedf81f.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.1
into kaamos.(none):/data/src/opt/mysql-5.1-opt
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 6e9371de9dc..399aba12707 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5489,6 +5489,8 @@ Item_func_sp::make_field(Send_field *tmp_field) DBUG_ENTER("Item_func_sp::make_field"); DBUG_ASSERT(sp_result_field); sp_result_field->make_field(tmp_field); + if (name) + tmp_field->col_name= name; DBUG_VOID_RETURN; } |