diff options
| author | unknown <gkodinov/kgeorge@macbook.gmz> | 2008-01-08 11:49:40 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@macbook.gmz> | 2008-01-08 11:49:40 +0200 |
| commit | c82a7b94971dd6d49f4a80fe7a7cc304a42d2cd7 (patch) | |
| tree | 4c0c8dc98c9c309b1ccd62950e7da4703764630e /sql/item_sum.cc | |
| parent | baf5c2c132f498df72c5c8196d591481e03b9fee (diff) | |
| parent | 2ae4b047a3d9c4236ebd157ef8ee4bf084d4629b (diff) | |
| download | mariadb-git-c82a7b94971dd6d49f4a80fe7a7cc304a42d2cd7.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt
mysql-test/r/union.result:
Auto merged
sql/field.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/type_decimal.result:
merge of bug 33256 5.0-opt -> 5.1-opt
mysql-test/t/union.test:
merge of bug 33256 5.0-opt -> 5.1-opt
sql/field.h:
merge of bug 33256 5.0-opt -> 5.1-opt
sql/item.cc:
merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_sum.cc:
merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.cc:
merge of bug 33256 5.0-opt -> 5.1-opt
sql/item_timefunc.h:
merge of bug 33256 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 733b6e1e460..881f472d766 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -633,7 +633,7 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table, */ switch (args[0]->field_type()) { case MYSQL_TYPE_DATE: - field= new Field_date(maybe_null, name, collation.collation); + field= new Field_newdate(maybe_null, name, collation.collation); break; case MYSQL_TYPE_TIME: field= new Field_time(maybe_null, name, collation.collation); |