diff options
| author | unknown <anozdrin@mysql.com> | 2005-12-12 13:29:48 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2005-12-12 13:29:48 +0300 |
| commit | e8edf40f43faa6d7011341280244f974651e87da (patch) | |
| tree | 7caacde2fec98f8a5c4a9341c78c33c4142627fc /sql | |
| parent | 16bca982675eae7334e3629ad5b0c786d384a272 (diff) | |
| download | mariadb-git-e8edf40f43faa6d7011341280244f974651e87da.tar.gz | |
Merge WL#2984
mysql-test/r/sp-vars.result:
Merge
mysql-test/r/sp.result:
Merge
mysql-test/r/type_newdecimal-big.result:
Merge
mysql-test/t/type_newdecimal-big.test:
Merge
sql/sp_head.cc:
Merge
sql/sql_select.cc:
Merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sp_head.cc | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index ab3db48acc7..956de7d9c36 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -679,6 +679,9 @@ sp_head::create_result_field(uint field_max_length, const char *field_name, Field::NONE, /* unreg check */ m_return_field_def.interval, field_name ? field_name : (const char *) m_name.str); + + if (field) + field->init(table); DBUG_RETURN(field); } diff --git a/sql/sql_select.cc b/sql/sql_select.cc index a9ae336d06f..1c1a789c4a4 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8997,8 +8997,8 @@ TABLE *create_virtual_tmp_table(THD *thd, List<create_field> &field_list) field++; } *field= NULL; /* mark the end of the list */ - s->blob_field[blob_count]= 0; /* mark the end of the list */ - s->blob_fields= blob_count; + share->blob_field[blob_count]= 0; /* mark the end of the list */ + share->blob_fields= blob_count; null_pack_length= (null_count + 7)/8; share->reclength= record_length + null_pack_length; |