diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
| commit | 213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a (patch) | |
| tree | 79e9a941a078d73ce85da0241871a863fa4eca38 /mysql-test/r/user_var.result | |
| parent | cfa94b4338b5dd5578436df0402b2f2210de3eaa (diff) | |
| parent | c4341d50950224bb4e976fd1aac23dddc7d78f71 (diff) | |
| download | mariadb-git-213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'mysql-test/r/user_var.result')
| -rw-r--r-- | mysql-test/r/user_var.result | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 9c4fd02fcdd..2a3cdc49802 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -461,43 +461,9 @@ GROUP BY @b:=(SELECT COUNT(*) > t2.a); @a:=MIN(t1.a) 1 DROP TABLE t1; -End of 5.1 tests -DROP TABLE IF EXISTS t1; -CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1)); -INSERT INTO t1 SET f1 = NULL ; -SET @aux = NULL ; -INSERT INTO t1 SET f1 = @aux ; -SET @aux1 = 0.123E-1; -SET @aux1 = NULL; -INSERT INTO t1 SET f1 = @aux1 ; -SELECT * FROM t1; -f1 -1 -2 -3 -DROP TABLE t1; -CREATE TABLE t1(f1 VARCHAR(257) , f2 INT, PRIMARY KEY(f2)); -CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @aux = 1; -SET @aux = 1; -SET @aux = NULL; -INSERT INTO test.t1 (f1, f2) VALUES (1, 1), (@aux, 2); -SET @aux = 'text'; -SET @aux = NULL; -INSERT INTO t1(f1, f2) VALUES (1, 3), (@aux, 4); -SELECT f1, f2 FROM t1 ORDER BY f2; -f1 f2 -1 1 -1 2 -1 3 -1 4 -DROP TRIGGER trg1; -DROP TABLE t1; -# -# Bug #12408412: GROUP_CONCAT + ORDER BY + INPUT/OUTPUT -# SAME USER VARIABLE = CRASH -# SET @bug12408412=1; SELECT GROUP_CONCAT(@bug12408412 ORDER BY 1) INTO @bug12408412; +End of 5.1 tests CREATE TABLE t1(a INT); INSERT INTO t1 VALUES (0); SELECT DISTINCT POW(COUNT(*), @a:=(SELECT 1 FROM t1 LEFT JOIN t1 AS t2 ON @a)) @@ -530,4 +496,34 @@ SELECT @a; @a 1 DROP TABLE t1; +End of 5.2 tests +CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1)); +INSERT INTO t1 SET f1 = NULL ; +SET @aux = NULL ; +INSERT INTO t1 SET f1 = @aux ; +SET @aux1 = 0.123E-1; +SET @aux1 = NULL; +INSERT INTO t1 SET f1 = @aux1 ; +SELECT * FROM t1; +f1 +1 +2 +3 +DROP TABLE t1; +CREATE TABLE t1(f1 VARCHAR(257) , f2 INT, PRIMARY KEY(f2)); +CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @aux = 1; +SET @aux = 1; +SET @aux = NULL; +INSERT INTO test.t1 (f1, f2) VALUES (1, 1), (@aux, 2); +SET @aux = 'text'; +SET @aux = NULL; +INSERT INTO t1(f1, f2) VALUES (1, 3), (@aux, 4); +SELECT f1, f2 FROM t1 ORDER BY f2; +f1 f2 +1 1 +1 2 +1 3 +1 4 +DROP TRIGGER trg1; +DROP TABLE t1; End of 5.5 tests |