← Back to branch summary

~ubuntu-branches/ubuntu/natty/mysql-5.1/natty-proposed

« back to all changes in this revision

Viewing changes to mysql-test/suite/rpl/r/rpl_deadlock_innodb.result

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 08:30:45 UTC
  • mfrom: (1.4.1)
  • Revision ID: package-import@ubuntu.com-20120222083045-2rd53r4bnyx7qus4
Tags: 5.1.61-0ubuntu0.11.04.1
https://launchpad.net/bugs/937869
* SECURITY UPDATE: Update to 5.1.61 to fix multiple security issues
  (LP: #937869)
  - http://www.oracle.com/technetwork/topics/security/cpujan2012-366304.html
  - CVE-2011-2262
  - CVE-2012-0075
  - CVE-2012-0112
  - CVE-2012-0113
  - CVE-2012-0114
  - CVE-2012-0115
  - CVE-2012-0116
  - CVE-2012-0117
  - CVE-2012-0118
  - CVE-2012-0119
  - CVE-2012-0120
  - CVE-2012-0484
  - CVE-2012-0485
  - CVE-2012-0486
  - CVE-2012-0487
  - CVE-2012-0488
  - CVE-2012-0489
  - CVE-2012-0490
  - CVE-2012-0491
  - CVE-2012-0492
  - CVE-2012-0493
  - CVE-2012-0494
  - CVE-2012-0495
  - CVE-2012-0496

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
1
 
stop slave;
2
 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
3
 
reset master;
4
 
reset slave;
5
 
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
6
 
start slave;
 
1
include/master-slave.inc
 
2
[connection master]
7
3
*** Prepare tables and data ***
8
4
CREATE TABLE t1 (a INT NOT NULL, KEY(a)) ENGINE=innodb;
9
5
CREATE TABLE t2 (a INT) ENGINE=innodb;
50
46
SELECT * FROM t3;
51
47
a
52
48
3
53
 
Checking that both slave threads are running.
 
49
include/check_slave_is_running.inc
54
50
 
55
51
*** Test lock wait timeout ***
56
52
include/stop_slave.inc
61
57
a
62
58
1
63
59
START SLAVE;
 
60
include/wait_for_slave_sql_error.inc [errno=1205]
64
61
SELECT COUNT(*) FROM t2;
65
62
COUNT(*)
66
63
0
74
71
a
75
72
3
76
73
3
77
 
Checking that both slave threads are running.
 
74
include/check_slave_is_running.inc
78
75
 
79
76
*** Test lock wait timeout and purged relay logs ***
80
77
SET @my_max_relay_log_size= @@global.max_relay_log_size;
88
85
1
89
86
1
90
87
START SLAVE;
 
88
include/wait_for_slave_sql_error.inc [errno=1205]
91
89
SELECT COUNT(*) FROM t2;
92
90
COUNT(*)
93
91
0
103
101
3
104
102
3
105
103
3
106
 
Checking that both slave threads are running.
 
104
include/check_slave_is_running.inc
107
105
 
108
106
*** Clean up ***
109
107
DROP TABLE t1,t2,t3;
110
108
SET global max_relay_log_size= @my_max_relay_log_size;
111
109
End of 5.1 tests
 
110
include/rpl_end.inc