Commit 10349b11 authored by unknown's avatar unknown
Browse files

Manual merge 


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents 5ae2ca21 17ec83fc

mysql-test/r/connect.result

+6 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

show tables;

Tables_in_mysql

columns_priv
@@ -71,3 +72,8 @@ show tables; 
Tables_in_test

delete from mysql.user where user=_binary"test";

flush privileges;

create table t1 (id integer not null auto_increment primary key);

create temporary table t2(id integer not null auto_increment primary key);

set @id := 1;

delete from t1 where id like @id;

drop table t1;

mysql-test/r/olap.result

+25 −12
Original line number Diff line number Diff line
@@ -555,6 +555,31 @@ IFNULL(a, 'TEST') COALESCE(b, 'TEST') 
4	TEST

TEST	TEST

DROP TABLE t1,t2;

CREATE TABLE t1 (a INT(10) NOT NULL, b INT(10) NOT NULL);

INSERT INTO t1 VALUES (1, 1);

INSERT INTO t1 VALUES (1, 2);

SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP;

a	b	c	count

1	1	1	1

1	1	NULL	1

1	2	1	1

1	2	NULL	1

1	NULL	NULL	2

NULL	NULL	NULL	2

DROP TABLE t1;

CREATE TABLE t1 (a int(11) NOT NULL);

INSERT INTO t1 VALUES (1),(2);

SELECT * FROM (SELECT a, a + 1, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

a	a + 1	COUNT(*)

1	2	1

2	3	1

NULL	NULL	2

SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

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"),
@@ -577,15 +602,3 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	10	Using filesort

DROP VIEW v1;

DROP TABLE t1;
 
CREATE TABLE t1 (a INT(10) NOT NULL, b INT(10) NOT NULL);

INSERT INTO t1 VALUES (1, 1);

INSERT INTO t1 VALUES (1, 2);

SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP;

a	b	c	count

1	1	1	1

1	1	NULL	1

1	2	1	1

1	2	NULL	1

1	NULL	NULL	2

NULL	NULL	NULL	2

DROP TABLE t1;

mysql-test/t/connect.test

+18 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ 
# This test makes no sense with the embedded server

--source include/not_embedded.inc



--disable_warnings

drop table if exists t1,t2;

--enable_warnings



#connect (con1,localhost,root,,"");

#show tables;

connect (con1,localhost,root,,mysql);
@@ -77,4 +81,18 @@ show tables; 
delete from mysql.user where user=_binary"test";

flush privileges;



#

# Bug#12517: Clear user variables and replication events before 

#            closing temp tables in thread cleanup.

connect (con2,localhost,root,,test);

connection con2;

create table t1 (id integer not null auto_increment primary key);

create temporary table t2(id integer not null auto_increment primary key);

set @id := 1;

delete from t1 where id like @id;

disconnect con2;

--sleep 5

connection default;

drop table t1;



# End of 4.1 tests

mysql-test/t/olap.test

+13 −27
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
drop table if exists t1,t2;

--enable_warnings



set @sav_dpi= @@div_precision_increment;

set div_precision_increment= 5;

show variables like 'div_precision_increment';



create table t1 (product varchar(32), country_id int not null, year int, profit int);

insert into t1  values ( 'Computer', 2,2000, 1200),

( 'TV', 1, 1999, 150),
@@ -157,13 +153,6 @@ SELECT DISTINCT SUM(b), COUNT(DISTINCT b), COUNT(*) FROM t1 
SELECT a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;

SELECT DISTINCT a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;



SELECT b, a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;

SELECT DISTINCT b,a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;



ALTER TABLE t1 ADD COLUMN c INT;

SELECT a,b,sum(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;

SELECT distinct a,b,sum(c) FROM t1 GROUP BY a,b,c WITH ROLLUP;



DROP TABLE t1;



#
@@ -195,7 +184,6 @@ SELECT a, SUM(a) m FROM t1 GROUP BY a WITH ROLLUP; 
SELECT * FROM ( SELECT a, SUM(a) m FROM  t1 GROUP BY a WITH ROLLUP ) t2;



DROP TABLE t1;

set div_precision_increment= @sav_dpi;



#

# Tests for bug #7914: ROLLUP over expressions on temporary table
@@ -251,21 +239,6 @@ SELECT IFNULL(a, 'TEST'), COALESCE(b, 'TEST') FROM t2 
DROP TABLE t1,t2;



#

# Tests for bug #11639: ROLLUP over view executed through filesort

#



CREATE TABLE t1(id int, type char(1));

INSERT INTO t1 VALUES

  (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

  (6,"B"),(7,"A"),(8,"C"),(9,"A"),(10,"C");

CREATE VIEW v1 AS SELECT * FROM t1;



SELECT type FROM t1 GROUP BY type WITH ROLLUP;

SELECT type FROM v1 GROUP BY type WITH ROLLUP;

EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP;



DROP VIEW v1;

DROP TABLE t1;

# Test for bug #11543: ROLLUP query with a repeated column in GROUP BY 

#
@@ -277,4 +250,17 @@ SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP; 


DROP TABLE t1;



#

# Bug #11885:  derived table specified by a subquery with

#              ROLLUP over expressions on not nullable group by attributes 

#



CREATE TABLE t1 (a int(11) NOT NULL);

INSERT INTO t1 VALUES (1),(2);



SELECT * FROM (SELECT a, a + 1, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;

SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t;



DROP TABLE t1;



# End of 4.1 tests

ndb/src/ndbapi/SignalSender.cpp

+1 −1
Original line number Diff line number Diff line
@@ -266,5 +266,5 @@ SignalSender::execNodeStatus(void* signalSender, 


template SimpleSignal* SignalSender::waitFor<WaitForNode>(unsigned, WaitForNode&);

template SimpleSignal* SignalSender::waitFor<WaitForAny>(unsigned, WaitForAny&);

template Vector<SimpleSignal*>;

template class Vector<SimpleSignal*>;