diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-26 15:03:37 +0200 |
commit | ffc69dbd05d31f016f3ac53be9d878ce133e60d6 (patch) | |
tree | 056faecdd7c90011e5729943725cd038019bc683 /mysql-test/main/func_group.result | |
parent | dbc0d576a3f402ae52423fe424ed0a68f49537ef (diff) | |
parent | ac4934535daadba0a45ffa407a7643ca3ff2712a (diff) | |
download | mariadb-git-ffc69dbd05d31f016f3ac53be9d878ce133e60d6.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/func_group.result')
-rw-r--r-- | mysql-test/main/func_group.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/main/func_group.result b/mysql-test/main/func_group.result index 9f3928615ec..f65ad43cf71 100644 --- a/mysql-test/main/func_group.result +++ b/mysql-test/main/func_group.result @@ -1979,8 +1979,8 @@ FROM t2); MIN(t2.pk) NULL Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'j' -Warning 1292 Truncated incorrect INTEGER value: 'j' +Warning 1292 Truncated incorrect DOUBLE value: 'j' +Warning 1292 Truncated incorrect DOUBLE value: 'j' EXPLAIN SELECT MIN(t2.pk) @@ -1993,8 +1993,8 @@ id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE 2 MATERIALIZED t2 ALL NULL NULL NULL NULL 2 Warnings: -Warning 1292 Truncated incorrect INTEGER value: 'j' -Warning 1292 Truncated incorrect INTEGER value: 'j' +Warning 1292 Truncated incorrect DOUBLE value: 'j' +Warning 1292 Truncated incorrect DOUBLE value: 'j' # # 2) Test that subquery materialization is setup for query with |