diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-08-07 21:35:34 +0400 |
| commit | 988a9daa945ce86737397e65757a85213abbb206 (patch) | |
| tree | 4e21eec3dee2d7b87bdd3d6cc00988e98eba59f1 /mysql-test/r/sp-error.result | |
| parent | 0f1cadd9a5e6e8aa2103100502b0a5b4227e8d7b (diff) | |
| parent | 30c36b2c150d6bf52e56abfbef755119fbc773f9 (diff) | |
| download | mariadb-git-988a9daa945ce86737397e65757a85213abbb206.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/func_json.result
mysql-test/r/win.result
mysql-test/t/func_json.test
mysql-test/t/win.test
sql/share/errmsg-utf8.txt
storage/rocksdb/ha_rocksdb.cc
storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result
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 f8dd2737e8e..e3a02503ad0 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 4070 At line 6 in test.t1_bi -Note 4070 At line 2 in test.p1 +Note 4091 At line 6 in test.t1_bi +Note 4091 At line 2 in test.p1 DROP TABLE t1; DROP TABLE t2; |