summaryrefslogtreecommitdiff
path: root/mysql-test/main/join_cache.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-07-28 10:33:26 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-07-28 10:33:26 +0300
commitf79cebb4d02a7b5151ac617bc762c3e094436562 (patch)
tree16008fa4f8d8d0b9b884670f6d850ae6a151520a /mysql-test/main/join_cache.result
parent1630037959ab9516fc2a56d4901d2e5d794bc8e7 (diff)
parent742e1c727fc2be50b758068c2ab92abb19f3ff56 (diff)
downloadmariadb-git-f79cebb4d02a7b5151ac617bc762c3e094436562.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/main/join_cache.result')
-rw-r--r--mysql-test/main/join_cache.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/join_cache.result b/mysql-test/main/join_cache.result
index 359739fecf8..10ed8960b64 100644
--- a/mysql-test/main/join_cache.result
+++ b/mysql-test/main/join_cache.result
@@ -3887,8 +3887,8 @@ ORDER BY t2.v;
MAX(t1.i)
NULL
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: 'x'
-Warning 1292 Truncated incorrect DOUBLE value: 'y'
+Warning 1292 Truncated incorrect DECIMAL value: 'x'
+Warning 1292 Truncated incorrect DECIMAL value: 'y'
EXPLAIN
SELECT MAX(t1.i)