Adding upstream version 1:10.11.6.upstream/1%10.11.6upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 0 deletions

diff --git a/mysql-test/suite/innodb_gis/r/bug17057168.result b/mysql-test/suite/innodb_gis/r/bug17057168.result
new file mode 100644
index 00000000..0002acaf
--- /dev/null
+++ b/mysql-test/suite/innodb_gis/r/bug17057168.result
@@ -0,0 +1,22 @@
+CREATE DATABASE geotest;
+use geotest;
+CREATE TABLE tmp (id int unsigned NOT NULL PRIMARY KEY);
+INSERT INTO tmp VALUES (0), (1), (2), (3), (4), (5), (6), (7), (8), (9);
+INSERT INTO tmp SELECT 10+id FROM tmp;
+INSERT INTO tmp SELECT 20+id FROM tmp;
+INSERT INTO tmp SELECT 40+id FROM tmp;
+INSERT INTO tmp SELECT 80+id FROM tmp;
+CREATE TABLE t1 (id int unsigned NOT NULL auto_increment PRIMARY KEY,
+location point, INDEX (location)) ENGINE=InnoDB;
+INSERT INTO t1 (location) SELECT POINT(tmp1.id, tmp2.id) FROM tmp tmp1,
+tmp tmp2 ORDER BY tmp1.id, tmp2.id;
+EXPLAIN SELECT id, ST_AsText(location) FROM t1 WHERE location = POINT(1,
+2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	ref	location	location	28	const	1	Using where
+SELECT id, ST_AsText(location) FROM t1 WHERE location = POINT(1, 2);
+id	ST_AsText(location)
+163	POINT(1 2)
+DROP TABLE t1;
+DROP TABLE tmp;
+DROP DATABASE geotest;