diff options
author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2010-12-08 17:36:52 +0300 |
---|---|---|
committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2010-12-08 17:36:52 +0300 |
commit | 32215ae3038adbc39f126e004b317879ea023b0f (patch) | |
tree | a015dc175a0c2440a705f1452b1cd5cff96edc7c /mysql-test | |
parent | 9838f48476726326d8a575c00052ff5184a36940 (diff) | |
parent | e5a88caf08749b6ac1de4d5420f04b6125898e08 (diff) | |
download | mariadb-git-32215ae3038adbc39f126e004b317879ea023b0f.tar.gz |
automerge 5.1-security --> 5.5-security (bug 57187)
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/user_var.result | 6 | ||||
-rw-r--r-- | mysql-test/t/user_var.test | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index e41a9bc7637..589186184c3 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -448,6 +448,12 @@ DROP TABLE t1; select @v:=@v:=sum(1) from dual; @v:=@v:=sum(1) 1 +CREATE TABLE t1(a DECIMAL(31,21)); +INSERT INTO t1 VALUES (0); +SELECT (@v:=a) <> (@v:=1) FROM t1; +(@v:=a) <> (@v:=1) +1 +DROP TABLE t1; End of 5.1 tests DROP TABLE IF EXISTS t1; CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1)); diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index b1a54495330..6a64343b609 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -351,6 +351,18 @@ DROP TABLE t1; select @v:=@v:=sum(1) from dual; +# +# Bug #57187: more user variable fun with multiple assignments and +# comparison in query +# + +CREATE TABLE t1(a DECIMAL(31,21)); +INSERT INTO t1 VALUES (0); + +SELECT (@v:=a) <> (@v:=1) FROM t1; + +DROP TABLE t1; + --echo End of 5.1 tests # |