summaryrefslogtreecommitdiff
path: root/mysql-test/main/subselect_sj_mat.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/subselect_sj_mat.result
parent1630037959ab9516fc2a56d4901d2e5d794bc8e7 (diff)
parent742e1c727fc2be50b758068c2ab92abb19f3ff56 (diff)
downloadmariadb-git-f79cebb4d02a7b5151ac617bc762c3e094436562.tar.gz
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/main/subselect_sj_mat.result')
-rw-r--r--mysql-test/main/subselect_sj_mat.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/main/subselect_sj_mat.result b/mysql-test/main/subselect_sj_mat.result
index 97dcf07705c..17763a3fa02 100644
--- a/mysql-test/main/subselect_sj_mat.result
+++ b/mysql-test/main/subselect_sj_mat.result
@@ -604,9 +604,9 @@ select * from t1 group by (a1 in (select col from columns));
a1 a2
1 - 00 2 - 00
Warnings:
-Warning 1292 Truncated incorrect DOUBLE value: '1 - 00'
-Warning 1292 Truncated incorrect DOUBLE value: '1 - 01'
-Warning 1292 Truncated incorrect DOUBLE value: '1 - 02'
+Warning 1292 Truncated incorrect DECIMAL value: '1 - 00'
+Warning 1292 Truncated incorrect DECIMAL value: '1 - 01'
+Warning 1292 Truncated incorrect DECIMAL value: '1 - 02'
/* ORDER BY clause */
explain extended
select * from t1 order by (select col from columns limit 1);