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-vars.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-vars.result')
| -rw-r--r-- | mysql-test/main/sp-vars.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/sp-vars.result b/mysql-test/main/sp-vars.result index 0d4d18c577d..236695a6c0f 100644 --- a/mysql-test/main/sp-vars.result +++ b/mysql-test/main/sp-vars.result @@ -140,7 +140,7 @@ SELECT sp_vars_check_ret3(); sp_vars_check_ret3() 0 Warnings: -Warning 1366 Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1 +Warning 1366 Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1 SELECT sp_vars_check_ret4(); sp_vars_check_ret4() 154.12 @@ -195,7 +195,7 @@ SELECT sp_vars_check_ret3(); sp_vars_check_ret3() 0 Warnings: -Warning 1366 Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1 +Warning 1366 Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1 SELECT sp_vars_check_ret4(); sp_vars_check_ret4() 154.12 @@ -314,7 +314,7 @@ ERROR 22003: Out of range value for column 'sp_vars_check_ret1()' at row 1 SELECT sp_vars_check_ret2(); ERROR 22003: Out of range value for column 'sp_vars_check_ret2()' at row 1 SELECT sp_vars_check_ret3(); -ERROR 22007: Incorrect integer value: 'Hello, world' for column 'sp_vars_check_ret3()' at row 1 +ERROR 22007: Incorrect integer value: 'Hello, world' for column ``.``.`sp_vars_check_ret3()` at row 1 SELECT sp_vars_check_ret4(); sp_vars_check_ret4() 154.12 @@ -896,7 +896,7 @@ sp_var @user_var 0 Warnings: -Warning 1366 Incorrect integer value: 'Hello, world!' for column 'sp_var' at row 1 +Warning 1366 Incorrect integer value: 'Hello, world!' for column ``.``.`sp_var` at row 1 DROP PROCEDURE p1; DROP TABLE t1; |