diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 11:46:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-03 11:56:24 +0200 |
| commit | d361401bc26f49480daec8b0307afff6edae2ecc (patch) | |
| tree | 32fe757102f56b144401a4576956477370978bea /mysql-test/r/ps.result | |
| parent | 7a9fee9853c19c1d6d547cd17f87e9bd8f4ebbaa (diff) | |
| parent | 016caa3d202ee1f020ff84613b345c8f3bacdce3 (diff) | |
| download | mariadb-git-d361401bc26f49480daec8b0307afff6edae2ecc.tar.gz | |
Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12
trx_undo_page_report_modify(): For SPATIAL INDEX, keep logging
updated off-page columns twice, so that
the minimum bounding rectangle (MBR) will be logged.
Avoiding the redundant logging would require larger changes
to the undo log format.
row_build_index_entry_low(): Handle SPATIAL_UNKNOWN more robustly,
by refusing to purge the record from the spatial index.
We can get this code when processing old undo log from 10.2.10 or
10.2.11 (the releases affected by MDEV-14799, which was a regression
from MDEV-14051).
Diffstat (limited to 'mysql-test/r/ps.result')
| -rw-r--r-- | mysql-test/r/ps.result | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result index 5ddc52579bc..1958cafca1e 100644 --- a/mysql-test/r/ps.result +++ b/mysql-test/r/ps.result @@ -4345,6 +4345,24 @@ 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 # # Start of 10.2 tests |