mirror of
https://github.com/MariaDB/server.git
synced 2025-02-13 17:05:35 +01:00
![Marko Mäkelä](/assets/img/avatar_default.png)
The issue was a bad merge of MDEV-12253 from 10.1 to 10.2
in commit f9cc391863
.
In that merge, I wrongly assumed that all test file conflicts
for mysql-test/suite/encryption had been properly resolved in
bb-10.2-MDEV-12253 (commit 76aa6be77635c7017459ce33b41c837c9acb606d)
while in fact, some files there had been copied from the 10.1 branch.
This commit is based on a manually done conflict resolution of
the mysql-test/suite/encryption on the same merge, applied to
the current 10.2 branch.
As part of this commit, the test encryption.innodb-bad-key-change4
which was shortly disabled due to MDEV-11336 will be re-enabled again.
(While the test enables innodb_defragment, it does not fail even though
enabling innodb_defragment currently has no effect.)
51 lines
1.3 KiB
Text
51 lines
1.3 KiB
Text
CREATE TABLE t1(a INT);
|
|
INSERT INTO t1 VALUES(1),(2);
|
|
DELETE FROM t1 WHERE a=1;
|
|
OPTIMIZE TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 optimize status OK
|
|
CHECK TABLE t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
DROP TABLE t1;
|
|
create table t1 (v varchar(10), c char(10), t text, key(v), key(c), key(t(10)));
|
|
insert into t1 (v) select concat(char(ascii('a')+s2.seq),repeat(' ',s1.seq))
|
|
from seq_0_to_9 as s1, seq_0_to_26 as s2;
|
|
update t1 set c=v, t=v;
|
|
select sql_big_result t,count(t) from t1 group by t limit 10;
|
|
t count(t)
|
|
a 10
|
|
b 10
|
|
c 10
|
|
d 10
|
|
e 10
|
|
f 10
|
|
g 10
|
|
h 10
|
|
i 10
|
|
j 10
|
|
drop table t1;
|
|
set global binlog_cache_size=8192;
|
|
connect con1, localhost, root;
|
|
create table t1 (a text) engine=innodb;
|
|
start transaction;
|
|
insert t1 select repeat(seq, 1000) from seq_1_to_15;
|
|
commit;
|
|
start transaction;
|
|
insert t1 select repeat(seq, 1000) from seq_1_to_8;
|
|
commit;
|
|
drop table t1;
|
|
disconnect con1;
|
|
connect con2, localhost, root;
|
|
create table t1 (a text) engine=innodb;
|
|
start transaction;
|
|
insert t1 select repeat(seq, 1000) from seq_1_to_15;
|
|
savepoint foo;
|
|
insert t1 select repeat(seq, 1000) from seq_16_to_30;
|
|
rollback to savepoint foo;
|
|
insert t1 select repeat(seq, 1000) from seq_31_to_40;
|
|
commit;
|
|
drop table t1;
|
|
disconnect con2;
|
|
connection default;
|
|
set global binlog_cache_size=default;
|