summaryrefslogtreecommitdiff
path: root/storage/myisammrg/mysql-test/storage_engine/trx/level_serializable.rdiff
blob: 3924b3784a9356a9f05f4b7cc019da8ca7a696c8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
0a1,6
> # -- WARNING ----------------------------------------------------------------
> # According to I_S.ENGINES, MRG_MYISAM does not support transactions.
> # If it is true, the test will most likely fail; you can 
> # either create an rdiff file, or add the test to disabled.def.
> # If transactions should be supported, check the data in Information Schema.
> # ---------------------------------------------------------------------------
14,15c20
< ERROR HY000: Lock wait timeout exceeded; try restarting transaction
< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. 
---
> # WARNING: Statement ended with errno 0, errname ''. 
19a25
> 1
22,23c28
< ERROR HY000: Lock wait timeout exceeded; try restarting transaction
< # WARNING: Statement ended with errno 1205, errname 'ER_LOCK_WAIT_TIMEOUT'. 
---
> # WARNING: Statement ended with errno 0, errname ''. 
27a33,34
> 1
> 2
32a40,43
> 1
> 101
> 102
> 2
35a47,50
> 1
> 101
> 102
> 2
38a54,57
> 1
> 101
> 102
> 2
41a61,64
> 1
> 101
> 102
> 2
46a70,77
> 1
> 101
> 102
> 2
> 201
> 202
> 301
> 302
49a81,88
> 1
> 101
> 102
> 2
> 201
> 202
> 301
> 302
52a92,99
> 1
> 101
> 102
> 2
> 201
> 202
> 301
> 302