database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-12-18 11:33:53 +02:00
parent 375256bae7 45531949ae
commit b5763ecd01
143 changed files with 2113 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/sp-error.result
View File

@ -2784,7 +2784,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()