diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 12:57:00 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 12:57:00 +0400 |
| commit | fa3c6c76f2ce62ce042546320cf8f1fb517d2b54 (patch) | |
| tree | b538b56b0e4ed80836f168e9cde261842bb73d7f | |
| parent | 0ef988ada34636dee1af7c802f96b136eb7cc936 (diff) | |
| download | mariadb-git-fa3c6c76f2ce62ce042546320cf8f1fb517d2b54.tar.gz | |
Post-merge fixes
| -rw-r--r-- | mysql-test/r/group_by.result | 14 | ||||
| -rw-r--r-- | mysql-test/r/olap.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/group_by.test | 12 |
3 files changed, 14 insertions, 13 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index bfde408343e..45dca86f5f7 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -751,13 +751,6 @@ COUNT(DISTINCT(t1.id)) comment 1 NULL 1 a problem DROP TABLE t1, t2; -create table t1 (f1 date); -insert into t1 values('2005-06-06'); -insert into t1 values('2005-06-06'); -select date(left(f1+0,8)) from t1 group by 1; -date(left(f1+0,8)) -2005-06-06 -drop table t1; create table t1(f1 varchar(5) key); insert into t1 values (1),(2); select sql_buffer_result max(f1) is null from t1; @@ -767,6 +760,13 @@ select sql_buffer_result max(f1)+1 from t1; max(f1)+1 3 drop table t1; +create table t1 (f1 date); +insert into t1 values('2005-06-06'); +insert into t1 values('2005-06-06'); +select date(left(f1+0,8)) from t1 group by 1; +date(left(f1+0,8)) +2005-06-06 +drop table t1; CREATE TABLE t1 (n int); INSERT INTO t1 VALUES (1); SELECT n+1 AS n FROM t1 GROUP BY n; diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 73dd3fc8aa2..df0ee09ea8e 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -579,6 +579,7 @@ a LENGTH(a) COUNT(*) 1 1 1 2 1 1 NULL NULL 2 +DROP TABLE t1; CREATE TABLE t1(id int, type char(1)); INSERT INTO t1 VALUES (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"), diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 4631fad3352..df5535386a5 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -575,6 +575,12 @@ CREATE TABLE t1 (id varchar(20) NOT NULL); INSERT INTO t1 VALUES ('trans1'), ('trans2'); CREATE TABLE t2 (id varchar(20) NOT NULL, err_comment blob NOT NULL); INSERT INTO t2 VALUES ('trans1', 'a problem'); + +SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment + FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment; + +DROP TABLE t1, t2; + # # BUG#12695: Item_func_isnull::update_used_tables # did not update const_item_cache @@ -585,12 +591,6 @@ select sql_buffer_result max(f1) is null from t1; select sql_buffer_result max(f1)+1 from t1; drop table t1; -SELECT COUNT(DISTINCT(t1.id)), LEFT(err_comment, 256) AS comment - FROM t1 LEFT JOIN t2 ON t1.id=t2.id GROUP BY comment; - -DROP TABLE t1, t2; - - # # Bug #12266 GROUP BY expression on DATE column produces result with # reduced length |