← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mysql-dfsg-5.1/lucid-security

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-22 22:33:55 UTC
  • mfrom: (1.1.5)
  • Revision ID: package-import@ubuntu.com-20120222223355-or06x1euyk8n0ldi
Tags: 5.1.61-0ubuntu0.10.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
* Dropped patches unnecessary with 5.1.61:
  - debian/patches/90_mysql_safer_strmov.dpatch
  - debian/patches/51_ssl_test_certs.dpatch
  - debian/patches/52_CVE-2009-4030.dpatch
  - debian/patches/53_CVE-2009-4484.dpatch
  - debian/patches/54_CVE-2008-7247.dpatch
  - debian/patches/55_CVE-2010-1621.dpatch
  - debian/patches/56_CVE-2010-1850.dpatch
  - debian/patches/57_CVE-2010-1849.dpatch
  - debian/patches/58_CVE-2010-1848.dpatch
  - debian/patches/59_CVE-2010-1626.dpatch
  - debian/patches/60_CVE-2010-2008.dpatch
  - debian/patches/60_CVE-2010-3677.dpatch
  - debian/patches/60_CVE-2010-3678.dpatch
  - debian/patches/60_CVE-2010-3679.dpatch
  - debian/patches/60_CVE-2010-3680.dpatch
  - debian/patches/60_CVE-2010-3681.dpatch
  - debian/patches/60_CVE-2010-3682.dpatch
  - debian/patches/60_CVE-2010-3683.dpatch
  - debian/patches/60_CVE-2010-3833.dpatch
  - debian/patches/60_CVE-2010-3834.dpatch
  - debian/patches/60_CVE-2010-3835.dpatch
  - debian/patches/60_CVE-2010-3836.dpatch
  - debian/patches/60_CVE-2010-3837.dpatch
  - debian/patches/60_CVE-2010-3838.dpatch
  - debian/patches/60_CVE-2010-3839.dpatch
  - debian/patches/60_CVE-2010-3840.dpatch
  - debian/patches/61_disable_longfilename_test.dpatch
  - debian/patches/62_alter_table_fix.dpatch
  - debian/patches/63_cherrypick-upstream-49479.dpatch
  - debian/patches/10_readline_build_fix.dpatch
* debian/mysql-client-5.1.docs: removed EXCEPTIONS-CLIENT file
* debian/mysql-server-5.1.docs,debian/libmysqlclient16.docs,
  debian/libmysqlclient-dev.docs: removed, no longer necessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysql-test/suite/rpl/r/rpl_killed_ddl.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
DROP DATABASE IF EXISTS d1;
8
4
DROP DATABASE IF EXISTS d2;
9
5
DROP DATABASE IF EXISTS d3;
59
55
[on master1]
60
56
CREATE DATABASE d2;
61
57
source include/kill_query.inc;
62
 
source include/diff_master_slave.inc;
 
58
include/rpl_diff.inc
63
59
DROP DATABASE d1;
64
60
source include/kill_query.inc;
65
 
source include/diff_master_slave.inc;
66
 
DROP DATABASE d2;
 
61
include/rpl_diff.inc
 
62
DROP DATABASE IF EXISTS d2;
67
63
source include/kill_query.inc;
68
 
source include/diff_master_slave.inc;
 
64
include/rpl_diff.inc
69
65
CREATE EVENT e2
70
66
ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 DAY
71
67
DO INSERT INTO test.t1 VALUES (2);
72
68
source include/kill_query.inc;
73
 
source include/diff_master_slave.inc;
 
69
include/rpl_diff.inc
74
70
DROP EVENT e1;
75
71
source include/kill_query.inc;
76
 
source include/diff_master_slave.inc;
 
72
include/rpl_diff.inc
77
73
DROP EVENT IF EXISTS e2;
78
74
source include/kill_query.inc;
79
 
source include/diff_master_slave.inc;
 
75
include/rpl_diff.inc
80
76
CREATE FUNCTION f2 () RETURNS INT DETERMINISTIC
81
77
RETURN 1;
82
78
source include/kill_query.inc;
83
 
source include/diff_master_slave.inc;
 
79
include/rpl_diff.inc
84
80
ALTER FUNCTION f1 SQL SECURITY INVOKER;
85
81
source include/kill_query.inc;
86
 
source include/diff_master_slave.inc;
 
82
include/rpl_diff.inc
87
83
DROP FUNCTION f1;
88
84
source include/kill_query.inc;
89
 
source include/diff_master_slave.inc;
 
85
include/rpl_diff.inc
90
86
CREATE PROCEDURE p2 (OUT rows INT)
91
87
BEGIN
92
88
SELECT COUNT(*) INTO rows FROM t2;
93
89
END;
94
90
//
95
91
source include/kill_query.inc;
96
 
source include/diff_master_slave.inc;
 
92
include/rpl_diff.inc
97
93
ALTER PROCEDURE p1 SQL SECURITY INVOKER COMMENT 'return rows of table t1';
98
94
source include/kill_query.inc;
99
 
source include/diff_master_slave.inc;
 
95
include/rpl_diff.inc
100
96
DROP PROCEDURE p1;
101
97
source include/kill_query.inc;
102
 
source include/diff_master_slave.inc;
 
98
include/rpl_diff.inc
103
99
CREATE TABLE t2 (b int);
104
100
source include/kill_query.inc;
105
 
source include/diff_master_slave.inc;
 
101
include/rpl_diff.inc
106
102
ALTER TABLE t1 ADD (d int);
107
103
source include/kill_query.inc;
108
 
source include/diff_master_slave.inc;
 
104
include/rpl_diff.inc
109
105
RENAME TABLE t3 TO t4;
110
106
source include/kill_query.inc;
111
 
source include/diff_master_slave.inc;
 
107
include/rpl_diff.inc
112
108
CREATE INDEX i2 on t1 (a);
113
109
source include/kill_query.inc;
114
 
source include/diff_master_slave.inc;
 
110
include/rpl_diff.inc
115
111
DROP INDEX i1 on t1;
116
112
source include/kill_query.inc;
117
 
source include/diff_master_slave.inc;
 
113
include/rpl_diff.inc
 
114
CREATE TABLE IF NOT EXISTS t4 (a int);
118
115
CREATE TRIGGER tr2 BEFORE INSERT ON t4
119
116
FOR EACH ROW BEGIN
120
117
DELETE FROM t1 WHERE a=NEW.a;
121
118
END;
122
119
//
123
120
source include/kill_query.inc;
124
 
source include/diff_master_slave.inc;
 
121
include/rpl_diff.inc
125
122
DROP TRIGGER tr1;
126
123
source include/kill_query.inc;
127
 
source include/diff_master_slave.inc;
 
124
include/rpl_diff.inc
128
125
DROP TRIGGER IF EXISTS tr2;
129
126
source include/kill_query.inc;
130
 
source include/diff_master_slave.inc;
 
127
include/rpl_diff.inc
131
128
CREATE VIEW v2 AS SELECT a FROM t1 WHERE a > 100;
132
129
source include/kill_query.inc;
133
 
source include/diff_master_slave.inc;
 
130
include/rpl_diff.inc
134
131
DROP VIEW v1;
135
132
source include/kill_query.inc;
136
 
source include/diff_master_slave.inc;
 
133
include/rpl_diff.inc
137
134
DROP VIEW IF EXISTS v2;
138
135
source include/kill_query.inc;
139
 
source include/diff_master_slave.inc;
 
136
include/rpl_diff.inc
140
137
DROP TABLE t1;
141
138
source include/kill_query.inc;
142
 
source include/diff_master_slave.inc;
 
139
include/rpl_diff.inc
143
140
DROP TABLE IF EXISTS t2;
144
141
source include/kill_query.inc;
145
 
source include/diff_master_slave.inc;
 
142
include/rpl_diff.inc
146
143
DROP DATABASE IF EXISTS d1;
147
144
DROP DATABASE IF EXISTS d2;
148
145
DROP DATABASE IF EXISTS d3;
167
164
DROP PROCEDURE IF EXISTS p2;
168
165
DROP PROCEDURE IF EXISTS p3;
169
166
DROP PROCEDURE IF EXISTS p4;
 
167
include/rpl_end.inc