diff options
Diffstat (limited to 'storage/connect/mysql-test')
9 files changed, 18 insertions, 14 deletions
diff --git a/storage/connect/mysql-test/connect/r/dir.result b/storage/connect/mysql-test/connect/r/dir.result index 34a591fb26c..99556c9b72d 100644 --- a/storage/connect/mysql-test/connect/r/dir.result +++ b/storage/connect/mysql-test/connect/r/dir.result @@ -25,6 +25,7 @@ SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size; fname ftype size boys .txt 282 boyswin .txt 288 +SET STATEMENT sql_mode = '' FOR INSERT INTO t1 VALUES ('','','',''); ERROR HY000: Got error 174 'COLBLK SetBuffer: undefined Access Method' from CONNECT DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/r/mysql_exec.result b/storage/connect/mysql-test/connect/r/mysql_exec.result index b6606ab5978..1801456fd74 100644 --- a/storage/connect/mysql-test/connect/r/mysql_exec.result +++ b/storage/connect/mysql-test/connect/r/mysql_exec.result @@ -31,9 +31,8 @@ insert into t1(msg) values('One'),(NULL),('Three') 1 3 Affected rows Warning 0 1048 Column 'msg' cannot be null insert into t1 values(2,'Deux') on duplicate key update msg = 'Two' 0 2 Affected rows insert into t1(message) values('Four'),('Five'),('Six') 0 1054 Remote: Unknown column 'message' in 'field list' -insert into t1(id) values(NULL) 1 1 Affected rows -Warning 0 1364 Field 'msg' doesn't have a default value -update t1 set msg = 'Four' where id = 4 0 1 Affected rows +insert into t1(id) values(NULL) 0 1364 Remote: Field 'msg' doesn't have a default value +update t1 set msg = 'Four' where id = 4 0 0 Affected rows select * from t1 0 2 Result set columns # # Checking Using Procedure @@ -46,11 +45,10 @@ READS SQL DATA SELECT * FROM t1 WHERE command IN ('Warning','Note',cmd); CALL p1('insert into t1(id) values(NULL)'); command warnings number message -insert into t1(id) values(NULL) 1 1 Affected rows -Warning 0 1364 Field 'msg' doesn't have a default value +insert into t1(id) values(NULL) 0 1364 Remote: Field 'msg' doesn't have a default value CALL p1('update t1 set msg = "Five" where id = 5'); command warnings number message -update t1 set msg = "Five" where id = 5 0 1 Affected rows +update t1 set msg = "Five" where id = 5 0 0 Affected rows DROP PROCEDURE p1; DROP TABLE t1; connection slave; @@ -59,8 +57,6 @@ id msg 1 One 2 Two 3 Three -4 Four -5 Five DROP TABLE t1; connection master; DROP TABLE IF EXISTS connect.t1; diff --git a/storage/connect/mysql-test/connect/r/mysql_new.result b/storage/connect/mysql-test/connect/r/mysql_new.result index 9236ee691e5..69402ff7532 100644 --- a/storage/connect/mysql-test/connect/r/mysql_new.result +++ b/storage/connect/mysql-test/connect/r/mysql_new.result @@ -203,7 +203,7 @@ t1 CREATE TABLE `t1` ( `d` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `e` year(4) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 -INSERT INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); +INSERT IGNORE INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); Warnings: Note 1265 Data truncated for column 'a' at row 1 Note 1265 Data truncated for column 'c' at row 1 diff --git a/storage/connect/mysql-test/connect/r/unsigned.result b/storage/connect/mysql-test/connect/r/unsigned.result index b993133a3c4..ca5a5ffe31e 100644 --- a/storage/connect/mysql-test/connect/r/unsigned.result +++ b/storage/connect/mysql-test/connect/r/unsigned.result @@ -27,13 +27,13 @@ UPDATE t1 SET e = d; SELECT * FROM t1; a b c d e 255 65535 4294967295 18446744073709551615 18446744073709551615 -UPDATE t1 SET c = d; +UPDATE IGNORE t1 SET c = d; Warnings: Warning 1264 Out of range value for column 'c' at row 1 SELECT * FROM t1; a b c d e 255 65535 4294967295 18446744073709551615 18446744073709551615 -UPDATE t1 SET c = e; +UPDATE IGNORE t1 SET c = e; Warnings: Warning 1264 Out of range value for column 'c' at row 1 SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/r/upd.result b/storage/connect/mysql-test/connect/r/upd.result index fa519c4b688..8faf00896bb 100644 --- a/storage/connect/mysql-test/connect/r/upd.result +++ b/storage/connect/mysql-test/connect/r/upd.result @@ -1,3 +1,4 @@ +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; CREATE TABLE employee ( serialno CHAR(5) NOT NULL, @@ -1625,3 +1626,4 @@ serialno name sex title manager department secretary salary # DROP PROCEDURE test.tst_up; DROP TABLE employee; +SET sql_mode = DEFAULT; diff --git a/storage/connect/mysql-test/connect/t/dir.test b/storage/connect/mysql-test/connect/t/dir.test index fb69813d9f0..8a56d4f8829 100644 --- a/storage/connect/mysql-test/connect/t/dir.test +++ b/storage/connect/mysql-test/connect/t/dir.test @@ -26,6 +26,7 @@ SELECT fname, ftype, size FROM t1 ORDER BY fname, ftype, size; # TODO: add a better error message --error ER_GET_ERRMSG +SET STATEMENT sql_mode = '' FOR INSERT INTO t1 VALUES ('','','',''); DROP TABLE t1; diff --git a/storage/connect/mysql-test/connect/t/mysql_new.test b/storage/connect/mysql-test/connect/t/mysql_new.test index de9cae7b87b..db9b1b704fc 100644 --- a/storage/connect/mysql-test/connect/t/mysql_new.test +++ b/storage/connect/mysql-test/connect/t/mysql_new.test @@ -306,7 +306,7 @@ DROP TABLE t1; CREATE TABLE t1 (a date, b datetime, c time, d timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, e year); SHOW CREATE TABLE t1; -INSERT INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); +INSERT IGNORE INTO t1 VALUES('2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23','2003-05-27 10:45:23'); SELECT * FROM t1; connection master; diff --git a/storage/connect/mysql-test/connect/t/unsigned.test b/storage/connect/mysql-test/connect/t/unsigned.test index 44eb832f8ae..48f6bdc835c 100644 --- a/storage/connect/mysql-test/connect/t/unsigned.test +++ b/storage/connect/mysql-test/connect/t/unsigned.test @@ -13,9 +13,9 @@ INSERT INTO t1(a,b,c,d) VALUES(255,65535,4294967295,18446744073709551615); SELECT * FROM t1; UPDATE t1 SET e = d; SELECT * FROM t1; -UPDATE t1 SET c = d; +UPDATE IGNORE t1 SET c = d; SELECT * FROM t1; -UPDATE t1 SET c = e; +UPDATE IGNORE t1 SET c = e; SELECT * FROM t1; UPDATE t1 SET d = e; SELECT * FROM t1; diff --git a/storage/connect/mysql-test/connect/t/upd.test b/storage/connect/mysql-test/connect/t/upd.test index a3716694c4a..28b566b5641 100644 --- a/storage/connect/mysql-test/connect/t/upd.test +++ b/storage/connect/mysql-test/connect/t/upd.test @@ -1,6 +1,8 @@ let $MYSQLD_DATADIR= `select @@datadir`; --copy_file $MTR_SUITE_DIR/std_data/employee.dat $MYSQLD_DATADIR/test/employee.dat +SET sql_mode = 'NO_ENGINE_SUBSTITUTION'; + CREATE TABLE employee ( serialno CHAR(5) NOT NULL, @@ -150,4 +152,6 @@ CALL test.tst_up(); DROP PROCEDURE test.tst_up; DROP TABLE employee; +SET sql_mode = DEFAULT; + --remove_file $MYSQLD_DATADIR/test/employee.dat |