mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
Post-merge fixes
This commit is contained in:
parent
7ca7da411e
commit
44b76f173d
2 changed files with 10 additions and 10 deletions
|
@ -751,11 +751,6 @@ COUNT(DISTINCT(t1.id)) comment
|
|||
1 NULL
|
||||
1 a problem
|
||||
DROP TABLE t1, t2;
|
||||
CREATE TABLE t1 (n int);
|
||||
INSERT INTO t1 VALUES (1);
|
||||
SELECT n+1 AS n FROM t1 GROUP BY n;
|
||||
n
|
||||
2
|
||||
create table t1 (f1 date);
|
||||
insert into t1 values('2005-06-06');
|
||||
insert into t1 values('2005-06-06');
|
||||
|
@ -763,6 +758,11 @@ 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;
|
||||
|
|
|
@ -575,6 +575,11 @@ 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 #12266 GROUP BY expression on DATE column produces result with
|
||||
|
@ -586,11 +591,6 @@ insert into t1 values('2005-06-06');
|
|||
select date(left(f1+0,8)) from t1 group by 1;
|
||||
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;
|
||||
|
||||
#
|
||||
# Test for bug #11414: crash on Windows for a simple GROUP BY query
|
||||
#
|
||||
|
|
Loading…
Add table
Reference in a new issue