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/ps.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/ps.result')
| -rw-r--r-- | mysql-test/main/ps.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/ps.result b/mysql-test/main/ps.result index 9760989a736..a72b6660288 100644 --- a/mysql-test/main/ps.result +++ b/mysql-test/main/ps.result @@ -5165,13 +5165,13 @@ DECLARE a DATETIME; CALL p1(a); END; $$ -ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1 +ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1 BEGIN NOT ATOMIC DECLARE a DATETIME; EXECUTE IMMEDIATE 'CALL p1(?)' USING a; END; $$ -ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1 +ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1 BEGIN NOT ATOMIC DECLARE a DATETIME; PREPARE stmt FROM 'CALL p1(?)'; @@ -5179,7 +5179,7 @@ EXECUTE stmt USING a; DEALLOCATE PREPARE stmt; END; $$ -ERROR 22007: Incorrect datetime value: '10' for column 'a' at row 1 +ERROR 22007: Incorrect datetime value: '10' for column ``.``.`a` at row 1 DROP PROCEDURE p1; # # MDEV-14454 Binary protocol returns wrong collation ID for SP OUT parameters |