Merge sita.local:/Users/tsmith/m/bk/50 (7b2b10e4) · Commits · Software / OSDI20 Artifacts / mariadb

BUILD/compile-pentium-gcov

+3 −2

Original line number	Diff line number	Diff line
		@@ -13,8 +13,9 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage"

		# The -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
		# code with profiling information used by gcov.
		# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"
		# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
		# The -DHAVE_gcov enables code to write out coverage info even when crashing.
		extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
		c_warnings="$c_warnings $debug_extra_warnings"
		cxx_warnings="$cxx_warnings $debug_extra_warnings"
		extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

mysql-test/r/gis.result

+3 −0

Original line number	Diff line number	Diff line
		@@ -885,4 +885,7 @@ AsText(a)
		POINT(1 1)
		LINESTRING(0 0,1 1,2 2)
		drop table t1, t2;
		SELECT 1;
		1
		1
		End of 5.0 tests

mysql-test/r/innodb_mysql.result

+52 −1

Original line number	Diff line number	Diff line
		drop table if exists t1,t2;
		drop table if exists t1,t2,t3,t4;
		create table t1 (
		c_id int(11) not null default '0',
		org_id int(11) default null,
		@@ -684,4 +684,55 @@ INSERT INTO t1 VALUES (1);
		switch to connection default
		SET AUTOCOMMIT=default;
		DROP TABLE t1,t2;
		CREATE TABLE t1 (
		id int NOT NULL auto_increment PRIMARY KEY,
		b int NOT NULL,
		c datetime NOT NULL,
		INDEX idx_b(b),
		INDEX idx_c(c)
		) ENGINE=InnoDB;
		CREATE TABLE t2 (
		b int NOT NULL auto_increment PRIMARY KEY,
		c datetime NOT NULL
		) ENGINE= MyISAM;
		INSERT INTO t2(c) VALUES ('2007-01-01');
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t2(c) SELECT c FROM t2;
		INSERT INTO t1(b,c) SELECT b,c FROM t2;
		UPDATE t2 SET c='2007-01-02';
		INSERT INTO t1(b,c) SELECT b,c FROM t2;
		UPDATE t2 SET c='2007-01-03';
		INSERT INTO t1(b,c) SELECT b,c FROM t2;
		set @@sort_buffer_size=8192;
		SELECT COUNT(*) FROM t1;
		COUNT(*)
		3072
		EXPLAIN
		SELECT COUNT(*) FROM t1
		WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 ALL idx_b,idx_c NULL NULL NULL # Using where
		SELECT COUNT(*) FROM t1
		WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
		COUNT(*)
		3072
		EXPLAIN
		SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
		WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 index_merge idx_b,idx_c idx_c,idx_b 8,4 NULL # Using sort_union(idx_c,idx_b); Using where
		SELECT COUNT(*) FROM t1 FORCE INDEX(idx_b, idx_c)
		WHERE (c >= '2007-01-02' AND c <= '2007-01-03') OR b >= 1;
		COUNT(*)
		3072
		set @@sort_buffer_size=default;
		DROP TABLE t1,t2;
		End of 5.0 tests

mysql-test/r/loaddata.result

+68 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,60 @@ field1 field2
		a"b cd"ef
		a"b c"d"e
		drop table t1;
		CREATE TABLE t1 (
		id INT AUTO_INCREMENT PRIMARY KEY,
		c1 VARCHAR(255)
		);
		CREATE TABLE t2 (
		id INT,
		c2 VARCHAR(255)
		);
		INSERT INTO t1 (c1) VALUES
		('r'), ('rr'), ('rrr'), ('rrrr'),
		('.r'), ('.rr'), ('.rrr'), ('.rrrr'),
		('r.'), ('rr.'), ('rrr.'), ('rrrr.'),
		('.r.'), ('.rr.'), ('.rrr.'), ('.rrrr.');
		SELECT * FROM t1;
		id c1
		1 r
		2 rr
		3 rrr
		4 rrrr
		5 .r
		6 .rr
		7 .rrr
		8 .rrrr
		9 r.
		10 rr.
		11 rrr.
		12 rrrr.
		13 .r.
		14 .rr.
		15 .rrr.
		16 .rrrr.
		SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY 'r' FROM t1;
		r1r rrrr
		r2r rrrrrr
		r3r rrrrrrrr
		r4r rrrrrrrrrr
		r5r r.rrr
		r6r r.rrrrr
		r7r r.rrrrrrr
		r8r r.rrrrrrrrr
		r9r rrr.r
		r10r rrrrr.r
		r11r rrrrrrr.r
		r12r rrrrrrrrr.r
		r13r r.rr.r
		r14r r.rrrr.r
		r15r r.rrrrrr.r
		r16r r.rrrrrrrr.r
		LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t2 FIELDS ENCLOSED BY 'r';
		SELECT t1.id, c1, c2 FROM t1 LEFT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;
		id c1 c2
		SELECT t1.id, c1, c2 FROM t1 RIGHT JOIN t2 ON t1.id=t2.id WHERE c1 != c2;
		id c1 c2
		DROP TABLE t1,t2;
		create table t1 (a int default 100, b int, c varchar(60));
		load data infile '../std_data_ln/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
		select * from t1;
		@@ -184,3 +238,17 @@ f1
		1
		2
		drop table t1,t2;
		CREATE TABLE t1 (c1 INT, c2 TIMESTAMP, c3 REAL, c4 DOUBLE);
		INSERT INTO t1 (c1, c2, c3, c4) VALUES (10, '1970-02-01 01:02:03', 1.1E-100, 1.1E+100);
		SELECT * FROM t1;
		c1 c2 c3 c4
		10 1970-02-01 01:02:03 1.1e-100 1.1e+100
		SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY '-' FROM t1;
		-10- -1970\-02\-01 01:02:03- -1.1e\-100- -1.1e+100-
		EOF
		TRUNCATE t1;
		LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 FIELDS ENCLOSED BY '-';
		SELECT * FROM t1;
		c1 c2 c3 c4
		10 1970-02-01 01:02:03 1.1e-100 1.1e+100
		DROP TABLE t1;

mysql-test/r/type_newdecimal.result

+28 −0

Original line number	Diff line number	Diff line
		@@ -1471,4 +1471,32 @@ drop table t1;
		SELECT 1.000000000000 * 99.999999999998 / 100 a,1.000000000000 * (99.999999999998 / 100) b;
		a b
		0.9999999999999800000000000000 0.9999999999999800000000000000
		SELECT CAST(1 AS decimal(65,10));
		CAST(1 AS decimal(65,10))
		1.0000000000
		SELECT CAST(1 AS decimal(66,10));
		ERROR 42000: Too big precision 66 specified for column '1'. Maximum is 65.
		SELECT CAST(1 AS decimal(65,30));
		CAST(1 AS decimal(65,30))
		1.000000000000000000000000000000
		SELECT CAST(1 AS decimal(65,31));
		ERROR 42000: Too big scale 31 specified for column '1'. Maximum is 30.
		CREATE TABLE t1 (a int DEFAULT NULL, b int DEFAULT NULL);
		INSERT INTO t1 VALUES (3,30), (1,10), (2,10);
		SELECT a+CAST(1 AS decimal(65,30)) AS aa, SUM(b) FROM t1 GROUP BY aa;
		aa SUM(b)
		2.000000000000000000000000000000 10
		3.000000000000000000000000000000 10
		4.000000000000000000000000000000 30
		SELECT a+CAST(1 AS decimal(65,31)) AS aa, SUM(b) FROM t1 GROUP BY aa;
		ERROR 42000: Too big scale 31 specified for column '1'. Maximum is 30.
		DROP TABLE t1;
		CREATE TABLE t1 (a int DEFAULT NULL, b int DEFAULT NULL);
		INSERT INTO t1 VALUES (3,30), (1,10), (2,10);
		SET @a= CAST(1 AS decimal);
		SELECT 1 FROM t1 GROUP BY @b := @a, @b;
		1
		1
		1
		DROP TABLE t1;
		End of 5.0 tests