aftermerge

mysql-test/r/group_by.result

@@ -758,6 +758,14 @@ 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;
+n
+2
+Warnings:
+Warning	1052	Column 'n' in group statement is ambiguous
+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,14 +775,6 @@ select sql_buffer_result max(f1)+1 from t1;
 max(f1)+1
 3
 drop table t1;
-CREATE TABLE t1 (n int);
-INSERT INTO t1 VALUES (1);
-SELECT n+1 AS n FROM t1 GROUP BY n;
-n
-2
-Warnings:
-Warning	1052	Column 'n' in group statement is ambiguous
-DROP TABLE t1;
 create table t1 (c1 char(3), c2 char(3));
 create table t2 (c3 char(3), c4 char(3));
 insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');

mysql-test/t/group_by.test

@@ -575,16 +575,6 @@ 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');
-#
-# BUG#12695: Item_func_isnull::update_used_tables
-# did not update const_item_cache
-#
-create table t1(f1 varchar(5) key);
-insert into t1 values (1),(2);
-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;