diff options
| author | unknown <bell@sanja.is.com.ua> | 2005-03-31 10:39:48 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2005-03-31 10:39:48 +0300 |
| commit | 8a898a0b72ad14b87608c84f6b775eb586a070a2 (patch) | |
| tree | f46f9a882d5aee1bf10b26d0a45bd5280198b309 /mysql-test/r/func_group.result | |
| parent | 3a44dcd1a3b8b9e23200c3527bb43850ffdb8ece (diff) | |
| parent | 30c85129548f7d8267fab809a723672161c6fce9 (diff) | |
| download | mariadb-git-8a898a0b72ad14b87608c84f6b775eb586a070a2.tar.gz | |
merge 4.1->5.0
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
Diffstat (limited to 'mysql-test/r/func_group.result')
| -rw-r--r-- | mysql-test/r/func_group.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index 3e06018226d..1cf1a19056b 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -783,7 +783,7 @@ 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 NO 0000-00-00 00:00:00 +f2 datetime YES NULL drop table t2; create table t2 select f2 from (select now() f2 from t1) a; show columns from t2; |