summaryrefslogtreecommitdiff
path: root/mysql-test/main/func_group.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-28 13:43:26 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-28 13:43:26 +0200
commit2792c6e7b057b18c19b506f37c35716529f80979 (patch)
treecead6068286ee469dbfe33a28d4585742eb26cbb /mysql-test/main/func_group.result
parentc0743e4b0056eba0b19a19458c85e52a83cef676 (diff)
parent4b5a14d0fe3d6945a0a9516261f563dcfd1f2c9c (diff)
downloadmariadb-git-2792c6e7b057b18c19b506f37c35716529f80979.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/main/func_group.result')
-rw-r--r--mysql-test/main/func_group.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/func_group.result b/mysql-test/main/func_group.result
index c6daf2335a9..938acbae0e2 100644
--- a/mysql-test/main/func_group.result
+++ b/mysql-test/main/func_group.result
@@ -1982,6 +1982,7 @@ NULL
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'j'
Warning 1292 Truncated incorrect DOUBLE value: 'j'
+Warning 1292 Truncated incorrect DOUBLE value: 'j'
EXPLAIN
SELECT MIN(t2.pk)
@@ -1996,6 +1997,7 @@ id select_type table type possible_keys key key_len ref rows Extra
Warnings:
Warning 1292 Truncated incorrect DOUBLE 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