Merge bk-internal.mysql.com:/data0/bk/mysql-4.1 (97c4143e) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/gis.result

+6 −0

Original line number	Diff line number	Diff line
		@@ -718,4 +718,10 @@ point(b, b) IS NULL linestring(b) IS NULL polygon(b) IS NULL multipoint(b) IS NU
		1 1 1 1 1 1 1
		0 1 1 1 1 1 1
		drop table t1;
		CREATE TABLE t1(a POINT) ENGINE=MyISAM;
		INSERT INTO t1 VALUES (NULL);
		SELECT * FROM t1;
		a
		NULL
		DROP TABLE t1;
		End of 4.1 tests

mysql-test/r/range.result

+141 −0

Original line number	Diff line number	Diff line
		@@ -701,4 +701,145 @@ d8c4177d225791924.30714720
		d8c4177d2380fc201.39666693
		d8c4177d24ccef970.14957924
		DROP TABLE t1;
		create table t1 (
		c1 char(10), c2 char(10), c3 char(10), c4 char(10),
		c5 char(10), c6 char(10), c7 char(10), c8 char(10),
		c9 char(10), c10 char(10), c11 char(10), c12 char(10),
		c13 char(10), c14 char(10), c15 char(10), c16 char(10),
		index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)
		);
		insert into t1 (c1) values ('1'),('1'),('1'),('1');
		select * from t1 where
		c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC");
		c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16
		drop table t1;
		End of 4.1 tests

mysql-test/t/gis.test

+8 −0

Original line number	Diff line number	Diff line
		@@ -411,4 +411,12 @@ from t1;

		drop table t1;

		#
		# Bug #27164: Crash when mixing InnoDB and MyISAM Geospatial tables
		#
		CREATE TABLE t1(a POINT) ENGINE=MyISAM;
		INSERT INTO t1 VALUES (NULL);
		SELECT * FROM t1;
		DROP TABLE t1;

		--echo End of 4.1 tests

mysql-test/t/range.test

+143 −0

Original line number	Diff line number	Diff line
		@@ -563,4 +563,147 @@ SELECT s.oxid FROM t1 v, t1 s

		DROP TABLE t1;

		# BUG#26624 high mem usage (crash) in range optimizer (depends on order of fields in where)
		create table t1 (
		c1 char(10), c2 char(10), c3 char(10), c4 char(10),
		c5 char(10), c6 char(10), c7 char(10), c8 char(10),
		c9 char(10), c10 char(10), c11 char(10), c12 char(10),
		c13 char(10), c14 char(10), c15 char(10), c16 char(10),
		index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)
		);
		insert into t1 (c1) values ('1'),('1'),('1'),('1');

		# This must run without crash and fast:
		select * from t1 where
		c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC")
		and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh",
		"abcdefg1", "123456781", "qwertyui1", "asddfg1",
		"abcdefg2", "123456782", "qwertyui2", "asddfg2",
		"abcdefg3", "123456783", "qwertyui3", "asddfg3",
		"abcdefg4", "123456784", "qwertyui4", "asddfg4",
		"abcdefg5", "123456785", "qwertyui5", "asddfg5",
		"abcdefg6", "123456786", "qwertyui6", "asddfg6",
		"abcdefg7", "123456787", "qwertyui7", "asddfg7",
		"abcdefg8", "123456788", "qwertyui8", "asddfg8",
		"abcdefg9", "123456789", "qwertyui9", "asddfg9",
		"abcdefgA", "12345678A", "qwertyuiA", "asddfgA",
		"abcdefgB", "12345678B", "qwertyuiB", "asddfgB",
		"abcdefgC", "12345678C", "qwertyuiC", "asddfgC");
		drop table t1;
		--echo End of 4.1 tests

sql/field.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -1115,7 +1115,7 @@ class Field_geom :public Field_blob {
		int store(const char to, uint length, CHARSET_INFO charset);
		int store(double nr) { return 1; }
		int store(longlong nr) { return 1; }
		int reset(void) { return !maybe_null(); }
		int reset(void) { return !maybe_null() \|\| Field_blob::reset(); }

		void get_key_image(char buff,uint length, CHARSET_INFO cs,imagetype type);
		void set_key_image(char buff,uint length, CHARSET_INFO cs);