diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/null.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/user_var.result | 31 |
2 files changed, 32 insertions, 1 deletions
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result index 1cdc48e6552..585d7a14ce9 100644 --- a/mysql-test/r/null.result +++ b/mysql-test/r/null.result @@ -94,7 +94,7 @@ Warnings: Warning 1265 Data truncated for column 'd' at row 1 UPDATE t1 SET d=1/NULL; Warnings: -Warning 1265 Data truncated for column 'd' at row 1 +Warning 1048 Column 'd' cannot be null UPDATE t1 SET d=NULL; Warnings: Warning 1048 Column 'd' cannot be null diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index c73d2e64540..29c05a60166 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -429,3 +429,34 @@ INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1); DROP TABLE t1; End of 5.1 tests +DROP TABLE IF EXISTS t1; +CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1)); +INSERT INTO t1 SET f1 = NULL ; +SET @aux = NULL ; +INSERT INTO t1 SET f1 = @aux ; +SET @aux1 = 0.123E-1; +SET @aux1 = NULL; +INSERT INTO t1 SET f1 = @aux1 ; +SELECT * FROM t1; +f1 +1 +2 +3 +DROP TABLE t1; +CREATE TABLE t1(f1 VARCHAR(257) , f2 INT, PRIMARY KEY(f2)); +CREATE TRIGGER trg1 BEFORE INSERT ON t1 FOR EACH ROW SET @aux = 1; +SET @aux = 1; +SET @aux = NULL; +INSERT INTO test.t1 (f1, f2) VALUES (1, 1), (@aux, 2); +SET @aux = 'text'; +SET @aux = NULL; +INSERT INTO t1(f1, f2) VALUES (1, 3), (@aux, 4); +SELECT f1, f2 FROM t1 ORDER BY f2; +f1 f2 +1 1 +1 2 +1 3 +1 4 +DROP TRIGGER trg1; +DROP TABLE t1; +End of 5.5 tests |