diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-28 19:04:23 +0200 |
| commit | 8e7ebfbce89a472b3c5a6c30e6de101e567a8218 (patch) | |
| tree | 9f9950feb45222c7df4f37c841f4af593ec75ee5 /sql/field.cc | |
| parent | 3bdede3c67032345ca5f71dd53ca308377dc2398 (diff) | |
| parent | 7c24e8d54d1d41374b7836e3273e7e5eaf22e2c4 (diff) | |
| download | mariadb-git-8e7ebfbce89a472b3c5a6c30e6de101e567a8218.tar.gz | |
5.2 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 56f45158b7f..bf496406fd6 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; @@ -4568,7 +4568,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(); |