diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
| commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
| tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /mysql-test/main/sp-error.result | |
| parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
| parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
| download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/sp-error.result')
| -rw-r--r-- | mysql-test/main/sp-error.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/sp-error.result b/mysql-test/main/sp-error.result index fc43bdf17e9..1a32665c886 100644 --- a/mysql-test/main/sp-error.result +++ b/mysql-test/main/sp-error.result @@ -2786,7 +2786,7 @@ END| CALL p1()| Warnings: -Warning 1366 Incorrect integer value: 'string' for column 'var1' at row 1 +Warning 1366 Incorrect integer value: 'string' for column ``.``.`var1` at row 1 SET sql_mode = DEFAULT; CREATE PROCEDURE p2() |