diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 11:33:53 +0200 |
| commit | b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9 (patch) | |
| tree | b0ce48cd6f43a11d7465312dfe14552a8e4f8e3b /mysql-test/main/sp.result | |
| parent | 375256bae71e3f20d4498990610842b2976b6187 (diff) | |
| parent | 45531949ae115f2ba7b9450cc2386653483211ba (diff) | |
| download | mariadb-git-b5763ecd01ca9155ecce7b2f06e8a8bfce050ff9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/sp.result')
| -rw-r--r-- | mysql-test/main/sp.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result index 7ab772d1376..b110ab670ae 100644 --- a/mysql-test/main/sp.result +++ b/mysql-test/main/sp.result @@ -4590,7 +4590,7 @@ call bug15231_3()| Result Missed it (correct) Level Code Message -Warning 1366 Incorrect decimal value: 'zap' for column 'x' at row 1 +Warning 1366 Incorrect decimal value: 'zap' for column ``.``.`x` at row 1 Result Caught it (correct) call bug15231_5()| @@ -6455,7 +6455,7 @@ DROP TABLE t1; CALL p2('text'); Warnings: -Warning 1366 Incorrect integer value: 'text' for column 'v' at row 1 +Warning 1366 Incorrect integer value: 'text' for column ``.``.`v` at row 1 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( @@ -8374,7 +8374,7 @@ FETCH c INTO a; CLOSE c; END; $$ -ERROR 22007: Incorrect integer value: 'y' for column 'a' at row 1 +ERROR 22007: Incorrect integer value: 'y' for column ``.``.`a` at row 1 DROP TABLE t1; SET sql_mode=DEFAULT; # |