Merge 10.6 into 10.7

2025-07-27 18:02:13 +03:00 · 2022-01-04 09:55:58 +02:00
parent 9f2a6bbe6b 3f5726768f
commit 7dfaded962
145 changed files with 4381 additions and 1070 deletions
--- a/mysql-test/main/truncate_notembedded.test
+++ b/mysql-test/main/truncate_notembedded.test
@ -18,6 +18,7 @@ SELECT * FROM t1;
 UNLOCK TABLES;

 --connection con1
+--error 0,ER_OPTION_PREVENTS_STATEMENT
 --reap
 --error ER_OPTION_PREVENTS_STATEMENT
 TRUNCATE TABLE t1;