database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Vladislav Vaintroub
2010-01-13 21:14:42 +01:00
parent f3460b2132 51caeae915
commit b84abb3c40
39 changed files with 515 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/t/events_scheduling.test
View File

@@ -108,6 +108,32 @@ DROP TABLE table_1;
DROP TABLE table_2;
DROP TABLE table_3;
DROP TABLE table_4;
-- echo
-- echo Bug #50087 Interval arithmetic for Event_queue_element is not portable.
-- echo
CREATE TABLE t1(a int);
CREATE EVENT e1 ON SCHEDULE EVERY 1 MONTH
STARTS NOW() - INTERVAL 1 MONTH
ENDS NOW() + INTERVAL 2 MONTH
ON COMPLETION PRESERVE
DO
INSERT INTO t1 VALUES (1);
CREATE EVENT e2 ON SCHEDULE EVERY 1 MONTH
STARTS NOW()
ENDS NOW() + INTERVAL 11 MONTH
ON COMPLETION PRESERVE
DO
INSERT INTO t1 VALUES (1);
DROP TABLE t1;
DROP EVENT e1;
DROP EVENT e2;
DROP DATABASE events_test;
SET GLOBAL event_scheduler=@event_scheduler;

1
mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt Normal file
View File

@@ -0,0 +1 @@
--optimizer-switch=engine_condition_pushdown=off --engine-condition-pushdown=1

5
mysql-test/t/optimizer_switch_eng_cond_pushdown1.test Normal file
View File

@@ -0,0 +1,5 @@
# check how --engine-condition-pushdown and --optimizer-switch
# influence each other when used together (last wins).
select @@session.engine_condition_pushdown,
@@global.engine_condition_pushdown,
@@session.optimizer_switch, @@global.optimizer_switch;

1
mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt Normal file
View File

@@ -0,0 +1 @@
--engine-condition-pushdown=1 --optimizer-switch=engine_condition_pushdown=off

5
mysql-test/t/optimizer_switch_eng_cond_pushdown2.test Normal file
View File

@@ -0,0 +1,5 @@
# check how --engine-condition-pushdown and --optimizer-switch
# influence each other when used together (last wins).
select @@session.engine_condition_pushdown,
@@global.engine_condition_pushdown,
@@session.optimizer_switch, @@global.optimizer_switch;

47
mysql-test/t/subselect3.test
View File

@@ -794,3 +794,50 @@ SHOW STATUS LIKE '%Handler_read_rnd_next';
DROP TABLE t1,t2;
--echo End of 5.1 tests
--echo #
--echo # BUG#48920: COUNT DISTINCT returns 1 for NULL values when in a subquery
--echo # in the select list
--echo #
--echo
CREATE TABLE t1 (
i int(11) DEFAULT NULL,
v varchar(1) DEFAULT NULL
);
--echo
INSERT INTO t1 VALUES (8,'v');
INSERT INTO t1 VALUES (9,'r');
INSERT INTO t1 VALUES (NULL,'y');
--echo
CREATE TABLE t2 (
i int(11) DEFAULT NULL,
v varchar(1) DEFAULT NULL,
KEY i_key (i)
);
--echo
INSERT INTO t2 VALUES (NULL,'r');
INSERT INTO t2 VALUES (0,'c');
INSERT INTO t2 VALUES (0,'o');
INSERT INTO t2 VALUES (2,'v');
INSERT INTO t2 VALUES (7,'c');
--echo
SELECT i, v, (SELECT COUNT(DISTINCT i)
FROM t1
WHERE v = t2.v) as subsel
FROM t2;
--echo
EXPLAIN EXTENDED
SELECT i, v, (SELECT COUNT(DISTINCT i)
FROM t1
WHERE v = t2.v) as subsel
FROM t2;
DROP TABLE t1,t2;
--echo End of 5.6 tests