database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-12-18 09:15:41 +02:00
parent 36b7f8f4b0 ed13a0d221
commit 45531949ae
135 changed files with 2024 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/main/custom_aggregate_functions.result
View File

@ -573,7 +573,7 @@ select f3(sal) from t1;
f3(sal)
1000
select f2(val) from t1;
ERROR 22007: Incorrect integer value: 'ab' for column 'x' at row 1
ERROR 22007: Incorrect integer value: 'ab' for column ``.``.`x` at row 1
select val, id, c from (select f1(sal) as c from t2) as t1, t2;
val id c
10 2 17000