diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
| commit | 745cc74c3301f193c7b82c31d11c3bf0c842be9e (patch) | |
| tree | 4aa6101c051c91607d2623eed26fb41527fd0bd3 /sql/field.cc | |
| parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
| parent | cc6d22f5356e0969d8d5d1046edc69cb17ea19fb (diff) | |
| download | mariadb-git-745cc74c3301f193c7b82c31d11c3bf0c842be9e.tar.gz | |
5.1.51 merge
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index c88ba52f31f..cc3a9863587 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1536,7 +1536,7 @@ void Field::make_field(Send_field *field) } else field->org_table_name= field->db_name= ""; - if (orig_table) + if (orig_table && orig_table->alias) { field->table_name= orig_table->alias; field->org_col_name= field_name; @@ -4562,7 +4562,7 @@ String *Field_double::val_str(String *val_buffer, #endif doubleget(nr,ptr); - uint to_length=max(field_length, DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE); + uint to_length= DOUBLE_TO_STRING_CONVERSION_BUFFER_SIZE; val_buffer->alloc(to_length); char *to=(char*) val_buffer->ptr(); |