Skip to content

Commit 06be8cd

Browse files
committed
Clean up the test innodb.innodb-64k-crash
Before killing the server, ensure that the incomplete state of the transaction will be made durable and will be applied and rolled back on recovery, so that each time, roughly the same amount of work will be done. Remove DML statements after the recovery, and execute CHECK TABLE instead.
1 parent 1d31bed commit 06be8cd

File tree

2 files changed

+16
-391
lines changed

2 files changed

+16
-391
lines changed

mysql-test/suite/innodb/r/innodb-64k-crash.result

Lines changed: 9 additions & 315 deletions
Original file line numberDiff line numberDiff line change
@@ -271,319 +271,13 @@ vb=@c,wb=@c,xb=@c,yb=@c,zb=@c,
271271
ac=@c,bc=@c,cc=@c,dc=@c,ec=@c,fc=@c,gc=@c,hc=@c,ic=@c,jc=@c,
272272
kc=@c,lc=@c,mc=@c,nc=@c,oc=@c,pc=@c,qc=@c,rc=@c,sc=@c,tc=@c,uc=@c,
273273
vc=@c,wc=@c,xc=@c,yc=@c,zc=@c;
274-
UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e,f=@e,g=@e,h=@e,i=@e,j=@e,
275-
k=@e,l=@e,m=@e,n=@e,o=@e,p=@e,q=@e,r=@e,s=@e,t=@e,u=@e,
276-
v=@e,w=@e,x=@e,y=@e,z=@e,
277-
aa=@e,ba=@e,ca=@e,da=@e,ea=@e,fa=@e,ga=@e,ha=@e,ia=@e,ja=@e,
278-
ka=@e,la=@e,ma=@e,na=@e,oa=@e,pa=@e,qa=@e,ra=@e,sa=@e,ta=@e,ua=@e,
279-
va=@e,wa=@e,xa=@e,ya=@e,za=@e,
280-
ab=@e,bb=@e,cb=@e,db=@e,eb=@e,fb=@e,gb=@e,hb=@e,ib=@e,jb=@e,
281-
kb=@e,lb=@e,mb=@e,nb=@e,ob=@e,pb=@e,qb=@e,rb=@e,sb=@e,tb=@e,ub=@e,
282-
vb=@e,wb=@e,xb=@e,yb=@e,zb=@e,
283-
ac=@e,bc=@e,cc=@e,dc=@e,ec=@e,fc=@e,gc=@e,hc=@e,ic=@e,jc=@e,
284-
kc=@e,lc=@e,mc=@e,nc=@e,oc=@e,pc=@e,qc=@e,rc=@e,sc=@e,tc=@e,uc=@e,
285-
vc=@e,wc=@e,xc=@e,yc=@e,zc=@e;
286-
UPDATE t2 SET a=@l,b=@l,c=@l,d=@l,e=@l,f=@l,g=@l,h=@l,i=@l,j=@l,
287-
k=@l,l=@l,m=@l,n=@l,o=@l,p=@l,q=@l,r=@l,s=@l,t=@l,u=@l,
288-
v=@l,w=@l,x=@l,y=@l,z=@l,
289-
aa=@l,ba=@l,ca=@l,da=@l,ea=@l,fa=@l,ga=@l,ha=@l,ia=@l,ja=@l,
290-
ka=@l,la=@l,ma=@l,na=@l,oa=@l,pa=@l,qa=@l,ra=@l,sa=@l,ta=@l,ua=@l,
291-
va=@l,wa=@l,xa=@l,ya=@l,za=@l,
292-
ab=@l,bb=@l,cb=@l,db=@l,eb=@l,fb=@l,gb=@l,hb=@l,ib=@l,jb=@l,
293-
kb=@l,lb=@l,mb=@l,nb=@l,ob=@l,pb=@l,qb=@l,rb=@l,sb=@l,tb=@l,ub=@l,
294-
vb=@l,wb=@l,xb=@l,yb=@l,zb=@l,
295-
ac=@l,bc=@l,cc=@l,dc=@l,ec=@l,fc=@l,gc=@l,hc=@l,ic=@l,jc=@l,
296-
kc=@l,lc=@l,mc=@l,nc=@l,oc=@l,pc=@l,qc=@l,rc=@l,sc=@l,tc=@l,uc=@l,
297-
vc=@l,wc=@l,xc=@l,yc=@l,zc=@l;
298-
COMMIT;
299-
BEGIN;
300-
UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f;
301-
UPDATE t1 SET f=@f,g=@f,h=@f,i=@f,j=@f;
302-
UPDATE t1 SET k=@f,l=@f,m=@f,n=@f,o=@f;
303-
UPDATE t1 SET p=@f,q=@f,r=@f,s=@f,t=@f,u=@f;
304-
UPDATE t1 SET v=@f,w=@f,x=@f,y=@f,z=@f;
305-
UPDATE t1 SET aa=@f,ba=@f,ca=@f,da=@f;
306-
UPDATE t1 SET ea=@f,fa=@f,ga=@f,ha=@f,ia=@f,ja=@f;
307-
UPDATE t1 SET ka=@f,la=@f,ma=@f,na=@f,oa=@f,pa=@f;
308-
UPDATE t1 SET qa=@f,ra=@f,sa=@f,ta=@f,ua=@f;
309-
UPDATE t1 SET va=@f,wa=@f,xa=@f,ya=@f,za=@f;
310-
UPDATE t1 SET ab=@f,bb=@f,cb=@f,db=@f;
311-
UPDATE t1 SET eb=@f,fb=@f,gb=@f,hb=@f,ib=@f,ja=@f;
312-
UPDATE t1 SET kb=@f,lb=@f,mb=@f,nb=@f,ob=@f,pa=@f;
313-
UPDATE t1 SET qb=@f,rb=@f,sb=@f,tb=@f,ub=@f;
314-
UPDATE t1 SET vb=@f,wb=@f,xb=@f,yb=@f,zb=@f;
315-
UPDATE t1 SET ac=@f,bc=@f,cc=@f,dc=@f;
316-
UPDATE t1 SET ec=@f,fc=@f,gc=@f,hc=@f,ic=@f,jc=@f;
317-
UPDATE t1 SET kc=@f,lc=@f,mc=@f,nc=@f,oc=@f,pc=@f;
318-
UPDATE t1 SET qc=@f,rc=@f,sc=@f,tc=@f,uc=@f;
319-
UPDATE t1 SET vc=@f,wc=@f,xc=@f,yc=@f,zc=@f;
320-
COMMIT;
321-
BEGIN;
322-
UPDATE t2 SET a=@f,b=@f,c=@f,d=@f,e=@f;
323-
UPDATE t2 SET f=@f,g=@f,h=@f,i=@f,j=@f;
324-
UPDATE t2 SET k=@f,l=@f,m=@f,n=@f,o=@f;
325-
UPDATE t2 SET p=@f,q=@f,r=@f,s=@f,t=@f,u=@f;
326-
UPDATE t2 SET v=@f,w=@f,x=@f,y=@f,z=@f;
327-
UPDATE t2 SET aa=@f,ba=@f,ca=@f,da=@f;
328-
UPDATE t2 SET ea=@f,fa=@f,ga=@f,ha=@f,ia=@f,ja=@f;
329-
UPDATE t2 SET ka=@f,la=@f,ma=@f,na=@f,oa=@f,pa=@f;
330-
UPDATE t2 SET qa=@f,ra=@f,sa=@f,ta=@f,ua=@f;
331-
UPDATE t2 SET va=@f,wa=@f,xa=@f,ya=@f,za=@f;
332-
UPDATE t2 SET ab=@f,bb=@f,cb=@f,db=@f;
333-
UPDATE t2 SET eb=@f,fb=@f,gb=@f,hb=@f,ib=@f,ja=@f;
334-
UPDATE t2 SET kb=@f,lb=@f,mb=@f,nb=@f,ob=@f,pa=@f;
335-
UPDATE t2 SET qb=@f,rb=@f,sb=@f,tb=@f,ub=@f;
336-
UPDATE t2 SET vb=@f,wb=@f,xb=@f,yb=@f,zb=@f;
337-
UPDATE t2 SET ac=@f,bc=@f,cc=@f,dc=@f;
338-
UPDATE t2 SET ec=@f,fc=@f,gc=@f,hc=@f,ic=@f,jc=@f;
339-
UPDATE t2 SET kc=@f,lc=@f,mc=@f,nc=@f,oc=@f,pc=@f;
340-
UPDATE t2 SET qc=@f,rc=@f,sc=@f,tc=@f,uc=@f;
341-
UPDATE t2 SET vc=@f,wc=@f,xc=@f,yc=@f,zc=@f;
342-
COMMIT;
343-
show create table t1;
344-
Table Create Table
345-
t1 CREATE TABLE `t1` (
346-
`a` blob DEFAULT NULL,
347-
`b` blob DEFAULT NULL,
348-
`c` blob DEFAULT NULL,
349-
`d` blob DEFAULT NULL,
350-
`e` blob DEFAULT NULL,
351-
`f` blob DEFAULT NULL,
352-
`g` blob DEFAULT NULL,
353-
`h` blob DEFAULT NULL,
354-
`i` blob DEFAULT NULL,
355-
`j` blob DEFAULT NULL,
356-
`k` blob DEFAULT NULL,
357-
`l` blob DEFAULT NULL,
358-
`m` blob DEFAULT NULL,
359-
`n` blob DEFAULT NULL,
360-
`o` blob DEFAULT NULL,
361-
`p` blob DEFAULT NULL,
362-
`q` blob DEFAULT NULL,
363-
`r` blob DEFAULT NULL,
364-
`s` blob DEFAULT NULL,
365-
`t` blob DEFAULT NULL,
366-
`u` blob DEFAULT NULL,
367-
`v` blob DEFAULT NULL,
368-
`w` blob DEFAULT NULL,
369-
`x` blob DEFAULT NULL,
370-
`y` blob DEFAULT NULL,
371-
`z` blob DEFAULT NULL,
372-
`aa` blob DEFAULT NULL,
373-
`ba` blob DEFAULT NULL,
374-
`ca` blob DEFAULT NULL,
375-
`da` blob DEFAULT NULL,
376-
`ea` blob DEFAULT NULL,
377-
`fa` blob DEFAULT NULL,
378-
`ga` blob DEFAULT NULL,
379-
`ha` blob DEFAULT NULL,
380-
`ia` blob DEFAULT NULL,
381-
`ja` blob DEFAULT NULL,
382-
`ka` blob DEFAULT NULL,
383-
`la` blob DEFAULT NULL,
384-
`ma` blob DEFAULT NULL,
385-
`na` blob DEFAULT NULL,
386-
`oa` blob DEFAULT NULL,
387-
`pa` blob DEFAULT NULL,
388-
`qa` blob DEFAULT NULL,
389-
`ra` blob DEFAULT NULL,
390-
`sa` blob DEFAULT NULL,
391-
`ta` blob DEFAULT NULL,
392-
`ua` blob DEFAULT NULL,
393-
`va` blob DEFAULT NULL,
394-
`wa` blob DEFAULT NULL,
395-
`xa` blob DEFAULT NULL,
396-
`ya` blob DEFAULT NULL,
397-
`za` blob DEFAULT NULL,
398-
`ab` blob DEFAULT NULL,
399-
`bb` blob DEFAULT NULL,
400-
`cb` blob DEFAULT NULL,
401-
`db` blob DEFAULT NULL,
402-
`eb` blob DEFAULT NULL,
403-
`fb` blob DEFAULT NULL,
404-
`gb` blob DEFAULT NULL,
405-
`hb` blob DEFAULT NULL,
406-
`ib` blob DEFAULT NULL,
407-
`jb` blob DEFAULT NULL,
408-
`kb` blob DEFAULT NULL,
409-
`lb` blob DEFAULT NULL,
410-
`mb` blob DEFAULT NULL,
411-
`nb` blob DEFAULT NULL,
412-
`ob` blob DEFAULT NULL,
413-
`pb` blob DEFAULT NULL,
414-
`qb` blob DEFAULT NULL,
415-
`rb` blob DEFAULT NULL,
416-
`sb` blob DEFAULT NULL,
417-
`tb` blob DEFAULT NULL,
418-
`ub` blob DEFAULT NULL,
419-
`vb` blob DEFAULT NULL,
420-
`wb` blob DEFAULT NULL,
421-
`xb` blob DEFAULT NULL,
422-
`yb` blob DEFAULT NULL,
423-
`zb` blob DEFAULT NULL,
424-
`ac` blob DEFAULT NULL,
425-
`bc` blob DEFAULT NULL,
426-
`cc` blob DEFAULT NULL,
427-
`dc` blob DEFAULT NULL,
428-
`ec` blob DEFAULT NULL,
429-
`fc` blob DEFAULT NULL,
430-
`gc` blob DEFAULT NULL,
431-
`hc` blob DEFAULT NULL,
432-
`ic` blob DEFAULT NULL,
433-
`jc` blob DEFAULT NULL,
434-
`kc` blob DEFAULT NULL,
435-
`lc` blob DEFAULT NULL,
436-
`mc` blob DEFAULT NULL,
437-
`nc` blob DEFAULT NULL,
438-
`oc` blob DEFAULT NULL,
439-
`pc` blob DEFAULT NULL,
440-
`qc` blob DEFAULT NULL,
441-
`rc` blob DEFAULT NULL,
442-
`sc` blob DEFAULT NULL,
443-
`tc` blob DEFAULT NULL,
444-
`uc` blob DEFAULT NULL,
445-
`vc` blob DEFAULT NULL,
446-
`wc` blob DEFAULT NULL,
447-
`xc` blob DEFAULT NULL,
448-
`yc` blob DEFAULT NULL,
449-
`zc` blob DEFAULT NULL,
450-
KEY `t1a` (`a`(767),`b`(767)),
451-
KEY `t1c` (`c`(767),`d`(767)),
452-
KEY `t1e` (`e`(767),`f`(767)),
453-
KEY `t1f2` (`g`(767),`h`(767)),
454-
KEY `t1f4` (`i`(767),`j`(767)),
455-
KEY `t1k` (`k`(767),`m`(767)),
456-
KEY `t1f8` (`n`(767),`o`(767)),
457-
KEY `t1f11` (`p`(767),`q`(767)),
458-
KEY `t1f13` (`r`(767),`s`(767)),
459-
KEY `t1f15` (`t`(767),`u`(767)),
460-
KEY `t1f18` (`w`(767),`x`(767)),
461-
KEY `t1f20` (`y`(767),`z`(767)),
462-
KEY `ta1a6` (`aa`(767),`ba`(767)),
463-
KEY `tc1c6` (`ca`(767),`da`(767)),
464-
KEY `te1e6` (`ea`(767),`fa`(767))
465-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
466-
show create table t2;
467-
Table Create Table
468-
t2 CREATE TABLE `t2` (
469-
`a` blob DEFAULT NULL,
470-
`b` blob DEFAULT NULL,
471-
`c` blob DEFAULT NULL,
472-
`d` blob DEFAULT NULL,
473-
`e` blob DEFAULT NULL,
474-
`f` blob DEFAULT NULL,
475-
`g` blob DEFAULT NULL,
476-
`h` blob DEFAULT NULL,
477-
`i` blob DEFAULT NULL,
478-
`j` blob DEFAULT NULL,
479-
`k` blob DEFAULT NULL,
480-
`l` blob DEFAULT NULL,
481-
`m` blob DEFAULT NULL,
482-
`n` blob DEFAULT NULL,
483-
`o` blob DEFAULT NULL,
484-
`p` blob DEFAULT NULL,
485-
`q` blob DEFAULT NULL,
486-
`r` blob DEFAULT NULL,
487-
`s` blob DEFAULT NULL,
488-
`t` blob DEFAULT NULL,
489-
`u` blob DEFAULT NULL,
490-
`v` blob DEFAULT NULL,
491-
`w` blob DEFAULT NULL,
492-
`x` blob DEFAULT NULL,
493-
`y` blob DEFAULT NULL,
494-
`z` blob DEFAULT NULL,
495-
`aa` blob DEFAULT NULL,
496-
`ba` blob DEFAULT NULL,
497-
`ca` blob DEFAULT NULL,
498-
`da` blob DEFAULT NULL,
499-
`ea` blob DEFAULT NULL,
500-
`fa` blob DEFAULT NULL,
501-
`ga` blob DEFAULT NULL,
502-
`ha` blob DEFAULT NULL,
503-
`ia` blob DEFAULT NULL,
504-
`ja` blob DEFAULT NULL,
505-
`ka` blob DEFAULT NULL,
506-
`la` blob DEFAULT NULL,
507-
`ma` blob DEFAULT NULL,
508-
`na` blob DEFAULT NULL,
509-
`oa` blob DEFAULT NULL,
510-
`pa` blob DEFAULT NULL,
511-
`qa` blob DEFAULT NULL,
512-
`ra` blob DEFAULT NULL,
513-
`sa` blob DEFAULT NULL,
514-
`ta` blob DEFAULT NULL,
515-
`ua` blob DEFAULT NULL,
516-
`va` blob DEFAULT NULL,
517-
`wa` blob DEFAULT NULL,
518-
`xa` blob DEFAULT NULL,
519-
`ya` blob DEFAULT NULL,
520-
`za` blob DEFAULT NULL,
521-
`ab` blob DEFAULT NULL,
522-
`bb` blob DEFAULT NULL,
523-
`cb` blob DEFAULT NULL,
524-
`db` blob DEFAULT NULL,
525-
`eb` blob DEFAULT NULL,
526-
`fb` blob DEFAULT NULL,
527-
`gb` blob DEFAULT NULL,
528-
`hb` blob DEFAULT NULL,
529-
`ib` blob DEFAULT NULL,
530-
`jb` blob DEFAULT NULL,
531-
`kb` blob DEFAULT NULL,
532-
`lb` blob DEFAULT NULL,
533-
`mb` blob DEFAULT NULL,
534-
`nb` blob DEFAULT NULL,
535-
`ob` blob DEFAULT NULL,
536-
`pb` blob DEFAULT NULL,
537-
`qb` blob DEFAULT NULL,
538-
`rb` blob DEFAULT NULL,
539-
`sb` blob DEFAULT NULL,
540-
`tb` blob DEFAULT NULL,
541-
`ub` blob DEFAULT NULL,
542-
`vb` blob DEFAULT NULL,
543-
`wb` blob DEFAULT NULL,
544-
`xb` blob DEFAULT NULL,
545-
`yb` blob DEFAULT NULL,
546-
`zb` blob DEFAULT NULL,
547-
`ac` blob DEFAULT NULL,
548-
`bc` blob DEFAULT NULL,
549-
`cc` blob DEFAULT NULL,
550-
`dc` blob DEFAULT NULL,
551-
`ec` blob DEFAULT NULL,
552-
`fc` blob DEFAULT NULL,
553-
`gc` blob DEFAULT NULL,
554-
`hc` blob DEFAULT NULL,
555-
`ic` blob DEFAULT NULL,
556-
`jc` blob DEFAULT NULL,
557-
`kc` blob DEFAULT NULL,
558-
`lc` blob DEFAULT NULL,
559-
`mc` blob DEFAULT NULL,
560-
`nc` blob DEFAULT NULL,
561-
`oc` blob DEFAULT NULL,
562-
`pc` blob DEFAULT NULL,
563-
`qc` blob DEFAULT NULL,
564-
`rc` blob DEFAULT NULL,
565-
`sc` blob DEFAULT NULL,
566-
`tc` blob DEFAULT NULL,
567-
`uc` blob DEFAULT NULL,
568-
`vc` blob DEFAULT NULL,
569-
`wc` blob DEFAULT NULL,
570-
`xc` blob DEFAULT NULL,
571-
`yc` blob DEFAULT NULL,
572-
`zc` blob DEFAULT NULL,
573-
KEY `t2a` (`a`(767),`b`(767)),
574-
KEY `t2c` (`c`(767),`d`(767)),
575-
KEY `t2e` (`e`(767),`f`(767)),
576-
KEY `t2f2` (`g`(767),`h`(767)),
577-
KEY `t2f4` (`i`(767),`j`(767)),
578-
KEY `t2k` (`k`(767),`m`(767)),
579-
KEY `t2f8` (`n`(767),`o`(767)),
580-
KEY `t2f11` (`p`(767),`q`(767)),
581-
KEY `t2f13` (`r`(767),`s`(767)),
582-
KEY `t2f15` (`t`(767),`u`(767)),
583-
KEY `t2f18` (`w`(767),`x`(767)),
584-
KEY `t2f20` (`y`(767),`z`(767)),
585-
KEY `ta2a6` (`aa`(767),`ba`(767)),
586-
KEY `tc2c6` (`ca`(767),`da`(767)),
587-
KEY `te2e6` (`ea`(767),`fa`(767))
588-
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
274+
connect con1,localhost,root,,;
275+
SET GLOBAL innodb_flush_log_at_trx_commit=1;
276+
DELETE FROM t2 LIMIT 1;
277+
disconnect con1;
278+
connection default;
279+
check table t1,t2;
280+
Table Op Msg_type Msg_text
281+
test.t1 check status OK
282+
test.t2 check status OK
589283
drop table t1,t2;

0 commit comments

Comments
 (0)