diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
| commit | ffc69dbd05d31f016f3ac53be9d878ce133e60d6 (patch) | |
| tree | 056faecdd7c90011e5729943725cd038019bc683 /mysql-test/main/ps_error.result | |
| parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
| parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
| download | mariadb-git-ffc69dbd05d31f016f3ac53be9d878ce133e60d6.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/ps_error.result')
| -rw-r--r-- | mysql-test/main/ps_error.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/main/ps_error.result b/mysql-test/main/ps_error.result index c3c312e82f5..e8a9f45494c 100644 --- a/mysql-test/main/ps_error.result +++ b/mysql-test/main/ps_error.result @@ -5,7 +5,7 @@ SET SQL_MODE= 'STRICT_ALL_TABLES'; CREATE TABLE t1 (a INT); PREPARE stmt FROM "CREATE TABLE tmp AS SELECT * FROM t1 WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' SELECT a FROM t1 GROUP BY NULL WITH ROLLUP; @@ -16,7 +16,7 @@ SET SQL_MODE= 'STRICT_ALL_TABLES'; CREATE TABLE t1 (a INT); PREPARE stmt FROM "CREATE TABLE tmp AS SELECT * FROM t1 WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' SET @a = REPLACE( @@global.optimizer_switch, '=on', '=off' ) ; @@ -28,7 +28,7 @@ SET sql_mode=DEFAULT; SET SQL_MODE='STRICT_ALL_TABLES'; PREPARE stmt FROM "CREATE TABLE ps AS SELECT 1 FROM DUAL WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' SELECT 'All done'; @@ -38,7 +38,7 @@ SET SQL_MODE=DEFAULT; SET SQL_MODE='STRICT_ALL_TABLES'; PREPARE stmt FROM "CREATE TABLE ps AS SELECT 1 FROM DUAL WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' DEALLOCATE PREPARE stmt; @@ -50,7 +50,7 @@ SET SQL_MODE= 'STRICT_ALL_TABLES'; CREATE TABLE t1 (a INT); PREPARE stmt FROM "CREATE TABLE tmp AS SELECT * FROM t1 WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' SELECT a FROM t1 GROUP BY a; @@ -63,7 +63,7 @@ SET SQL_MODE= 'STRICT_ALL_TABLES'; CREATE TABLE t1 (a INT); PREPARE stmt FROM "CREATE TABLE tmp AS SELECT * FROM t1 WHERE 'foo' && 0"; Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'foo' +Warning 1292 Truncated incorrect DOUBLE value: 'foo' EXECUTE stmt; ERROR 22007: Truncated incorrect INTEGER value: 'foo' SELECT a FROM t1 GROUP BY a; |