diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-20 11:12:08 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-20 11:12:08 +0400 |
| commit | 4a8039b04e60b599b90e1c58021026697272c324 (patch) | |
| tree | b8f3d634a95f90b7a496aa3781fb3d9577294964 /mysql-test/r/sp-error.result | |
| parent | a0c7d3ff940600aa2d7cff067396ef6985f0bdc4 (diff) | |
| parent | a20c1217a5ce4235f72c59935a03b56fead2f6c4 (diff) | |
| download | mariadb-git-4a8039b04e60b599b90e1c58021026697272c324.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysql-test/r/sp-error.result')
| -rw-r--r-- | mysql-test/r/sp-error.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result index f0bc1874850..40643a97765 100644 --- a/mysql-test/r/sp-error.result +++ b/mysql-test/r/sp-error.result @@ -1990,8 +1990,8 @@ Warning 1264 Out of range value for column 'a' at row 1 Note 1292 Truncated incorrect INTEGER value: '222222 ' Warning 1264 Out of range value for column 'b' at row 1 Error 1048 Column 'c' cannot be null -Note 4092 At line 6 in test.t1_bi -Note 4092 At line 2 in test.p1 +Note 4093 At line 6 in test.t1_bi +Note 4093 At line 2 in test.p1 DROP TABLE t1; DROP TABLE t2; |