database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

6
mysql-test/suite/funcs_1/r/storedproc.result
View File

@ -13825,7 +13825,7 @@ CALL sp1();
@xx
0
Warnings:
Warning 1366 Incorrect integer value: 'asd' for column 'xx' at row 1
Warning 1366 Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN
@ -13874,7 +13874,7 @@ CALL sp1();
xx
0
Warnings:
Warning 1366 Incorrect double value: 'asd' for column 'xx' at row 1
Warning 1366 Incorrect double value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN
@ -13946,7 +13946,7 @@ CALL sp1();
xx
0
Warnings:
Warning 1366 Incorrect integer value: 'asd' for column 'xx' at row 1
Warning 1366 Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
DROP PROCEDURE IF EXISTS sp1;
CREATE PROCEDURE sp1()
BEGIN