diff options
| author | unknown <jimw@mysql.com> | 2005-02-04 11:59:02 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-02-04 11:59:02 -0800 |
| commit | 1be345edc0cc351029dc207d836ced1742bdfd8d (patch) | |
| tree | 51df5e0d0334e67749bc68845ba7a952061390a5 /mysql-test/r/func_group.result | |
| parent | 74ad9e8f1efde5295b9bf0b4bc4a3331d0faab4f (diff) | |
| parent | 2f91118458995b9fe780aa7a5a664765572cdc30 (diff) | |
| download | mariadb-git-1be345edc0cc351029dc207d836ced1742bdfd8d.tar.gz | |
Merge changes
client/mysqlcheck.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/ft_static.c:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/union.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/field.cc:
Clean up merge
Diffstat (limited to 'mysql-test/r/func_group.result')
| -rw-r--r-- | mysql-test/r/func_group.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index df95193043e..706bf4c5c6b 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -737,3 +737,15 @@ one 2 two 2 three 1 drop table t1; +create table t1(f1 datetime); +insert into t1 values (now()); +create table t2 select f2 from (select max(now()) f2 from t1) a; +show columns from t2; +Field Type Null Key Default Extra +f2 datetime 0000-00-00 00:00:00 +drop table t2; +create table t2 select f2 from (select now() f2 from t1) a; +show columns from t2; +Field Type Null Key Default Extra +f2 datetime 0000-00-00 00:00:00 +drop table t2, t1; |