summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_group.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2019-07-25 13:27:11 +0200
commitae476868a5394041a00e75a29c7d45917e8dfae8 (patch)
treeb2f82005fe87bc5ce1ea92504b505a9d4e8b9781 /mysql-test/r/func_group.result
parent8d0dabc56b09c6b40db15aac7da0da43d988759d (diff)
parent2536c0b1ebf6c5012ae34435d82fb2f5fa54aea5 (diff)
downloadmariadb-git-ae476868a5394041a00e75a29c7d45917e8dfae8.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'mysql-test/r/func_group.result')
-rw-r--r--mysql-test/r/func_group.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result
index b9875faacb6..06323f5b3bb 100644
--- a/mysql-test/r/func_group.result
+++ b/mysql-test/r/func_group.result
@@ -1981,6 +1981,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)
@@ -1995,6 +1996,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