Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 (7d006ee5) · Commits · Software / OSDI20 Artifacts / mariadb

include/decimal.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ int decimal_bin_size(int precision, int scale);
		int decimal_result_size(decimal_t from1, decimal_t from2, char op,
		int param);

		int decimal_intg(decimal_t *from);
		int decimal_add(decimal_t from1, decimal_t from2, decimal_t *to);
		int decimal_sub(decimal_t from1, decimal_t from2, decimal_t *to);
		int decimal_cmp(decimal_t from1, decimal_t from2);

mysql-test/r/cast.result

+5 −3

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ Warnings:
		Warning 1292 Truncated incorrect DOUBLE value: 'a'
		select 10.0+cast('a' as decimal);
		10.0+cast('a' as decimal)
		10.00
		10.0
		Warnings:
		Warning 1292 Truncated incorrect DECIMAL value: 'a'
		select 10E+0+'a';
		@@ -378,7 +378,9 @@ create table t1(s1 time);
		insert into t1 values ('11:11:11');
		select cast(s1 as decimal(7,2)) from t1;
		cast(s1 as decimal(7,2))
		111111.00
		99999.99
		Warnings:
		Error 1264 Out of range value adjusted for column 'cast(s1 as decimal(7,2))' at row 1
		drop table t1;
		CREATE TABLE t1 (v varchar(10), tt tinytext, t text,
		mt mediumtext, lt longtext);
		@@ -386,7 +388,7 @@ INSERT INTO t1 VALUES ('1.01', '2.02', '3.03', '4.04', '5.05');
		SELECT CAST(v AS DECIMAL), CAST(tt AS DECIMAL), CAST(t AS DECIMAL),
		CAST(mt AS DECIMAL), CAST(lt AS DECIMAL) from t1;
		CAST(v AS DECIMAL) CAST(tt AS DECIMAL) CAST(t AS DECIMAL) CAST(mt AS DECIMAL) CAST(lt AS DECIMAL)
		1.01 2.02 3.03 4.04 5.05
		1 2 3 4 5
		DROP TABLE t1;
		select cast(NULL as decimal(6)) as t1;
		t1

mysql-test/r/grant.result

+19 −0

Original line number	Diff line number	Diff line
		@@ -1105,4 +1105,23 @@ ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table '
		DROP DATABASE mysqltest1;
		DROP DATABASE mysqltest2;
		DROP USER mysqltest_1@localhost;
		use test;
		CREATE TABLE t1 (f1 int, f2 int);
		INSERT INTO t1 VALUES(1,1), (2,2);
		CREATE DATABASE db27878;
		GRANT UPDATE(f1) ON t1 TO 'mysqltest_1'@'localhost';
		GRANT SELECT ON `test`.* TO 'mysqltest_1'@'localhost';
		GRANT ALL ON db27878.* TO 'mysqltest_1'@'localhost';
		use db27878;
		CREATE SQL SECURITY INVOKER VIEW db27878.v1 AS SELECT * FROM test.t1;
		use db27878;
		UPDATE v1 SET f2 = 4;
		ERROR HY000: View 'db27878.v1' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
		SELECT * FROM test.t1;
		f1 f2
		1 1
		2 2
		DROP DATABASE db27878;
		use test;
		DROP TABLE t1;
		End of 5.0 tests

mysql-test/r/innodb_mysql.result

+52 −0

Original line number	Diff line number	Diff line
		@@ -544,4 +544,56 @@ id c counter
		3 b 2
		4 a 2
		drop table t1;
		CREATE TABLE t1(
		id int AUTO_INCREMENT PRIMARY KEY,
		stat_id int NOT NULL,
		acct_id int DEFAULT NULL,
		INDEX idx1 (stat_id, acct_id),
		INDEX idx2 (acct_id)
		) ENGINE=MyISAM;
		CREATE TABLE t2(
		id int AUTO_INCREMENT PRIMARY KEY,
		stat_id int NOT NULL,
		acct_id int DEFAULT NULL,
		INDEX idx1 (stat_id, acct_id),
		INDEX idx2 (acct_id)
		) ENGINE=InnoDB;
		INSERT INTO t1(stat_id,acct_id) VALUES
		(1,759), (2,831), (3,785), (4,854), (1,921),
		(1,553), (2,589), (3,743), (2,827), (2,545),
		(4,779), (4,783), (1,597), (1,785), (4,832),
		(1,741), (1,833), (3,788), (2,973), (1,907);
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		INSERT INTO t1(stat_id,acct_id) SELECT stat_id, mod(id+100000, acct_id) FROM t1;
		UPDATE t1 SET acct_id=785
		WHERE MOD(stat_id,2)=0 AND MOD(id,stat_id)=MOD(acct_id,stat_id);
		OPTIMIZE TABLE t1;
		Table Op Msg_type Msg_text
		test.t1 optimize status OK
		SELECT COUNT(*) FROM t1;
		COUNT(*)
		40960
		SELECT COUNT(*) FROM t1 WHERE acct_id=785;
		COUNT(*)
		8702
		EXPLAIN SELECT COUNT(*) FROM t1 WHERE stat_id IN (1,3) AND acct_id=785;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 range idx1,idx2 idx1 9 NULL 2 Using where; Using index
		INSERT INTO t2 SELECT * FROM t1;
		OPTIMIZE TABLE t2;
		Table Op Msg_type Msg_text
		test.t2 optimize status OK
		EXPLAIN SELECT COUNT(*) FROM t2 WHERE stat_id IN (1,3) AND acct_id=785;
		id select_type table type possible_keys key key_len ref rows Extra
		1 SIMPLE t2 range idx1,idx2 idx1 9 NULL 2 Using where; Using index
		DROP TABLE t1,t2;
		End of 5.0 tests

mysql-test/r/insert_update.result

+35 −0

Original line number	Diff line number	Diff line
		@@ -358,3 +358,38 @@ id c1 cnt
		5 Y 1
		6 Z 1
		DROP TABLE t1;
		CREATE TABLE t1 (
		id INT AUTO_INCREMENT PRIMARY KEY,
		c1 INT NOT NULL,
		cnt INT DEFAULT 1
		);
		INSERT INTO t1 (id,c1) VALUES (1,10);
		SELECT * FROM t1;
		id c1 cnt
		1 10 1
		CREATE TABLE t2 (id INT, c1 INT);
		INSERT INTO t2 VALUES (1,NULL), (2,2);
		INSERT INTO t1 (id,c1) SELECT 1,NULL
		ON DUPLICATE KEY UPDATE c1=NULL;
		ERROR 23000: Column 'c1' cannot be null
		SELECT * FROM t1;
		id c1 cnt
		1 10 1
		INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL
		ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
		Warnings:
		Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
		Error 1048 Column 'c1' cannot be null
		SELECT * FROM t1;
		id c1 cnt
		1 0 2
		INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
		ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
		Warnings:
		Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
		Error 1048 Column 'c1' cannot be null
		SELECT * FROM t1;
		id c1 cnt
		1 0 3
		2 2 1
		DROP TABLE t1;