database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
The MDEV-17062 fix in commit c4195305b2
was omitted.
This commit is contained in:
Marko Mäkelä
2020-01-20 15:49:48 +02:00
parent 7ea413ac2d bc43bf3e43
commit 87a61355e8
261 changed files with 3749 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/main/range_innodb.test
View File

@ -80,12 +80,13 @@ create table t1 (
insert into t1
select A.a+10*B.a, A.a+10*B.a, A.a+10*B.a+100*C.a
from t0 A, t0 B, t0 C, t0 D where D.a<5;
SET @saved_dbug = @@GLOBAL.debug_dbug;
set @@global.debug_dbug="+d,ha_index_init_fail";
explain select * from t1 where a=10 and b=10;
--error ER_TABLE_DEF_CHANGED
select * from t1 where a=10 and b=10;
DROP TABLE t0,t1;
set @@global.debug_dbug="-d";
SET @@GLOBAL.debug_dbug = @saved_dbug;
set @@optimizer_switch= @optimizer_switch_save;
--echo #