diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-08-11 11:57:37 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-08-11 11:57:37 +0300 |
| commit | 986be1aaba87365517a290a23a3b7d66109d2605 (patch) | |
| tree | f69cb1abd0cd454f24594c7e6a012f801e8f5b6f /sql/sql_select.cc | |
| parent | 57e31f158b222c8b0469bd6b649e8994ef7dd553 (diff) | |
| parent | e64769909ce410eb052c26ed09875b34a653c1aa (diff) | |
| download | mariadb-git-986be1aaba87365517a290a23a3b7d66109d2605.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
sql/item_cmpfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5b20f4f7a5d..9f135e7f586 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4354,9 +4354,9 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, case STRING_RESULT: if (item_sum->max_length > 255) return new Field_blob(item_sum->max_length,maybe_null, - item->name,table,item->charset()); + item->name,table,item->collation.collation); return new Field_string(item_sum->max_length,maybe_null, - item->name,table,item->charset()); + item->name,table,item->collation.collation); case ROW_RESULT: default: // This case should never be choosen @@ -4413,10 +4413,10 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, case STRING_RESULT: if (item->max_length > 255) new_field= new Field_blob(item->max_length,maybe_null, - item->name,table,item->charset()); + item->name,table,item->collation.collation); else new_field= new Field_string(item->max_length,maybe_null, - item->name,table,item->charset()); + item->name,table,item->collation.collation); break; case ROW_RESULT: default: |