List:Commits« Previous MessageNext Message »
From:Greg Lehey Date:April 27 2006 5:54am
Subject:bk commit into 5.0 tree (grog:1.2098) BUG#12187
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2098 06/04/27 13:24:42 grog@stripped +2 -0
  rpl_load_from_master.test, rpl_load_from_master.result:
    Test case for BUG#12187: failure to load specific tables.

  mysql-test/t/rpl_load_from_master.test
    1.1 06/04/27 13:23:17 grog@stripped +81 -0

  mysql-test/t/rpl_load_from_master.test
    1.0 06/04/27 13:23:17 grog@stripped +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-12187/mysql-test/t/rpl_load_from_master.test

  mysql-test/r/rpl_load_from_master.result
    1.1 06/04/27 13:23:16 grog@stripped +180 -0

  mysql-test/r/rpl_load_from_master.result
    1.0 06/04/27 13:23:16 grog@stripped +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-12187/mysql-test/r/rpl_load_from_master.result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	grog
# Host:	eucla.lemis.com
# Root:	/home/MySQL/5.0-Bug-12187
--- New file ---
+++ mysql-test/r/rpl_load_from_master.result	06/04/27 13:23:16
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
drop database if exists t1;
create database t1;
use t1;
CREATE TABLE `t1` (`osid` int(10) unsigned NOT NULL default '0', 
`os` varchar(255) NOT NULL default '', 
PRIMARY KEY (`osid`), 
FULLTEXT KEY `os` (`os`)) 
ENGINE=MyISAM DEFAULT CHARSET=latin1;
INSERT INTO `t1` VALUES (1, 'OS: Microsoft Windows XP Service Pack 2');
INSERT INTO `t1` VALUES (2, 'OS: Microsoft Windows 98 SE A');
INSERT INTO `t1` VALUES (3, 'OS: Microsoft Windows XP');
INSERT INTO `t1` VALUES (4, 'OS: Microsoft Windows XP Service Pack 1');
INSERT INTO `t1` VALUES (5, 'OS: Microsoft Windows 2000 Service Pack 4');
INSERT INTO `t1` VALUES (6, 'OS: Microsoft Windows Millennium Edition\n');
INSERT INTO `t1` VALUES (7, 'OS: Microsoft Windows 2000 Service Pack 2');
INSERT INTO `t1` VALUES (8, 'OS: Microsoft Windows XP Dodatek Service Pack 2');
INSERT INTO `t1` VALUES (9, 'OS: Microsoft Windows XP Dodatek Service Pack. 1');
INSERT INTO `t1` VALUES (10, 'OS: Microsoft Windows XP Service Pack 2, v.2082');
INSERT INTO `t1` VALUES (11, 'OS: Microsoft Windows Server; 2003 family');
INSERT INTO `t1` VALUES (12, 'OS: Microsoft Windows XP Service Pack 2, v.2096');
INSERT INTO `t1` VALUES (13, 'OS: Microsoft Windows 95');
INSERT INTO `t1` VALUES (14, 'OS: Microsoft Windows 2000');
INSERT INTO `t1` VALUES (15, 'OS: Microsoft Windows XP Szervizcsomag 1');
INSERT INTO `t1` VALUES (16, 'OS: Microsoft Windows 98');
INSERT INTO `t1` VALUES (17, 'OS: Microsoft Windows 95 OSR2 B');
INSERT INTO `t1` VALUES (18, 'OS: Microsoft Windows 2000 Service Pack 3');
INSERT INTO `t1` VALUES (19, 'OS: Microsoft Windows XP Service Pack 2, v.2055');
INSERT INTO `t1` VALUES (20, 'OS: Microsoft Windows XP Service Pack 2, v.2135');
INSERT INTO `t1` VALUES (21, 'OS: Microsoft Windows 95 OSR2 C');
INSERT INTO `t1` VALUES (22, 'OS: Microsoft Windows XP Szervizcsomag 2');
INSERT INTO `t1` VALUES (23, 'OS: Microsoft Windows 98 B');
INSERT INTO `t1` VALUES (24, 'OS: Microsoft Windows 98 A');
INSERT INTO `t1` VALUES (25, 'OS: Microsoft Windows 2000 Service Pack 1');
INSERT INTO `t1` VALUES (26, 'OS: Microsoft Windows XP Service Pack 2, v.2149');
INSERT INTO `t1` VALUES (27, 'OS: Microsoft Windows Millennium Edition\n A');
INSERT INTO `t1` VALUES (28, 'OS: Microsoft Windows 2000 Service Pack 3, RC 3.51');
INSERT INTO `t1` VALUES (29, 'OS: Microsoft Windows XP Service Pack 2, v.2162');
INSERT INTO `t1` VALUES (30, 'OS: Microsoft Windows 2000 Dodatek Service Pack. 2');
INSERT INTO `t1` VALUES (31, 'OS: Microsoft Windows XP Service Pack 1, v.1081');
INSERT INTO `t1` VALUES (32, 'OS: Microsoft Windows XP Service Pack 2, v.2126');
INSERT INTO `t1` VALUES (33, 'OS: Microsoft Windows XP Service Pack 1, v.1050');
INSERT INTO `t1` VALUES (34, 'OS: Microsoft Windows Millennium Edition');
INSERT INTO `t1` VALUES (35, 'OS: Microsoft Windows 95 b');
INSERT INTO `t1` VALUES (36, 'OS: Microsoft Windows 95 a');
INSERT INTO `t1` VALUES (37, 'OS: Microsoft Windows 2000 Dodatek Service Pack. 1');
INSERT INTO `t1` VALUES (38, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1433');
INSERT INTO `t1` VALUES (39, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1039');
INSERT INTO `t1` VALUES (40, 'OS: Microsoft Windows XP Service Pack 2, v.2138');
INSERT INTO `t1` VALUES (41, 'OS: Microsoft Windows 2000 Service Pack 4, RC 3.154');
INSERT INTO `t1` VALUES (42, 'OS: Microsoft Windows XP Service Pack 1, v.1105');
INSERT INTO `t1` VALUES (43, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1289');
INSERT INTO `t1` VALUES (44, 'OS: Microsoft Windows NT Service Pack 2');
INSERT INTO `t1` VALUES (45, 'OS: Microsoft Windows XP Service Pack 2, v.2120');
INSERT INTO `t1` VALUES (46, 'OS: Microsoft Windows NT Service Pack 5');
INSERT INTO `t1` VALUES (47, 'OS: Microsoft Windows XP Service Pack 2, v.1204');
INSERT INTO `t1` VALUES (48, 'OS: Microsoft Windows 2000 Service Pack 4, RC 4.68');
INSERT INTO `t1` VALUES (49, 'OS: Microsoft Windows XP Service Pack 2, v.2142');
INSERT INTO `t1` VALUES (50, 'OS: Microsoft Windows Server; 2003 family Service Pack 1');
INSERT INTO `t1` VALUES (51, 'OS:');
select * from t1;
osid	os
1	OS: Microsoft Windows XP Service Pack 2
2	OS: Microsoft Windows 98 SE A
3	OS: Microsoft Windows XP
4	OS: Microsoft Windows XP Service Pack 1
5	OS: Microsoft Windows 2000 Service Pack 4
6	OS: Microsoft Windows Millennium Edition

7	OS: Microsoft Windows 2000 Service Pack 2
8	OS: Microsoft Windows XP Dodatek Service Pack 2
9	OS: Microsoft Windows XP Dodatek Service Pack. 1
10	OS: Microsoft Windows XP Service Pack 2, v.2082
11	OS: Microsoft Windows Server; 2003 family
12	OS: Microsoft Windows XP Service Pack 2, v.2096
13	OS: Microsoft Windows 95
14	OS: Microsoft Windows 2000
15	OS: Microsoft Windows XP Szervizcsomag 1
16	OS: Microsoft Windows 98
17	OS: Microsoft Windows 95 OSR2 B
18	OS: Microsoft Windows 2000 Service Pack 3
19	OS: Microsoft Windows XP Service Pack 2, v.2055
20	OS: Microsoft Windows XP Service Pack 2, v.2135
21	OS: Microsoft Windows 95 OSR2 C
22	OS: Microsoft Windows XP Szervizcsomag 2
23	OS: Microsoft Windows 98 B
24	OS: Microsoft Windows 98 A
25	OS: Microsoft Windows 2000 Service Pack 1
26	OS: Microsoft Windows XP Service Pack 2, v.2149
27	OS: Microsoft Windows Millennium Edition
 A
28	OS: Microsoft Windows 2000 Service Pack 3, RC 3.51
29	OS: Microsoft Windows XP Service Pack 2, v.2162
30	OS: Microsoft Windows 2000 Dodatek Service Pack. 2
31	OS: Microsoft Windows XP Service Pack 1, v.1081
32	OS: Microsoft Windows XP Service Pack 2, v.2126
33	OS: Microsoft Windows XP Service Pack 1, v.1050
34	OS: Microsoft Windows Millennium Edition
35	OS: Microsoft Windows 95 b
36	OS: Microsoft Windows 95 a
37	OS: Microsoft Windows 2000 Dodatek Service Pack. 1
38	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1433
39	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1039
40	OS: Microsoft Windows XP Service Pack 2, v.2138
41	OS: Microsoft Windows 2000 Service Pack 4, RC 3.154
42	OS: Microsoft Windows XP Service Pack 1, v.1105
43	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1289
44	OS: Microsoft Windows NT Service Pack 2
45	OS: Microsoft Windows XP Service Pack 2, v.2120
46	OS: Microsoft Windows NT Service Pack 5
47	OS: Microsoft Windows XP Service Pack 2, v.1204
48	OS: Microsoft Windows 2000 Service Pack 4, RC 4.68
49	OS: Microsoft Windows XP Service Pack 2, v.2142
50	OS: Microsoft Windows Server; 2003 family Service Pack 1
51	OS:
use t1;
DROP TABLE `t1`;
LOAD TABLE `t1` FROM MASTER;
select * from t1;
osid	os
1	OS: Microsoft Windows XP Service Pack 2
2	OS: Microsoft Windows 98 SE A
3	OS: Microsoft Windows XP
4	OS: Microsoft Windows XP Service Pack 1
5	OS: Microsoft Windows 2000 Service Pack 4
6	OS: Microsoft Windows Millennium Edition

7	OS: Microsoft Windows 2000 Service Pack 2
8	OS: Microsoft Windows XP Dodatek Service Pack 2
9	OS: Microsoft Windows XP Dodatek Service Pack. 1
10	OS: Microsoft Windows XP Service Pack 2, v.2082
11	OS: Microsoft Windows Server; 2003 family
12	OS: Microsoft Windows XP Service Pack 2, v.2096
13	OS: Microsoft Windows 95
14	OS: Microsoft Windows 2000
15	OS: Microsoft Windows XP Szervizcsomag 1
16	OS: Microsoft Windows 98
17	OS: Microsoft Windows 95 OSR2 B
18	OS: Microsoft Windows 2000 Service Pack 3
19	OS: Microsoft Windows XP Service Pack 2, v.2055
20	OS: Microsoft Windows XP Service Pack 2, v.2135
21	OS: Microsoft Windows 95 OSR2 C
22	OS: Microsoft Windows XP Szervizcsomag 2
23	OS: Microsoft Windows 98 B
24	OS: Microsoft Windows 98 A
25	OS: Microsoft Windows 2000 Service Pack 1
26	OS: Microsoft Windows XP Service Pack 2, v.2149
27	OS: Microsoft Windows Millennium Edition
 A
28	OS: Microsoft Windows 2000 Service Pack 3, RC 3.51
29	OS: Microsoft Windows XP Service Pack 2, v.2162
30	OS: Microsoft Windows 2000 Dodatek Service Pack. 2
31	OS: Microsoft Windows XP Service Pack 1, v.1081
32	OS: Microsoft Windows XP Service Pack 2, v.2126
33	OS: Microsoft Windows XP Service Pack 1, v.1050
34	OS: Microsoft Windows Millennium Edition
35	OS: Microsoft Windows 95 b
36	OS: Microsoft Windows 95 a
37	OS: Microsoft Windows 2000 Dodatek Service Pack. 1
38	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1433
39	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1039
40	OS: Microsoft Windows XP Service Pack 2, v.2138
41	OS: Microsoft Windows 2000 Service Pack 4, RC 3.154
42	OS: Microsoft Windows XP Service Pack 1, v.1105
43	OS: Microsoft Windows Server; 2003 family Service Pack 1, v.1289
44	OS: Microsoft Windows NT Service Pack 2
45	OS: Microsoft Windows XP Service Pack 2, v.2120
46	OS: Microsoft Windows NT Service Pack 5
47	OS: Microsoft Windows XP Service Pack 2, v.1204
48	OS: Microsoft Windows 2000 Service Pack 4, RC 4.68
49	OS: Microsoft Windows XP Service Pack 2, v.2142
50	OS: Microsoft Windows Server; 2003 family Service Pack 1
51	OS:
drop table t1;
drop database t1;

--- New file ---
+++ mysql-test/t/rpl_load_from_master.test	06/04/27 13:23:17
# BUG#12187

source include/master-slave.inc;
--disable_warnings
connection master;
drop database if exists t1;
--enable_warnings
create database t1;
use t1;

CREATE TABLE `t1` (`osid` int(10) unsigned NOT NULL default '0', 
                   `os` varchar(255) NOT NULL default '', 
                    PRIMARY KEY (`osid`), 
                    FULLTEXT KEY `os` (`os`)) 
ENGINE=MyISAM DEFAULT CHARSET=latin1;

INSERT INTO `t1` VALUES (1, 'OS: Microsoft Windows XP Service Pack 2');
INSERT INTO `t1` VALUES (2, 'OS: Microsoft Windows 98 SE A');
INSERT INTO `t1` VALUES (3, 'OS: Microsoft Windows XP');
INSERT INTO `t1` VALUES (4, 'OS: Microsoft Windows XP Service Pack 1');
INSERT INTO `t1` VALUES (5, 'OS: Microsoft Windows 2000 Service Pack 4');
INSERT INTO `t1` VALUES (6, 'OS: Microsoft Windows Millennium Edition\n');
INSERT INTO `t1` VALUES (7, 'OS: Microsoft Windows 2000 Service Pack 2');
INSERT INTO `t1` VALUES (8, 'OS: Microsoft Windows XP Dodatek Service Pack 2');
INSERT INTO `t1` VALUES (9, 'OS: Microsoft Windows XP Dodatek Service Pack. 1');
INSERT INTO `t1` VALUES (10, 'OS: Microsoft Windows XP Service Pack 2, v.2082');
INSERT INTO `t1` VALUES (11, 'OS: Microsoft Windows Server; 2003 family');
INSERT INTO `t1` VALUES (12, 'OS: Microsoft Windows XP Service Pack 2, v.2096');
INSERT INTO `t1` VALUES (13, 'OS: Microsoft Windows 95');
INSERT INTO `t1` VALUES (14, 'OS: Microsoft Windows 2000');
INSERT INTO `t1` VALUES (15, 'OS: Microsoft Windows XP Szervizcsomag 1');
INSERT INTO `t1` VALUES (16, 'OS: Microsoft Windows 98');
INSERT INTO `t1` VALUES (17, 'OS: Microsoft Windows 95 OSR2 B');
INSERT INTO `t1` VALUES (18, 'OS: Microsoft Windows 2000 Service Pack 3');
INSERT INTO `t1` VALUES (19, 'OS: Microsoft Windows XP Service Pack 2, v.2055');
INSERT INTO `t1` VALUES (20, 'OS: Microsoft Windows XP Service Pack 2, v.2135');
INSERT INTO `t1` VALUES (21, 'OS: Microsoft Windows 95 OSR2 C');
INSERT INTO `t1` VALUES (22, 'OS: Microsoft Windows XP Szervizcsomag 2');
INSERT INTO `t1` VALUES (23, 'OS: Microsoft Windows 98 B');
INSERT INTO `t1` VALUES (24, 'OS: Microsoft Windows 98 A');
INSERT INTO `t1` VALUES (25, 'OS: Microsoft Windows 2000 Service Pack 1');
INSERT INTO `t1` VALUES (26, 'OS: Microsoft Windows XP Service Pack 2, v.2149');
INSERT INTO `t1` VALUES (27, 'OS: Microsoft Windows Millennium Edition\n A');
INSERT INTO `t1` VALUES (28, 'OS: Microsoft Windows 2000 Service Pack 3, RC 3.51');
INSERT INTO `t1` VALUES (29, 'OS: Microsoft Windows XP Service Pack 2, v.2162');
INSERT INTO `t1` VALUES (30, 'OS: Microsoft Windows 2000 Dodatek Service Pack. 2');
INSERT INTO `t1` VALUES (31, 'OS: Microsoft Windows XP Service Pack 1, v.1081');
INSERT INTO `t1` VALUES (32, 'OS: Microsoft Windows XP Service Pack 2, v.2126');
INSERT INTO `t1` VALUES (33, 'OS: Microsoft Windows XP Service Pack 1, v.1050');
INSERT INTO `t1` VALUES (34, 'OS: Microsoft Windows Millennium Edition');
INSERT INTO `t1` VALUES (35, 'OS: Microsoft Windows 95 b');
INSERT INTO `t1` VALUES (36, 'OS: Microsoft Windows 95 a');
INSERT INTO `t1` VALUES (37, 'OS: Microsoft Windows 2000 Dodatek Service Pack. 1');
INSERT INTO `t1` VALUES (38, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1433');
INSERT INTO `t1` VALUES (39, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1039');
INSERT INTO `t1` VALUES (40, 'OS: Microsoft Windows XP Service Pack 2, v.2138');
INSERT INTO `t1` VALUES (41, 'OS: Microsoft Windows 2000 Service Pack 4, RC 3.154');
INSERT INTO `t1` VALUES (42, 'OS: Microsoft Windows XP Service Pack 1, v.1105');
INSERT INTO `t1` VALUES (43, 'OS: Microsoft Windows Server; 2003 family Service Pack 1,
v.1289');
INSERT INTO `t1` VALUES (44, 'OS: Microsoft Windows NT Service Pack 2');
INSERT INTO `t1` VALUES (45, 'OS: Microsoft Windows XP Service Pack 2, v.2120');
INSERT INTO `t1` VALUES (46, 'OS: Microsoft Windows NT Service Pack 5');
INSERT INTO `t1` VALUES (47, 'OS: Microsoft Windows XP Service Pack 2, v.1204');
INSERT INTO `t1` VALUES (48, 'OS: Microsoft Windows 2000 Service Pack 4, RC 4.68');
INSERT INTO `t1` VALUES (49, 'OS: Microsoft Windows XP Service Pack 2, v.2142');
INSERT INTO `t1` VALUES (50, 'OS: Microsoft Windows Server; 2003 family Service Pack 1');
INSERT INTO `t1` VALUES (51, 'OS:');

select * from t1;

save_master_pos;
connection slave;
sync_with_master;

use t1;
DROP TABLE `t1`;
LOAD TABLE `t1` FROM MASTER; 
select * from t1;

drop table t1;
drop database t1;
Thread
• bk commit into 5.0 tree (grog:1.2098) BUG#12187Greg Lehey27 Apr