summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-01-02 21:57:22 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-01-02 21:57:22 +0200
commit016caa3d202ee1f020ff84613b345c8f3bacdce3 (patch)
tree0d146b64709becc47a89359615555ae16102fede /mysql-test/r/ps.result
parent7e4c185c774cabaa1912760e143d9385ce959eea (diff)
parent51e4650ed0644ed88cf5d542bd0cab50e7ea0343 (diff)
downloadmariadb-git-016caa3d202ee1f020ff84613b345c8f3bacdce3.tar.gz
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r--mysql-test/r/ps.result18
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 94f1a51deb7..26e7bc37363 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -4332,4 +4332,22 @@ set join_cache_level=@join_cache_level_save;
deallocate prepare stmt;
drop view v1,v2,v3;
drop table t1,t2,t3;
+#
+# MDEV-10657: incorrect result returned with binary protocol
+# (prepared statements)
+#
+create table t1 (code varchar(10) primary key);
+INSERT INTO t1(code) VALUES ('LINE1'), ('LINE2'), ('LINE3');
+SELECT X.*
+FROM
+(SELECT CODE, RN
+FROM
+(SELECT A.CODE, @cnt := @cnt + 1 AS RN
+FROM t1 A, (SELECT @cnt := 0) C) T
+) X;
+CODE RN
+LINE1 1
+LINE2 2
+LINE3 3
+drop table t1;
# End of 5.5 tests