From 69b8b3ff7c37dd72a5f5f265e92e801783e7b9bd Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 Sep 2003 23:17:28 +0200 Subject: * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly". Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to create it, and drops/creates table-by-table. * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1' database as a whole", as it already works for CREATE DATABASE and DROP DATABASE. mysql-test/r/rpl000009.result: result update mysql-test/t/rpl000009.test: test that LOAD DATA FROM MASTER does not drop databases, but rather table by table, thus preserving non-replicated tables. Test that LOAD DATA FROM MASTER reports the error when a table could not be dropped (system's "permission denied" for example). Test that LOAD TABLE FROM MASTER reports the error when the table already exists. sql/repl_failsafe.cc: * replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1' database as a whole", as it already works for CREATE DATABASE and DROP DATABASE. * If a db matches replicate_*_db rules, we don't drop/recreate it because this could drop some tables in this db which could be slave-specific. Instead, we do a CREATE DATABASE IF EXISTS, and we will drop each table which has an equivalent on the master, table-by-table. sql/slave.cc: New argument to drop the table in create_table_from_dump() (LOAD TABLE/DATA FROM MASTER are the only places where this function is used). This is needed because LOAD DATA FROM MASTER does not drop the database anymore. The behaviour when the table exists is unchanged: LOAD DATA silently replaces the table, LOAD TABLE gives error. sql/slave.h: new argument to drop the table in fetch_master_table sql/sql_parse.cc: do not drop the table in LOAD TABLE FROM MASTER (this behaviour is already true; but changes in LOAD DATA FROM MASTER made the argument needed). --- mysql-test/r/rpl000009.result | 48 +++++++++++++++++++++++++++++++++++++ mysql-test/t/rpl000009.test | 56 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 101 insertions(+), 3 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result index 002f6843953..4a8057467f2 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl000009.result @@ -49,21 +49,48 @@ show databases; Database mysql test +create database foo; +create table foo.t1(n int, s char(20)); +insert into foo.t1 values (1, 'original foo.t1'); +create table foo.t3(n int, s char(20)); +insert into foo.t3 values (1, 'original foo.t3'); +create database foo2; +create table foo2.t1(n int, s char(20)); +insert into foo2.t1 values (1, 'original foo2.t1'); +create database bar; +create table bar.t1(n int, s char(20)); +insert into bar.t1 values (1, 'original bar.t1'); +create table bar.t3(n int, s char(20)); +insert into bar.t3 values (1, 'original bar.t3'); load data from master; show databases; Database bar foo +foo2 mysql test use foo; show tables; Tables_in_foo +t1 +t3 +select * from t1; +n s +1 original foo.t1 +use foo2; +show tables; +Tables_in_foo2 +t1 +select * from t1; +n s +1 original foo2.t1 use bar; show tables; Tables_in_bar t1 t2 +t3 select * from bar.t1; n s 1 one bar @@ -74,6 +101,9 @@ n s 11 eleven bar 12 twelve bar 13 thirteen bar +select * from bar.t3; +n s +1 original bar.t3 insert into bar.t1 values (4, 'four bar'); select * from bar.t1; n s @@ -81,5 +111,23 @@ n s 2 two bar 3 three bar 4 four bar +insert into bar.t1 values(10, 'should be there'); +flush tables; +load data from master; +Error on delete of './bar/t1.MYI' (Errcode: 13) +select * from bar.t1; +n s +1 one bar +2 two bar +3 three bar +4 four bar +10 should be there +load table bar.t1 from master; +Table 't1' already exists +drop table bar.t1; +load table bar.t1 from master; +start slave; drop database bar; drop database foo; +drop database foo; +drop database foo2; diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 5f55355271a..975cfbf9a65 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -60,16 +60,45 @@ sync_with_master; # This should show that the slave is empty at this point show databases; +# Create foo and foo2 on slave; we expect that LOAD DATA FROM MASTER will +# neither touch database foo nor foo2. +create database foo; +create table foo.t1(n int, s char(20)); +insert into foo.t1 values (1, 'original foo.t1'); +create table foo.t3(n int, s char(20)); +insert into foo.t3 values (1, 'original foo.t3'); +create database foo2; +create table foo2.t1(n int, s char(20)); +insert into foo2.t1 values (1, 'original foo2.t1'); +# Create bar, and bar.t1, to check that it gets replaced, +# and bar.t3 to check that it is not touched (there is no bar.t3 on master) +create database bar; +create table bar.t1(n int, s char(20)); +insert into bar.t1 values (1, 'original bar.t1'); +create table bar.t3(n int, s char(20)); +insert into bar.t3 values (1, 'original bar.t3'); + load data from master; # Now let's check if we have the right tables and the right data in them show databases; use foo; -show tables; +# LOAD DATA FROM MASTER uses only replicate_*_db rules to decide which databases +# have to be copied. So it thinks "foo" has to be copied. Before 4.0.16 it would +# first drop "foo", then create "foo". This "drop" is a bug; in that case t3 +# would disappear. +# So here the effect of this bug (BUG#1248) would be to leave an empty "foo" on +# the slave. +show tables; # should be t1 & t3 +select * from t1; # should be slave's original +use foo2; +show tables; # should be t1 +select * from t1; # should be slave's original use bar; -show tables; +show tables; # should contain master's copied t1&t2, slave's original t3 select * from bar.t1; select * from bar.t2; +select * from bar.t3; # Now let's see if replication works connection master; @@ -79,6 +108,26 @@ connection slave; sync_with_master; select * from bar.t1; +# Check that LOAD DATA FROM MASTER reports the error if it can't drop a +# table to be overwritten. +insert into bar.t1 values(10, 'should be there'); +flush tables; +system chmod 500 var/slave-data/bar/; +--error 6 +load data from master; # should fail (errno 13) +system chmod 700 var/slave-data/bar/; +select * from bar.t1; # should contain the row (10, ...) + + +# Check that LOAD TABLE FROM MASTER fails if the table exists on slave +--error 1050 +load table bar.t1 from master; +drop table bar.t1; +load table bar.t1 from master; + +# as LOAD DATA FROM MASTER failed it did not restart slave threads +start slave; + # Now time for cleanup connection master; drop database bar; @@ -86,4 +135,5 @@ drop database foo; save_master_pos; connection slave; sync_with_master; - +drop database foo; +drop database foo2; -- cgit v1.2.1 From db03c7e89f6ff78f04bbab2fdc3b136525fdb8e3 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 15 Sep 2003 22:21:39 +0400 Subject: Fixed bug in the optimiser for FULL TABLE SCAN case: to estimate correctly cost of full table scan we should take into account rows read and skipped on each iteration. mysql-test/r/distinct.result: Fixed test suite: now full scan is used less often mysql-test/r/join_outer.result: Fixed test suite: now full scan is used less often mysql-test/r/select_safe.result: Fixed test suite: now full scan is used less often --- mysql-test/r/distinct.result | 6 +++--- mysql-test/r/join_outer.result | 2 +- mysql-test/r/select_safe.result | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 1dbccb65748..da0c6a5eb72 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -173,9 +173,9 @@ INSERT INTO t2 values (1),(2),(3); INSERT INTO t3 VALUES (1,'1'),(2,'2'),(1,'1'),(2,'2'); explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; table type possible_keys key key_len ref rows Extra -t3 index a a 5 NULL 6 Using index; Using temporary -t2 index a a 4 NULL 5 Using index; Distinct -t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 Using where; Distinct +t2 index a a 4 NULL 5 Using index; Using temporary +t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 +t3 index a a 5 NULL 5 Using where; Using index SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; a 1 diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index 8f3f82201c3..debec01fbdc 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -615,7 +615,7 @@ INSERT INTO t2 VALUES (1,1); explain SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 2 -t2 index id id 8 NULL 1 Using where; Using index; Not exists +t2 ref id id 4 t1.id 1 Using where; Using index; Not exists SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; id name id idx 2 no NULL NULL diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result index c4e5984d360..1ee1368d029 100644 --- a/mysql-test/r/select_safe.result +++ b/mysql-test/r/select_safe.result @@ -70,7 +70,7 @@ insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(nu explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; table type possible_keys key key_len ref rows Extra t1 ALL b NULL NULL NULL 21 -t2 ALL b NULL NULL NULL 16 Using where +t2 ref b b 21 t1.b 6 Using where set MAX_SEEKS_FOR_KEY=1; explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; table type possible_keys key key_len ref rows Extra -- cgit v1.2.1 From cac860c793c8c7b8dafc509dfe0e63bf88a9f9f8 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 16 Sep 2003 20:28:29 +0400 Subject: select.test cleanup mysql-test/r/select.result: unnecessary info removed from result mysql-test/t/select.test: unnecessary info don't get into result any more --- mysql-test/r/select.result | 1221 -------------------------------------------- mysql-test/t/select.test | 6 + 2 files changed, 6 insertions(+), 1221 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index bde527b9b44..09a4ffdb88b 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -25,1205 +25,6 @@ UNIQUE fld1 (fld1), KEY fld3 (fld3), PRIMARY KEY (auto) ); -INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat',''); -INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); -INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); -INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily',''); -INSERT INTO t2 VALUES (5,011501,37,'bewilderingly','wallet','balled',''); -INSERT INTO t2 VALUES (6,011701,37,'astound','parters','persist','W'); -INSERT INTO t2 VALUES (7,011702,37,'admonishing','eschew','attainments',''); -INSERT INTO t2 VALUES (8,011703,37,'sumac','quitter','fanatic',''); -INSERT INTO t2 VALUES (9,012001,37,'flanking','neat','measures','FAS'); -INSERT INTO t2 VALUES (10,012003,37,'combed','Steinberg','rightfulness',''); -INSERT INTO t2 VALUES (11,012004,37,'subjective','jarring','capably',''); -INSERT INTO t2 VALUES (12,012005,37,'scatterbrain','tinily','impulsive',''); -INSERT INTO t2 VALUES (13,012301,37,'Eulerian','balled','starlet',''); -INSERT INTO t2 VALUES (14,012302,36,'dubbed','persist','terminators',''); -INSERT INTO t2 VALUES (15,012303,37,'Kane','attainments','untying',''); -INSERT INTO t2 VALUES (16,012304,37,'overlay','fanatic','announces','FAS'); -INSERT INTO t2 VALUES (17,012305,37,'perturb','measures','featherweight','FAS'); -INSERT INTO t2 VALUES (18,012306,37,'goblins','rightfulness','pessimist','FAS'); -INSERT INTO t2 VALUES (19,012501,37,'annihilates','capably','daughter',''); -INSERT INTO t2 VALUES (20,012602,37,'Wotan','impulsive','decliner','FAS'); -INSERT INTO t2 VALUES (21,012603,37,'snatching','starlet','lawgiver',''); -INSERT INTO t2 VALUES (22,012604,37,'concludes','terminators','stated',''); -INSERT INTO t2 VALUES (23,012605,37,'laterally','untying','readable',''); -INSERT INTO t2 VALUES (24,012606,37,'yelped','announces','attrition',''); -INSERT INTO t2 VALUES (25,012701,37,'grazing','featherweight','cascade','FAS'); -INSERT INTO t2 VALUES (26,012702,37,'Baird','pessimist','motors','FAS'); -INSERT INTO t2 VALUES (27,012703,37,'celery','daughter','interrogate',''); -INSERT INTO t2 VALUES (28,012704,37,'misunderstander','decliner','pests','W'); -INSERT INTO t2 VALUES (29,013601,37,'handgun','lawgiver','stairway',''); -INSERT INTO t2 VALUES (30,013602,37,'foldout','stated','dopers','FAS'); -INSERT INTO t2 VALUES (31,013603,37,'mystic','readable','testicle','W'); -INSERT INTO t2 VALUES (32,013604,37,'succumbed','attrition','Parsifal','W'); -INSERT INTO t2 VALUES (33,013605,37,'Nabisco','cascade','leavings',''); -INSERT INTO t2 VALUES (34,013606,37,'fingerings','motors','postulation','W'); -INSERT INTO t2 VALUES (35,013607,37,'aging','interrogate','squeaking',''); -INSERT INTO t2 VALUES (36,013608,37,'afield','pests','contrasted',''); -INSERT INTO t2 VALUES (37,013609,37,'ammonium','stairway','leftover',''); -INSERT INTO t2 VALUES (38,013610,37,'boat','dopers','whiteners',''); -INSERT INTO t2 VALUES (39,013801,37,'intelligibility','testicle','erases','W'); -INSERT INTO t2 VALUES (40,013802,37,'Augustine','Parsifal','Punjab','W'); -INSERT INTO t2 VALUES (41,013803,37,'teethe','leavings','Merritt',''); -INSERT INTO t2 VALUES (42,013804,37,'dreaded','postulation','Quixotism',''); -INSERT INTO t2 VALUES (43,013901,37,'scholastics','squeaking','sweetish','FAS'); -INSERT INTO t2 VALUES (44,016001,37,'audiology','contrasted','dogging','FAS'); -INSERT INTO t2 VALUES (45,016201,37,'wallet','leftover','scornfully','FAS'); -INSERT INTO t2 VALUES (46,016202,37,'parters','whiteners','bellow',''); -INSERT INTO t2 VALUES (47,016301,37,'eschew','erases','bills',''); -INSERT INTO t2 VALUES (48,016302,37,'quitter','Punjab','cupboard','FAS'); -INSERT INTO t2 VALUES (49,016303,37,'neat','Merritt','sureties','FAS'); -INSERT INTO t2 VALUES (50,016304,37,'Steinberg','Quixotism','puddings',''); -INSERT INTO t2 VALUES (51,018001,37,'jarring','sweetish','tapestry',''); -INSERT INTO t2 VALUES (52,018002,37,'tinily','dogging','fetters',''); -INSERT INTO t2 VALUES (53,018003,37,'balled','scornfully','bivalves',''); -INSERT INTO t2 VALUES (54,018004,37,'persist','bellow','incurring',''); -INSERT INTO t2 VALUES (55,018005,37,'attainments','bills','Adolph',''); -INSERT INTO t2 VALUES (56,018007,37,'fanatic','cupboard','pithed',''); -INSERT INTO t2 VALUES (57,018008,37,'measures','sureties','emergency',''); -INSERT INTO t2 VALUES (58,018009,37,'rightfulness','puddings','Miles',''); -INSERT INTO t2 VALUES (59,018010,37,'capably','tapestry','trimmings',''); -INSERT INTO t2 VALUES (60,018012,37,'impulsive','fetters','tragedies','W'); -INSERT INTO t2 VALUES (61,018013,37,'starlet','bivalves','skulking','W'); -INSERT INTO t2 VALUES (62,018014,37,'terminators','incurring','flint',''); -INSERT INTO t2 VALUES (63,018015,37,'untying','Adolph','flopping','W'); -INSERT INTO t2 VALUES (64,018016,37,'announces','pithed','relaxing','FAS'); -INSERT INTO t2 VALUES (65,018017,37,'featherweight','emergency','offload','FAS'); -INSERT INTO t2 VALUES (66,018018,37,'pessimist','Miles','suites','W'); -INSERT INTO t2 VALUES (67,018019,37,'daughter','trimmings','lists','FAS'); -INSERT INTO t2 VALUES (68,018020,37,'decliner','tragedies','animized','FAS'); -INSERT INTO t2 VALUES (69,018021,37,'lawgiver','skulking','multilayer','W'); -INSERT INTO t2 VALUES (70,018022,37,'stated','flint','standardizes','FAS'); -INSERT INTO t2 VALUES (71,018023,37,'readable','flopping','Judas',''); -INSERT INTO t2 VALUES (72,018024,37,'attrition','relaxing','vacuuming','W'); -INSERT INTO t2 VALUES (73,018025,37,'cascade','offload','dentally','W'); -INSERT INTO t2 VALUES (74,018026,37,'motors','suites','humanness','W'); -INSERT INTO t2 VALUES (75,018027,37,'interrogate','lists','inch','W'); -INSERT INTO t2 VALUES (76,018028,37,'pests','animized','Weissmuller','W'); -INSERT INTO t2 VALUES (77,018029,37,'stairway','multilayer','irresponsibly','W'); -INSERT INTO t2 VALUES (78,018030,37,'dopers','standardizes','luckily','FAS'); -INSERT INTO t2 VALUES (79,018032,37,'testicle','Judas','culled','W'); -INSERT INTO t2 VALUES (80,018033,37,'Parsifal','vacuuming','medical','FAS'); -INSERT INTO t2 VALUES (81,018034,37,'leavings','dentally','bloodbath','FAS'); -INSERT INTO t2 VALUES (82,018035,37,'postulation','humanness','subschema','W'); -INSERT INTO t2 VALUES (83,018036,37,'squeaking','inch','animals','W'); -INSERT INTO t2 VALUES (84,018037,37,'contrasted','Weissmuller','Micronesia',''); -INSERT INTO t2 VALUES (85,018038,37,'leftover','irresponsibly','repetitions',''); -INSERT INTO t2 VALUES (86,018039,37,'whiteners','luckily','Antares',''); -INSERT INTO t2 VALUES (87,018040,37,'erases','culled','ventilate','W'); -INSERT INTO t2 VALUES (88,018041,37,'Punjab','medical','pityingly',''); -INSERT INTO t2 VALUES (89,018042,37,'Merritt','bloodbath','interdependent',''); -INSERT INTO t2 VALUES (90,018043,37,'Quixotism','subschema','Graves','FAS'); -INSERT INTO t2 VALUES (91,018044,37,'sweetish','animals','neonatal',''); -INSERT INTO t2 VALUES (92,018045,37,'dogging','Micronesia','scribbled','FAS'); -INSERT INTO t2 VALUES (93,018046,37,'scornfully','repetitions','chafe','W'); -INSERT INTO t2 VALUES (94,018048,37,'bellow','Antares','honoring',''); -INSERT INTO t2 VALUES (95,018049,37,'bills','ventilate','realtor',''); -INSERT INTO t2 VALUES (96,018050,37,'cupboard','pityingly','elite',''); -INSERT INTO t2 VALUES (97,018051,37,'sureties','interdependent','funereal',''); -INSERT INTO t2 VALUES (98,018052,37,'puddings','Graves','abrogating',''); -INSERT INTO t2 VALUES (99,018053,50,'tapestry','neonatal','sorters',''); -INSERT INTO t2 VALUES (100,018054,37,'fetters','scribbled','Conley',''); -INSERT INTO t2 VALUES (101,018055,37,'bivalves','chafe','lectured',''); -INSERT INTO t2 VALUES (102,018056,37,'incurring','honoring','Abraham',''); -INSERT INTO t2 VALUES (103,018057,37,'Adolph','realtor','Hawaii','W'); -INSERT INTO t2 VALUES (104,018058,37,'pithed','elite','cage',''); -INSERT INTO t2 VALUES (105,018059,36,'emergency','funereal','hushes',''); -INSERT INTO t2 VALUES (106,018060,37,'Miles','abrogating','Simla',''); -INSERT INTO t2 VALUES (107,018061,37,'trimmings','sorters','reporters',''); -INSERT INTO t2 VALUES (108,018101,37,'tragedies','Conley','Dutchman','FAS'); -INSERT INTO t2 VALUES (109,018102,37,'skulking','lectured','descendants','FAS'); -INSERT INTO t2 VALUES (110,018103,37,'flint','Abraham','groupings','FAS'); -INSERT INTO t2 VALUES (111,018104,37,'flopping','Hawaii','dissociate',''); -INSERT INTO t2 VALUES (112,018201,37,'relaxing','cage','coexist','W'); -INSERT INTO t2 VALUES (113,018202,37,'offload','hushes','Beebe',''); -INSERT INTO t2 VALUES (114,018402,37,'suites','Simla','Taoism',''); -INSERT INTO t2 VALUES (115,018403,37,'lists','reporters','Connally',''); -INSERT INTO t2 VALUES (116,018404,37,'animized','Dutchman','fetched','FAS'); -INSERT INTO t2 VALUES (117,018405,37,'multilayer','descendants','checkpoints','FAS'); -INSERT INTO t2 VALUES (118,018406,37,'standardizes','groupings','rusting',''); -INSERT INTO t2 VALUES (119,018409,37,'Judas','dissociate','galling',''); -INSERT INTO t2 VALUES (120,018601,37,'vacuuming','coexist','obliterates',''); -INSERT INTO t2 VALUES (121,018602,37,'dentally','Beebe','traitor',''); -INSERT INTO t2 VALUES (122,018603,37,'humanness','Taoism','resumes','FAS'); -INSERT INTO t2 VALUES (123,018801,37,'inch','Connally','analyzable','FAS'); -INSERT INTO t2 VALUES (124,018802,37,'Weissmuller','fetched','terminator','FAS'); -INSERT INTO t2 VALUES (125,018803,37,'irresponsibly','checkpoints','gritty','FAS'); -INSERT INTO t2 VALUES (126,018804,37,'luckily','rusting','firearm','W'); -INSERT INTO t2 VALUES (127,018805,37,'culled','galling','minima',''); -INSERT INTO t2 VALUES (128,018806,37,'medical','obliterates','Selfridge',''); -INSERT INTO t2 VALUES (129,018807,37,'bloodbath','traitor','disable',''); -INSERT INTO t2 VALUES (130,018808,37,'subschema','resumes','witchcraft','W'); -INSERT INTO t2 VALUES (131,018809,37,'animals','analyzable','betroth','W'); -INSERT INTO t2 VALUES (132,018810,37,'Micronesia','terminator','Manhattanize',''); -INSERT INTO t2 VALUES (133,018811,37,'repetitions','gritty','imprint',''); -INSERT INTO t2 VALUES (134,018812,37,'Antares','firearm','peeked',''); -INSERT INTO t2 VALUES (135,019101,37,'ventilate','minima','swelling',''); -INSERT INTO t2 VALUES (136,019102,37,'pityingly','Selfridge','interrelationships','W'); -INSERT INTO t2 VALUES (137,019103,37,'interdependent','disable','riser',''); -INSERT INTO t2 VALUES (138,019201,37,'Graves','witchcraft','Gandhian','W'); -INSERT INTO t2 VALUES (139,030501,37,'neonatal','betroth','peacock','A'); -INSERT INTO t2 VALUES (140,030502,50,'scribbled','Manhattanize','bee','A'); -INSERT INTO t2 VALUES (141,030503,37,'chafe','imprint','kanji',''); -INSERT INTO t2 VALUES (142,030504,37,'honoring','peeked','dental',''); -INSERT INTO t2 VALUES (143,031901,37,'realtor','swelling','scarf','FAS'); -INSERT INTO t2 VALUES (144,036001,37,'elite','interrelationships','chasm','A'); -INSERT INTO t2 VALUES (145,036002,37,'funereal','riser','insolence','A'); -INSERT INTO t2 VALUES (146,036004,37,'abrogating','Gandhian','syndicate',''); -INSERT INTO t2 VALUES (147,036005,37,'sorters','peacock','alike',''); -INSERT INTO t2 VALUES (148,038001,37,'Conley','bee','imperial','A'); -INSERT INTO t2 VALUES (149,038002,37,'lectured','kanji','convulsion','A'); -INSERT INTO t2 VALUES (150,038003,37,'Abraham','dental','railway','A'); -INSERT INTO t2 VALUES (151,038004,37,'Hawaii','scarf','validate','A'); -INSERT INTO t2 VALUES (152,038005,37,'cage','chasm','normalizes','A'); -INSERT INTO t2 VALUES (153,038006,37,'hushes','insolence','comprehensive',''); -INSERT INTO t2 VALUES (154,038007,37,'Simla','syndicate','chewing',''); -INSERT INTO t2 VALUES (155,038008,37,'reporters','alike','denizen',''); -INSERT INTO t2 VALUES (156,038009,37,'Dutchman','imperial','schemer',''); -INSERT INTO t2 VALUES (157,038010,37,'descendants','convulsion','chronicle',''); -INSERT INTO t2 VALUES (158,038011,37,'groupings','railway','Kline',''); -INSERT INTO t2 VALUES (159,038012,37,'dissociate','validate','Anatole',''); -INSERT INTO t2 VALUES (160,038013,37,'coexist','normalizes','partridges',''); -INSERT INTO t2 VALUES (161,038014,37,'Beebe','comprehensive','brunch',''); -INSERT INTO t2 VALUES (162,038015,37,'Taoism','chewing','recruited',''); -INSERT INTO t2 VALUES (163,038016,37,'Connally','denizen','dimensions','W'); -INSERT INTO t2 VALUES (164,038017,37,'fetched','schemer','Chicana','W'); -INSERT INTO t2 VALUES (165,038018,37,'checkpoints','chronicle','announced',''); -INSERT INTO t2 VALUES (166,038101,37,'rusting','Kline','praised','FAS'); -INSERT INTO t2 VALUES (167,038102,37,'galling','Anatole','employing',''); -INSERT INTO t2 VALUES (168,038103,37,'obliterates','partridges','linear',''); -INSERT INTO t2 VALUES (169,038104,37,'traitor','brunch','quagmire',''); -INSERT INTO t2 VALUES (170,038201,37,'resumes','recruited','western','A'); -INSERT INTO t2 VALUES (171,038202,37,'analyzable','dimensions','relishing',''); -INSERT INTO t2 VALUES (172,038203,37,'terminator','Chicana','serving','A'); -INSERT INTO t2 VALUES (173,038204,37,'gritty','announced','scheduling',''); -INSERT INTO t2 VALUES (174,038205,37,'firearm','praised','lore',''); -INSERT INTO t2 VALUES (175,038206,37,'minima','employing','eventful',''); -INSERT INTO t2 VALUES (176,038208,37,'Selfridge','linear','arteriole','A'); -INSERT INTO t2 VALUES (177,042801,37,'disable','quagmire','disentangle',''); -INSERT INTO t2 VALUES (178,042802,37,'witchcraft','western','cured','A'); -INSERT INTO t2 VALUES (179,046101,37,'betroth','relishing','Fenton','W'); -INSERT INTO t2 VALUES (180,048001,37,'Manhattanize','serving','avoidable','A'); -INSERT INTO t2 VALUES (181,048002,37,'imprint','scheduling','drains','A'); -INSERT INTO t2 VALUES (182,048003,37,'peeked','lore','detectably','FAS'); -INSERT INTO t2 VALUES (183,048004,37,'swelling','eventful','husky',''); -INSERT INTO t2 VALUES (184,048005,37,'interrelationships','arteriole','impelling',''); -INSERT INTO t2 VALUES (185,048006,37,'riser','disentangle','undoes',''); -INSERT INTO t2 VALUES (186,048007,37,'Gandhian','cured','evened',''); -INSERT INTO t2 VALUES (187,048008,37,'peacock','Fenton','squeezes',''); -INSERT INTO t2 VALUES (188,048101,37,'bee','avoidable','destroyer','FAS'); -INSERT INTO t2 VALUES (189,048102,37,'kanji','drains','rudeness',''); -INSERT INTO t2 VALUES (190,048201,37,'dental','detectably','beaner','FAS'); -INSERT INTO t2 VALUES (191,048202,37,'scarf','husky','boorish',''); -INSERT INTO t2 VALUES (192,048203,37,'chasm','impelling','Everhart',''); -INSERT INTO t2 VALUES (193,048204,37,'insolence','undoes','encompass','A'); -INSERT INTO t2 VALUES (194,048205,37,'syndicate','evened','mushrooms',''); -INSERT INTO t2 VALUES (195,048301,37,'alike','squeezes','Alison','A'); -INSERT INTO t2 VALUES (196,048302,37,'imperial','destroyer','externally','FAS'); -INSERT INTO t2 VALUES (197,048303,37,'convulsion','rudeness','pellagra',''); -INSERT INTO t2 VALUES (198,048304,37,'railway','beaner','cult',''); -INSERT INTO t2 VALUES (199,048305,37,'validate','boorish','creek','A'); -INSERT INTO t2 VALUES (200,048401,37,'normalizes','Everhart','Huffman',''); -INSERT INTO t2 VALUES (201,048402,37,'comprehensive','encompass','Majorca','FAS'); -INSERT INTO t2 VALUES (202,048403,37,'chewing','mushrooms','governing','A'); -INSERT INTO t2 VALUES (203,048404,37,'denizen','Alison','gadfly','FAS'); -INSERT INTO t2 VALUES (204,048405,37,'schemer','externally','reassigned','FAS'); -INSERT INTO t2 VALUES (205,048406,37,'chronicle','pellagra','intentness','W'); -INSERT INTO t2 VALUES (206,048407,37,'Kline','cult','craziness',''); -INSERT INTO t2 VALUES (207,048408,37,'Anatole','creek','psychic',''); -INSERT INTO t2 VALUES (208,048409,37,'partridges','Huffman','squabbled',''); -INSERT INTO t2 VALUES (209,048410,37,'brunch','Majorca','burlesque',''); -INSERT INTO t2 VALUES (210,048411,37,'recruited','governing','capped',''); -INSERT INTO t2 VALUES (211,048412,37,'dimensions','gadfly','extracted','A'); -INSERT INTO t2 VALUES (212,048413,37,'Chicana','reassigned','DiMaggio',''); -INSERT INTO t2 VALUES (213,048601,37,'announced','intentness','exclamation','FAS'); -INSERT INTO t2 VALUES (214,048602,37,'praised','craziness','subdirectory',''); -INSERT INTO t2 VALUES (215,048603,37,'employing','psychic','fangs',''); -INSERT INTO t2 VALUES (216,048604,37,'linear','squabbled','buyer','A'); -INSERT INTO t2 VALUES (217,048801,37,'quagmire','burlesque','pithing','A'); -INSERT INTO t2 VALUES (218,050901,37,'western','capped','transistorizing','A'); -INSERT INTO t2 VALUES (219,051201,37,'relishing','extracted','nonbiodegradable',''); -INSERT INTO t2 VALUES (220,056002,37,'serving','DiMaggio','dislocate',''); -INSERT INTO t2 VALUES (221,056003,37,'scheduling','exclamation','monochromatic','FAS'); -INSERT INTO t2 VALUES (222,056004,37,'lore','subdirectory','batting',''); -INSERT INTO t2 VALUES (223,056102,37,'eventful','fangs','postcondition','A'); -INSERT INTO t2 VALUES (224,056203,37,'arteriole','buyer','catalog','FAS'); -INSERT INTO t2 VALUES (225,056204,37,'disentangle','pithing','Remus',''); -INSERT INTO t2 VALUES (226,058003,37,'cured','transistorizing','devices','A'); -INSERT INTO t2 VALUES (227,058004,37,'Fenton','nonbiodegradable','bike','A'); -INSERT INTO t2 VALUES (228,058005,37,'avoidable','dislocate','qualify',''); -INSERT INTO t2 VALUES (229,058006,37,'drains','monochromatic','detained',''); -INSERT INTO t2 VALUES (230,058007,37,'detectably','batting','commended',''); -INSERT INTO t2 VALUES (231,058101,37,'husky','postcondition','civilize',''); -INSERT INTO t2 VALUES (232,058102,37,'impelling','catalog','Elmhurst',''); -INSERT INTO t2 VALUES (233,058103,37,'undoes','Remus','anesthetizing',''); -INSERT INTO t2 VALUES (234,058105,37,'evened','devices','deaf',''); -INSERT INTO t2 VALUES (235,058111,37,'squeezes','bike','Brigham',''); -INSERT INTO t2 VALUES (236,058112,37,'destroyer','qualify','title',''); -INSERT INTO t2 VALUES (237,058113,37,'rudeness','detained','coarse',''); -INSERT INTO t2 VALUES (238,058114,37,'beaner','commended','combinations',''); -INSERT INTO t2 VALUES (239,058115,37,'boorish','civilize','grayness',''); -INSERT INTO t2 VALUES (240,058116,37,'Everhart','Elmhurst','innumerable','FAS'); -INSERT INTO t2 VALUES (241,058117,37,'encompass','anesthetizing','Caroline','A'); -INSERT INTO t2 VALUES (242,058118,37,'mushrooms','deaf','fatty','FAS'); -INSERT INTO t2 VALUES (243,058119,37,'Alison','Brigham','eastbound',''); -INSERT INTO t2 VALUES (244,058120,37,'externally','title','inexperienced',''); -INSERT INTO t2 VALUES (245,058121,37,'pellagra','coarse','hoarder','A'); -INSERT INTO t2 VALUES (246,058122,37,'cult','combinations','scotch','W'); -INSERT INTO t2 VALUES (247,058123,37,'creek','grayness','passport','A'); -INSERT INTO t2 VALUES (248,058124,37,'Huffman','innumerable','strategic','FAS'); -INSERT INTO t2 VALUES (249,058125,37,'Majorca','Caroline','gated',''); -INSERT INTO t2 VALUES (250,058126,37,'governing','fatty','flog',''); -INSERT INTO t2 VALUES (251,058127,37,'gadfly','eastbound','Pipestone',''); -INSERT INTO t2 VALUES (252,058128,37,'reassigned','inexperienced','Dar',''); -INSERT INTO t2 VALUES (253,058201,37,'intentness','hoarder','Corcoran',''); -INSERT INTO t2 VALUES (254,058202,37,'craziness','scotch','flyers','A'); -INSERT INTO t2 VALUES (255,058303,37,'psychic','passport','competitions','W'); -INSERT INTO t2 VALUES (256,058304,37,'squabbled','strategic','suppliers','FAS'); -INSERT INTO t2 VALUES (257,058602,37,'burlesque','gated','skips',''); -INSERT INTO t2 VALUES (258,058603,37,'capped','flog','institutes',''); -INSERT INTO t2 VALUES (259,058604,37,'extracted','Pipestone','troop','A'); -INSERT INTO t2 VALUES (260,058605,37,'DiMaggio','Dar','connective','W'); -INSERT INTO t2 VALUES (261,058606,37,'exclamation','Corcoran','denies',''); -INSERT INTO t2 VALUES (262,058607,37,'subdirectory','flyers','polka',''); -INSERT INTO t2 VALUES (263,060401,36,'fangs','competitions','observations','FAS'); -INSERT INTO t2 VALUES (264,061701,36,'buyer','suppliers','askers',''); -INSERT INTO t2 VALUES (265,066201,36,'pithing','skips','homeless','FAS'); -INSERT INTO t2 VALUES (266,066501,36,'transistorizing','institutes','Anna',''); -INSERT INTO t2 VALUES (267,068001,36,'nonbiodegradable','troop','subdirectories','W'); -INSERT INTO t2 VALUES (268,068002,36,'dislocate','connective','decaying','FAS'); -INSERT INTO t2 VALUES (269,068005,36,'monochromatic','denies','outwitting','W'); -INSERT INTO t2 VALUES (270,068006,36,'batting','polka','Harpy','W'); -INSERT INTO t2 VALUES (271,068007,36,'postcondition','observations','crazed',''); -INSERT INTO t2 VALUES (272,068008,36,'catalog','askers','suffocate',''); -INSERT INTO t2 VALUES (273,068009,36,'Remus','homeless','provers','FAS'); -INSERT INTO t2 VALUES (274,068010,36,'devices','Anna','technically',''); -INSERT INTO t2 VALUES (275,068011,36,'bike','subdirectories','Franklinizations',''); -INSERT INTO t2 VALUES (276,068202,36,'qualify','decaying','considered',''); -INSERT INTO t2 VALUES (277,068302,36,'detained','outwitting','tinnily',''); -INSERT INTO t2 VALUES (278,068303,36,'commended','Harpy','uninterruptedly',''); -INSERT INTO t2 VALUES (279,068401,36,'civilize','crazed','whistled','A'); -INSERT INTO t2 VALUES (280,068501,36,'Elmhurst','suffocate','automate',''); -INSERT INTO t2 VALUES (281,068502,36,'anesthetizing','provers','gutting','W'); -INSERT INTO t2 VALUES (282,068503,36,'deaf','technically','surreptitious',''); -INSERT INTO t2 VALUES (283,068602,36,'Brigham','Franklinizations','Choctaw',''); -INSERT INTO t2 VALUES (284,068603,36,'title','considered','cooks',''); -INSERT INTO t2 VALUES (285,068701,36,'coarse','tinnily','millivolt','FAS'); -INSERT INTO t2 VALUES (286,068702,36,'combinations','uninterruptedly','counterpoise',''); -INSERT INTO t2 VALUES (287,068703,36,'grayness','whistled','Gothicism',''); -INSERT INTO t2 VALUES (288,076001,36,'innumerable','automate','feminine',''); -INSERT INTO t2 VALUES (289,076002,36,'Caroline','gutting','metaphysically','W'); -INSERT INTO t2 VALUES (290,076101,36,'fatty','surreptitious','sanding','A'); -INSERT INTO t2 VALUES (291,076102,36,'eastbound','Choctaw','contributorily',''); -INSERT INTO t2 VALUES (292,076103,36,'inexperienced','cooks','receivers','FAS'); -INSERT INTO t2 VALUES (293,076302,36,'hoarder','millivolt','adjourn',''); -INSERT INTO t2 VALUES (294,076303,36,'scotch','counterpoise','straggled','A'); -INSERT INTO t2 VALUES (295,076304,36,'passport','Gothicism','druggists',''); -INSERT INTO t2 VALUES (296,076305,36,'strategic','feminine','thanking','FAS'); -INSERT INTO t2 VALUES (297,076306,36,'gated','metaphysically','ostrich',''); -INSERT INTO t2 VALUES (298,076307,36,'flog','sanding','hopelessness','FAS'); -INSERT INTO t2 VALUES (299,076402,36,'Pipestone','contributorily','Eurydice',''); -INSERT INTO t2 VALUES (300,076501,36,'Dar','receivers','excitation','W'); -INSERT INTO t2 VALUES (301,076502,36,'Corcoran','adjourn','presumes','FAS'); -INSERT INTO t2 VALUES (302,076701,36,'flyers','straggled','imaginable','FAS'); -INSERT INTO t2 VALUES (303,078001,36,'competitions','druggists','concoct','W'); -INSERT INTO t2 VALUES (304,078002,36,'suppliers','thanking','peering','W'); -INSERT INTO t2 VALUES (305,078003,36,'skips','ostrich','Phelps','FAS'); -INSERT INTO t2 VALUES (306,078004,36,'institutes','hopelessness','ferociousness','FAS'); -INSERT INTO t2 VALUES (307,078005,36,'troop','Eurydice','sentences',''); -INSERT INTO t2 VALUES (308,078006,36,'connective','excitation','unlocks',''); -INSERT INTO t2 VALUES (309,078007,36,'denies','presumes','engrossing','W'); -INSERT INTO t2 VALUES (310,078008,36,'polka','imaginable','Ruth',''); -INSERT INTO t2 VALUES (311,078101,36,'observations','concoct','tying',''); -INSERT INTO t2 VALUES (312,078103,36,'askers','peering','exclaimers',''); -INSERT INTO t2 VALUES (313,078104,36,'homeless','Phelps','synergy',''); -INSERT INTO t2 VALUES (314,078105,36,'Anna','ferociousness','Huey','W'); -INSERT INTO t2 VALUES (315,082101,36,'subdirectories','sentences','merging',''); -INSERT INTO t2 VALUES (316,083401,36,'decaying','unlocks','judges','A'); -INSERT INTO t2 VALUES (317,084001,36,'outwitting','engrossing','Shylock','W'); -INSERT INTO t2 VALUES (318,084002,36,'Harpy','Ruth','Miltonism',''); -INSERT INTO t2 VALUES (319,086001,36,'crazed','tying','hen','W'); -INSERT INTO t2 VALUES (320,086102,36,'suffocate','exclaimers','honeybee','FAS'); -INSERT INTO t2 VALUES (321,086201,36,'provers','synergy','towers',''); -INSERT INTO t2 VALUES (322,088001,36,'technically','Huey','dilutes','W'); -INSERT INTO t2 VALUES (323,088002,36,'Franklinizations','merging','numerals','FAS'); -INSERT INTO t2 VALUES (324,088003,36,'considered','judges','democracy','FAS'); -INSERT INTO t2 VALUES (325,088004,36,'tinnily','Shylock','Ibero-',''); -INSERT INTO t2 VALUES (326,088101,36,'uninterruptedly','Miltonism','invalids',''); -INSERT INTO t2 VALUES (327,088102,36,'whistled','hen','behavior',''); -INSERT INTO t2 VALUES (328,088103,36,'automate','honeybee','accruing',''); -INSERT INTO t2 VALUES (329,088104,36,'gutting','towers','relics','A'); -INSERT INTO t2 VALUES (330,088105,36,'surreptitious','dilutes','rackets',''); -INSERT INTO t2 VALUES (331,088106,36,'Choctaw','numerals','Fischbein','W'); -INSERT INTO t2 VALUES (332,088201,36,'cooks','democracy','phony','W'); -INSERT INTO t2 VALUES (333,088203,36,'millivolt','Ibero-','cross','FAS'); -INSERT INTO t2 VALUES (334,088204,36,'counterpoise','invalids','cleanup',''); -INSERT INTO t2 VALUES (335,088302,37,'Gothicism','behavior','conspirator',''); -INSERT INTO t2 VALUES (336,088303,37,'feminine','accruing','label','FAS'); -INSERT INTO t2 VALUES (337,088305,37,'metaphysically','relics','university',''); -INSERT INTO t2 VALUES (338,088402,37,'sanding','rackets','cleansed','FAS'); -INSERT INTO t2 VALUES (339,088501,36,'contributorily','Fischbein','ballgown',''); -INSERT INTO t2 VALUES (340,088502,36,'receivers','phony','starlet',''); -INSERT INTO t2 VALUES (341,088503,36,'adjourn','cross','aqueous',''); -INSERT INTO t2 VALUES (342,098001,58,'straggled','cleanup','portrayal','A'); -INSERT INTO t2 VALUES (343,098002,58,'druggists','conspirator','despising','W'); -INSERT INTO t2 VALUES (344,098003,58,'thanking','label','distort','W'); -INSERT INTO t2 VALUES (345,098004,58,'ostrich','university','palmed',''); -INSERT INTO t2 VALUES (346,098005,58,'hopelessness','cleansed','faced',''); -INSERT INTO t2 VALUES (347,098006,58,'Eurydice','ballgown','silverware',''); -INSERT INTO t2 VALUES (348,141903,29,'excitation','starlet','assessor',''); -INSERT INTO t2 VALUES (349,098008,58,'presumes','aqueous','spiders',''); -INSERT INTO t2 VALUES (350,098009,58,'imaginable','portrayal','artificially',''); -INSERT INTO t2 VALUES (351,098010,58,'concoct','despising','reminiscence',''); -INSERT INTO t2 VALUES (352,098011,58,'peering','distort','Mexican',''); -INSERT INTO t2 VALUES (353,098012,58,'Phelps','palmed','obnoxious',''); -INSERT INTO t2 VALUES (354,098013,58,'ferociousness','faced','fragile',''); -INSERT INTO t2 VALUES (355,098014,58,'sentences','silverware','apprehensible',''); -INSERT INTO t2 VALUES (356,098015,58,'unlocks','assessor','births',''); -INSERT INTO t2 VALUES (357,098016,58,'engrossing','spiders','garages',''); -INSERT INTO t2 VALUES (358,098017,58,'Ruth','artificially','panty',''); -INSERT INTO t2 VALUES (359,098018,58,'tying','reminiscence','anteater',''); -INSERT INTO t2 VALUES (360,098019,58,'exclaimers','Mexican','displacement','A'); -INSERT INTO t2 VALUES (361,098020,58,'synergy','obnoxious','drovers','A'); -INSERT INTO t2 VALUES (362,098021,58,'Huey','fragile','patenting','A'); -INSERT INTO t2 VALUES (363,098022,58,'merging','apprehensible','far','A'); -INSERT INTO t2 VALUES (364,098023,58,'judges','births','shrieks',''); -INSERT INTO t2 VALUES (365,098024,58,'Shylock','garages','aligning','W'); -INSERT INTO t2 VALUES (366,098025,37,'Miltonism','panty','pragmatism',''); -INSERT INTO t2 VALUES (367,106001,36,'hen','anteater','fevers','W'); -INSERT INTO t2 VALUES (368,108001,36,'honeybee','displacement','reexamines','A'); -INSERT INTO t2 VALUES (369,108002,36,'towers','drovers','occupancies',''); -INSERT INTO t2 VALUES (370,108003,36,'dilutes','patenting','sweats','FAS'); -INSERT INTO t2 VALUES (371,108004,36,'numerals','far','modulators',''); -INSERT INTO t2 VALUES (372,108005,36,'democracy','shrieks','demand','W'); -INSERT INTO t2 VALUES (373,108007,36,'Ibero-','aligning','Madeira',''); -INSERT INTO t2 VALUES (374,108008,36,'invalids','pragmatism','Viennese','W'); -INSERT INTO t2 VALUES (375,108009,36,'behavior','fevers','chillier','W'); -INSERT INTO t2 VALUES (376,108010,36,'accruing','reexamines','wildcats','FAS'); -INSERT INTO t2 VALUES (377,108011,36,'relics','occupancies','gentle',''); -INSERT INTO t2 VALUES (378,108012,36,'rackets','sweats','Angles','W'); -INSERT INTO t2 VALUES (379,108101,36,'Fischbein','modulators','accuracies',''); -INSERT INTO t2 VALUES (380,108102,36,'phony','demand','toggle',''); -INSERT INTO t2 VALUES (381,108103,36,'cross','Madeira','Mendelssohn','W'); -INSERT INTO t2 VALUES (382,108111,50,'cleanup','Viennese','behaviorally',''); -INSERT INTO t2 VALUES (383,108105,36,'conspirator','chillier','Rochford',''); -INSERT INTO t2 VALUES (384,108106,36,'label','wildcats','mirror','W'); -INSERT INTO t2 VALUES (385,108107,36,'university','gentle','Modula',''); -INSERT INTO t2 VALUES (386,108108,50,'cleansed','Angles','clobbering',''); -INSERT INTO t2 VALUES (387,108109,36,'ballgown','accuracies','chronography',''); -INSERT INTO t2 VALUES (388,108110,36,'starlet','toggle','Eskimoizeds',''); -INSERT INTO t2 VALUES (389,108201,36,'aqueous','Mendelssohn','British','W'); -INSERT INTO t2 VALUES (390,108202,36,'portrayal','behaviorally','pitfalls',''); -INSERT INTO t2 VALUES (391,108203,36,'despising','Rochford','verify','W'); -INSERT INTO t2 VALUES (392,108204,36,'distort','mirror','scatter','FAS'); -INSERT INTO t2 VALUES (393,108205,36,'palmed','Modula','Aztecan',''); -INSERT INTO t2 VALUES (394,108301,36,'faced','clobbering','acuity','W'); -INSERT INTO t2 VALUES (395,108302,36,'silverware','chronography','sinking','W'); -INSERT INTO t2 VALUES (396,112101,36,'assessor','Eskimoizeds','beasts','FAS'); -INSERT INTO t2 VALUES (397,112102,36,'spiders','British','Witt','W'); -INSERT INTO t2 VALUES (398,113701,36,'artificially','pitfalls','physicists','FAS'); -INSERT INTO t2 VALUES (399,116001,36,'reminiscence','verify','folksong','A'); -INSERT INTO t2 VALUES (400,116201,36,'Mexican','scatter','strokes','FAS'); -INSERT INTO t2 VALUES (401,116301,36,'obnoxious','Aztecan','crowder',''); -INSERT INTO t2 VALUES (402,116302,36,'fragile','acuity','merry',''); -INSERT INTO t2 VALUES (403,116601,36,'apprehensible','sinking','cadenced',''); -INSERT INTO t2 VALUES (404,116602,36,'births','beasts','alimony','A'); -INSERT INTO t2 VALUES (405,116603,36,'garages','Witt','principled','A'); -INSERT INTO t2 VALUES (406,116701,36,'panty','physicists','golfing',''); -INSERT INTO t2 VALUES (407,116702,36,'anteater','folksong','undiscovered',''); -INSERT INTO t2 VALUES (408,118001,36,'displacement','strokes','irritates',''); -INSERT INTO t2 VALUES (409,118002,36,'drovers','crowder','patriots','A'); -INSERT INTO t2 VALUES (410,118003,36,'patenting','merry','rooms','FAS'); -INSERT INTO t2 VALUES (411,118004,36,'far','cadenced','towering','W'); -INSERT INTO t2 VALUES (412,118005,36,'shrieks','alimony','displease',''); -INSERT INTO t2 VALUES (413,118006,36,'aligning','principled','photosensitive',''); -INSERT INTO t2 VALUES (414,118007,36,'pragmatism','golfing','inking',''); -INSERT INTO t2 VALUES (415,118008,36,'fevers','undiscovered','gainers',''); -INSERT INTO t2 VALUES (416,118101,36,'reexamines','irritates','leaning','A'); -INSERT INTO t2 VALUES (417,118102,36,'occupancies','patriots','hydrant','A'); -INSERT INTO t2 VALUES (418,118103,36,'sweats','rooms','preserve',''); -INSERT INTO t2 VALUES (419,118202,36,'modulators','towering','blinded','A'); -INSERT INTO t2 VALUES (420,118203,36,'demand','displease','interactions','A'); -INSERT INTO t2 VALUES (421,118204,36,'Madeira','photosensitive','Barry',''); -INSERT INTO t2 VALUES (422,118302,36,'Viennese','inking','whiteness','A'); -INSERT INTO t2 VALUES (423,118304,36,'chillier','gainers','pastimes','W'); -INSERT INTO t2 VALUES (424,118305,36,'wildcats','leaning','Edenization',''); -INSERT INTO t2 VALUES (425,118306,36,'gentle','hydrant','Muscat',''); -INSERT INTO t2 VALUES (426,118307,36,'Angles','preserve','assassinated',''); -INSERT INTO t2 VALUES (427,123101,36,'accuracies','blinded','labeled',''); -INSERT INTO t2 VALUES (428,123102,36,'toggle','interactions','glacial','A'); -INSERT INTO t2 VALUES (429,123301,36,'Mendelssohn','Barry','implied','W'); -INSERT INTO t2 VALUES (430,126001,36,'behaviorally','whiteness','bibliographies','W'); -INSERT INTO t2 VALUES (431,126002,36,'Rochford','pastimes','Buchanan',''); -INSERT INTO t2 VALUES (432,126003,36,'mirror','Edenization','forgivably','FAS'); -INSERT INTO t2 VALUES (433,126101,36,'Modula','Muscat','innuendo','A'); -INSERT INTO t2 VALUES (434,126301,36,'clobbering','assassinated','den','FAS'); -INSERT INTO t2 VALUES (435,126302,36,'chronography','labeled','submarines','W'); -INSERT INTO t2 VALUES (436,126402,36,'Eskimoizeds','glacial','mouthful','A'); -INSERT INTO t2 VALUES (437,126601,36,'British','implied','expiring',''); -INSERT INTO t2 VALUES (438,126602,36,'pitfalls','bibliographies','unfulfilled','FAS'); -INSERT INTO t2 VALUES (439,126702,36,'verify','Buchanan','precession',''); -INSERT INTO t2 VALUES (440,128001,36,'scatter','forgivably','nullified',''); -INSERT INTO t2 VALUES (441,128002,36,'Aztecan','innuendo','affects',''); -INSERT INTO t2 VALUES (442,128003,36,'acuity','den','Cynthia',''); -INSERT INTO t2 VALUES (443,128004,36,'sinking','submarines','Chablis','A'); -INSERT INTO t2 VALUES (444,128005,36,'beasts','mouthful','betterments','FAS'); -INSERT INTO t2 VALUES (445,128007,36,'Witt','expiring','advertising',''); -INSERT INTO t2 VALUES (446,128008,36,'physicists','unfulfilled','rubies','A'); -INSERT INTO t2 VALUES (447,128009,36,'folksong','precession','southwest','FAS'); -INSERT INTO t2 VALUES (448,128010,36,'strokes','nullified','superstitious','A'); -INSERT INTO t2 VALUES (449,128011,36,'crowder','affects','tabernacle','W'); -INSERT INTO t2 VALUES (450,128012,36,'merry','Cynthia','silk','A'); -INSERT INTO t2 VALUES (451,128013,36,'cadenced','Chablis','handsomest','A'); -INSERT INTO t2 VALUES (452,128014,36,'alimony','betterments','Persian','A'); -INSERT INTO t2 VALUES (453,128015,36,'principled','advertising','analog','W'); -INSERT INTO t2 VALUES (454,128016,36,'golfing','rubies','complex','W'); -INSERT INTO t2 VALUES (455,128017,36,'undiscovered','southwest','Taoist',''); -INSERT INTO t2 VALUES (456,128018,36,'irritates','superstitious','suspend',''); -INSERT INTO t2 VALUES (457,128019,36,'patriots','tabernacle','relegated',''); -INSERT INTO t2 VALUES (458,128020,36,'rooms','silk','awesome','W'); -INSERT INTO t2 VALUES (459,128021,36,'towering','handsomest','Bruxelles',''); -INSERT INTO t2 VALUES (460,128022,36,'displease','Persian','imprecisely','A'); -INSERT INTO t2 VALUES (461,128023,36,'photosensitive','analog','televise',''); -INSERT INTO t2 VALUES (462,128101,36,'inking','complex','braking',''); -INSERT INTO t2 VALUES (463,128102,36,'gainers','Taoist','true','FAS'); -INSERT INTO t2 VALUES (464,128103,36,'leaning','suspend','disappointing','FAS'); -INSERT INTO t2 VALUES (465,128104,36,'hydrant','relegated','navally','W'); -INSERT INTO t2 VALUES (466,128106,36,'preserve','awesome','circus',''); -INSERT INTO t2 VALUES (467,128107,36,'blinded','Bruxelles','beetles',''); -INSERT INTO t2 VALUES (468,128108,36,'interactions','imprecisely','trumps',''); -INSERT INTO t2 VALUES (469,128202,36,'Barry','televise','fourscore','W'); -INSERT INTO t2 VALUES (470,128203,36,'whiteness','braking','Blackfoots',''); -INSERT INTO t2 VALUES (471,128301,36,'pastimes','true','Grady',''); -INSERT INTO t2 VALUES (472,128302,36,'Edenization','disappointing','quiets','FAS'); -INSERT INTO t2 VALUES (473,128303,36,'Muscat','navally','floundered','FAS'); -INSERT INTO t2 VALUES (474,128304,36,'assassinated','circus','profundity','W'); -INSERT INTO t2 VALUES (475,128305,36,'labeled','beetles','Garrisonian','W'); -INSERT INTO t2 VALUES (476,128307,36,'glacial','trumps','Strauss',''); -INSERT INTO t2 VALUES (477,128401,36,'implied','fourscore','cemented','FAS'); -INSERT INTO t2 VALUES (478,128502,36,'bibliographies','Blackfoots','contrition','A'); -INSERT INTO t2 VALUES (479,128503,36,'Buchanan','Grady','mutations',''); -INSERT INTO t2 VALUES (480,128504,36,'forgivably','quiets','exhibits','W'); -INSERT INTO t2 VALUES (481,128505,36,'innuendo','floundered','tits',''); -INSERT INTO t2 VALUES (482,128601,36,'den','profundity','mate','A'); -INSERT INTO t2 VALUES (483,128603,36,'submarines','Garrisonian','arches',''); -INSERT INTO t2 VALUES (484,128604,36,'mouthful','Strauss','Moll',''); -INSERT INTO t2 VALUES (485,128702,36,'expiring','cemented','ropers',''); -INSERT INTO t2 VALUES (486,128703,36,'unfulfilled','contrition','bombast',''); -INSERT INTO t2 VALUES (487,128704,36,'precession','mutations','difficultly','A'); -INSERT INTO t2 VALUES (488,138001,36,'nullified','exhibits','adsorption',''); -INSERT INTO t2 VALUES (489,138002,36,'affects','tits','definiteness','FAS'); -INSERT INTO t2 VALUES (490,138003,36,'Cynthia','mate','cultivation','A'); -INSERT INTO t2 VALUES (491,138004,36,'Chablis','arches','heals','A'); -INSERT INTO t2 VALUES (492,138005,36,'betterments','Moll','Heusen','W'); -INSERT INTO t2 VALUES (493,138006,36,'advertising','ropers','target','FAS'); -INSERT INTO t2 VALUES (494,138007,36,'rubies','bombast','cited','A'); -INSERT INTO t2 VALUES (495,138008,36,'southwest','difficultly','congresswoman','W'); -INSERT INTO t2 VALUES (496,138009,36,'superstitious','adsorption','Katherine',''); -INSERT INTO t2 VALUES (497,138102,36,'tabernacle','definiteness','titter','A'); -INSERT INTO t2 VALUES (498,138103,36,'silk','cultivation','aspire','A'); -INSERT INTO t2 VALUES (499,138104,36,'handsomest','heals','Mardis',''); -INSERT INTO t2 VALUES (500,138105,36,'Persian','Heusen','Nadia','W'); -INSERT INTO t2 VALUES (501,138201,36,'analog','target','estimating','FAS'); -INSERT INTO t2 VALUES (502,138302,36,'complex','cited','stuck','A'); -INSERT INTO t2 VALUES (503,138303,36,'Taoist','congresswoman','fifteenth','A'); -INSERT INTO t2 VALUES (504,138304,36,'suspend','Katherine','Colombo',''); -INSERT INTO t2 VALUES (505,138401,29,'relegated','titter','survey','A'); -INSERT INTO t2 VALUES (506,140102,29,'awesome','aspire','staffing',''); -INSERT INTO t2 VALUES (507,140103,29,'Bruxelles','Mardis','obtain',''); -INSERT INTO t2 VALUES (508,140104,29,'imprecisely','Nadia','loaded',''); -INSERT INTO t2 VALUES (509,140105,29,'televise','estimating','slaughtered',''); -INSERT INTO t2 VALUES (510,140201,29,'braking','stuck','lights','A'); -INSERT INTO t2 VALUES (511,140701,29,'true','fifteenth','circumference',''); -INSERT INTO t2 VALUES (512,141501,29,'disappointing','Colombo','dull','A'); -INSERT INTO t2 VALUES (513,141502,29,'navally','survey','weekly','A'); -INSERT INTO t2 VALUES (514,141901,29,'circus','staffing','wetness',''); -INSERT INTO t2 VALUES (515,141902,29,'beetles','obtain','visualized',''); -INSERT INTO t2 VALUES (516,142101,29,'trumps','loaded','Tannenbaum',''); -INSERT INTO t2 VALUES (517,142102,29,'fourscore','slaughtered','moribund',''); -INSERT INTO t2 VALUES (518,142103,29,'Blackfoots','lights','demultiplex',''); -INSERT INTO t2 VALUES (519,142701,29,'Grady','circumference','lockings',''); -INSERT INTO t2 VALUES (520,143001,29,'quiets','dull','thugs','FAS'); -INSERT INTO t2 VALUES (521,143501,29,'floundered','weekly','unnerves',''); -INSERT INTO t2 VALUES (522,143502,29,'profundity','wetness','abut',''); -INSERT INTO t2 VALUES (523,148001,29,'Garrisonian','visualized','Chippewa','A'); -INSERT INTO t2 VALUES (524,148002,29,'Strauss','Tannenbaum','stratifications','A'); -INSERT INTO t2 VALUES (525,148003,29,'cemented','moribund','signaled',''); -INSERT INTO t2 VALUES (526,148004,29,'contrition','demultiplex','Italianizes','A'); -INSERT INTO t2 VALUES (527,148005,29,'mutations','lockings','algorithmic','A'); -INSERT INTO t2 VALUES (528,148006,29,'exhibits','thugs','paranoid','FAS'); -INSERT INTO t2 VALUES (529,148007,29,'tits','unnerves','camping','A'); -INSERT INTO t2 VALUES (530,148009,29,'mate','abut','signifying','A'); -INSERT INTO t2 VALUES (531,148010,29,'arches','Chippewa','Patrice','W'); -INSERT INTO t2 VALUES (532,148011,29,'Moll','stratifications','search','A'); -INSERT INTO t2 VALUES (533,148012,29,'ropers','signaled','Angeles','A'); -INSERT INTO t2 VALUES (534,148013,29,'bombast','Italianizes','semblance',''); -INSERT INTO t2 VALUES (535,148023,36,'difficultly','algorithmic','taxed',''); -INSERT INTO t2 VALUES (536,148015,29,'adsorption','paranoid','Beatrice',''); -INSERT INTO t2 VALUES (537,148016,29,'definiteness','camping','retrace',''); -INSERT INTO t2 VALUES (538,148017,29,'cultivation','signifying','lockout',''); -INSERT INTO t2 VALUES (539,148018,29,'heals','Patrice','grammatic',''); -INSERT INTO t2 VALUES (540,148019,29,'Heusen','search','helmsman',''); -INSERT INTO t2 VALUES (541,148020,29,'target','Angeles','uniform','W'); -INSERT INTO t2 VALUES (542,148021,29,'cited','semblance','hamming',''); -INSERT INTO t2 VALUES (543,148022,29,'congresswoman','taxed','disobedience',''); -INSERT INTO t2 VALUES (544,148101,29,'Katherine','Beatrice','captivated','A'); -INSERT INTO t2 VALUES (545,148102,29,'titter','retrace','transferals','A'); -INSERT INTO t2 VALUES (546,148201,29,'aspire','lockout','cartographer','A'); -INSERT INTO t2 VALUES (547,148401,29,'Mardis','grammatic','aims','FAS'); -INSERT INTO t2 VALUES (548,148402,29,'Nadia','helmsman','Pakistani',''); -INSERT INTO t2 VALUES (549,148501,29,'estimating','uniform','burglarized','FAS'); -INSERT INTO t2 VALUES (550,148502,29,'stuck','hamming','saucepans','A'); -INSERT INTO t2 VALUES (551,148503,29,'fifteenth','disobedience','lacerating','A'); -INSERT INTO t2 VALUES (552,148504,29,'Colombo','captivated','corny',''); -INSERT INTO t2 VALUES (553,148601,29,'survey','transferals','megabytes','FAS'); -INSERT INTO t2 VALUES (554,148602,29,'staffing','cartographer','chancellor',''); -INSERT INTO t2 VALUES (555,150701,29,'obtain','aims','bulk','A'); -INSERT INTO t2 VALUES (556,152101,29,'loaded','Pakistani','commits','A'); -INSERT INTO t2 VALUES (557,152102,29,'slaughtered','burglarized','meson','W'); -INSERT INTO t2 VALUES (558,155202,36,'lights','saucepans','deputies',''); -INSERT INTO t2 VALUES (559,155203,29,'circumference','lacerating','northeaster','A'); -INSERT INTO t2 VALUES (560,155204,29,'dull','corny','dipole',''); -INSERT INTO t2 VALUES (561,155205,29,'weekly','megabytes','machining','0'); -INSERT INTO t2 VALUES (562,156001,29,'wetness','chancellor','therefore',''); -INSERT INTO t2 VALUES (563,156002,29,'visualized','bulk','Telefunken',''); -INSERT INTO t2 VALUES (564,156102,29,'Tannenbaum','commits','salvaging',''); -INSERT INTO t2 VALUES (565,156301,29,'moribund','meson','Corinthianizes','A'); -INSERT INTO t2 VALUES (566,156302,29,'demultiplex','deputies','restlessly','A'); -INSERT INTO t2 VALUES (567,156303,29,'lockings','northeaster','bromides',''); -INSERT INTO t2 VALUES (568,156304,29,'thugs','dipole','generalized','A'); -INSERT INTO t2 VALUES (569,156305,29,'unnerves','machining','mishaps',''); -INSERT INTO t2 VALUES (570,156306,29,'abut','therefore','quelling',''); -INSERT INTO t2 VALUES (571,156501,29,'Chippewa','Telefunken','spiritual','A'); -INSERT INTO t2 VALUES (572,158001,29,'stratifications','salvaging','beguiles','FAS'); -INSERT INTO t2 VALUES (573,158002,29,'signaled','Corinthianizes','Trobriand','FAS'); -INSERT INTO t2 VALUES (574,158101,29,'Italianizes','restlessly','fleeing','A'); -INSERT INTO t2 VALUES (575,158102,29,'algorithmic','bromides','Armour','A'); -INSERT INTO t2 VALUES (576,158103,29,'paranoid','generalized','chin','A'); -INSERT INTO t2 VALUES (577,158201,29,'camping','mishaps','provers','A'); -INSERT INTO t2 VALUES (578,158202,29,'signifying','quelling','aeronautic','A'); -INSERT INTO t2 VALUES (579,158203,29,'Patrice','spiritual','voltage','W'); -INSERT INTO t2 VALUES (580,158204,29,'search','beguiles','sash',''); -INSERT INTO t2 VALUES (581,158301,29,'Angeles','Trobriand','anaerobic','A'); -INSERT INTO t2 VALUES (582,158302,29,'semblance','fleeing','simultaneous','A'); -INSERT INTO t2 VALUES (583,158303,29,'taxed','Armour','accumulating','A'); -INSERT INTO t2 VALUES (584,158304,29,'Beatrice','chin','Medusan','A'); -INSERT INTO t2 VALUES (585,158305,29,'retrace','provers','shouted','A'); -INSERT INTO t2 VALUES (586,158306,29,'lockout','aeronautic','freakish',''); -INSERT INTO t2 VALUES (587,158501,29,'grammatic','voltage','index','FAS'); -INSERT INTO t2 VALUES (588,160301,29,'helmsman','sash','commercially',''); -INSERT INTO t2 VALUES (589,166101,50,'uniform','anaerobic','mistiness','A'); -INSERT INTO t2 VALUES (590,166102,50,'hamming','simultaneous','endpoint',''); -INSERT INTO t2 VALUES (591,168001,29,'disobedience','accumulating','straight','A'); -INSERT INTO t2 VALUES (592,168002,29,'captivated','Medusan','flurried',''); -INSERT INTO t2 VALUES (593,168003,29,'transferals','shouted','denotative','A'); -INSERT INTO t2 VALUES (594,168101,29,'cartographer','freakish','coming','FAS'); -INSERT INTO t2 VALUES (595,168102,29,'aims','index','commencements','FAS'); -INSERT INTO t2 VALUES (596,168103,29,'Pakistani','commercially','gentleman',''); -INSERT INTO t2 VALUES (597,168104,29,'burglarized','mistiness','gifted',''); -INSERT INTO t2 VALUES (598,168202,29,'saucepans','endpoint','Shanghais',''); -INSERT INTO t2 VALUES (599,168301,29,'lacerating','straight','sportswriting','A'); -INSERT INTO t2 VALUES (600,168502,29,'corny','flurried','sloping','A'); -INSERT INTO t2 VALUES (601,168503,29,'megabytes','denotative','navies',''); -INSERT INTO t2 VALUES (602,168601,29,'chancellor','coming','leaflet','A'); -INSERT INTO t2 VALUES (603,173001,40,'bulk','commencements','shooter',''); -INSERT INTO t2 VALUES (604,173701,40,'commits','gentleman','Joplin','FAS'); -INSERT INTO t2 VALUES (605,173702,40,'meson','gifted','babies',''); -INSERT INTO t2 VALUES (606,176001,40,'deputies','Shanghais','subdivision','FAS'); -INSERT INTO t2 VALUES (607,176101,40,'northeaster','sportswriting','burstiness','W'); -INSERT INTO t2 VALUES (608,176201,40,'dipole','sloping','belted','FAS'); -INSERT INTO t2 VALUES (609,176401,40,'machining','navies','assails','FAS'); -INSERT INTO t2 VALUES (610,176501,40,'therefore','leaflet','admiring','W'); -INSERT INTO t2 VALUES (611,176601,40,'Telefunken','shooter','swaying','0'); -INSERT INTO t2 VALUES (612,176602,40,'salvaging','Joplin','Goldstine','FAS'); -INSERT INTO t2 VALUES (613,176603,40,'Corinthianizes','babies','fitting',''); -INSERT INTO t2 VALUES (614,178001,40,'restlessly','subdivision','Norwalk','W'); -INSERT INTO t2 VALUES (615,178002,40,'bromides','burstiness','weakening','W'); -INSERT INTO t2 VALUES (616,178003,40,'generalized','belted','analogy','FAS'); -INSERT INTO t2 VALUES (617,178004,40,'mishaps','assails','deludes',''); -INSERT INTO t2 VALUES (618,178005,40,'quelling','admiring','cokes',''); -INSERT INTO t2 VALUES (619,178006,40,'spiritual','swaying','Clayton',''); -INSERT INTO t2 VALUES (620,178007,40,'beguiles','Goldstine','exhausts',''); -INSERT INTO t2 VALUES (621,178008,40,'Trobriand','fitting','causality',''); -INSERT INTO t2 VALUES (622,178101,40,'fleeing','Norwalk','sating','FAS'); -INSERT INTO t2 VALUES (623,178102,40,'Armour','weakening','icon',''); -INSERT INTO t2 VALUES (624,178103,40,'chin','analogy','throttles',''); -INSERT INTO t2 VALUES (625,178201,40,'provers','deludes','communicants','FAS'); -INSERT INTO t2 VALUES (626,178202,40,'aeronautic','cokes','dehydrate','FAS'); -INSERT INTO t2 VALUES (627,178301,40,'voltage','Clayton','priceless','FAS'); -INSERT INTO t2 VALUES (628,178302,40,'sash','exhausts','publicly',''); -INSERT INTO t2 VALUES (629,178401,40,'anaerobic','causality','incidentals','FAS'); -INSERT INTO t2 VALUES (630,178402,40,'simultaneous','sating','commonplace',''); -INSERT INTO t2 VALUES (631,178403,40,'accumulating','icon','mumbles',''); -INSERT INTO t2 VALUES (632,178404,40,'Medusan','throttles','furthermore','W'); -INSERT INTO t2 VALUES (633,178501,40,'shouted','communicants','cautioned','W'); -INSERT INTO t2 VALUES (634,186002,37,'freakish','dehydrate','parametrized','A'); -INSERT INTO t2 VALUES (635,186102,37,'index','priceless','registration','A'); -INSERT INTO t2 VALUES (636,186201,40,'commercially','publicly','sadly','FAS'); -INSERT INTO t2 VALUES (637,186202,40,'mistiness','incidentals','positioning',''); -INSERT INTO t2 VALUES (638,186203,40,'endpoint','commonplace','babysitting',''); -INSERT INTO t2 VALUES (639,186302,37,'straight','mumbles','eternal','A'); -INSERT INTO t2 VALUES (640,188007,37,'flurried','furthermore','hoarder',''); -INSERT INTO t2 VALUES (641,188008,37,'denotative','cautioned','congregates',''); -INSERT INTO t2 VALUES (642,188009,37,'coming','parametrized','rains',''); -INSERT INTO t2 VALUES (643,188010,37,'commencements','registration','workers','W'); -INSERT INTO t2 VALUES (644,188011,37,'gentleman','sadly','sags','A'); -INSERT INTO t2 VALUES (645,188012,37,'gifted','positioning','unplug','W'); -INSERT INTO t2 VALUES (646,188013,37,'Shanghais','babysitting','garage','A'); -INSERT INTO t2 VALUES (647,188014,37,'sportswriting','eternal','boulder','A'); -INSERT INTO t2 VALUES (648,188015,37,'sloping','hoarder','hollowly','A'); -INSERT INTO t2 VALUES (649,188016,37,'navies','congregates','specifics',''); -INSERT INTO t2 VALUES (650,188017,37,'leaflet','rains','Teresa',''); -INSERT INTO t2 VALUES (651,188102,37,'shooter','workers','Winsett',''); -INSERT INTO t2 VALUES (652,188103,37,'Joplin','sags','convenient','A'); -INSERT INTO t2 VALUES (653,188202,37,'babies','unplug','buckboards','FAS'); -INSERT INTO t2 VALUES (654,188301,40,'subdivision','garage','amenities',''); -INSERT INTO t2 VALUES (655,188302,40,'burstiness','boulder','resplendent','FAS'); -INSERT INTO t2 VALUES (656,188303,40,'belted','hollowly','priding','FAS'); -INSERT INTO t2 VALUES (657,188401,37,'assails','specifics','configurations',''); -INSERT INTO t2 VALUES (658,188402,37,'admiring','Teresa','untidiness','A'); -INSERT INTO t2 VALUES (659,188503,37,'swaying','Winsett','Brice','W'); -INSERT INTO t2 VALUES (660,188504,37,'Goldstine','convenient','sews','FAS'); -INSERT INTO t2 VALUES (661,188505,37,'fitting','buckboards','participated',''); -INSERT INTO t2 VALUES (662,190701,37,'Norwalk','amenities','Simon','FAS'); -INSERT INTO t2 VALUES (663,190703,50,'weakening','resplendent','certificates',''); -INSERT INTO t2 VALUES (664,191701,37,'analogy','priding','Fitzpatrick',''); -INSERT INTO t2 VALUES (665,191702,37,'deludes','configurations','Evanston','A'); -INSERT INTO t2 VALUES (666,191703,37,'cokes','untidiness','misted',''); -INSERT INTO t2 VALUES (667,196001,37,'Clayton','Brice','textures','A'); -INSERT INTO t2 VALUES (668,196002,37,'exhausts','sews','save',''); -INSERT INTO t2 VALUES (669,196003,37,'causality','participated','count',''); -INSERT INTO t2 VALUES (670,196101,37,'sating','Simon','rightful','A'); -INSERT INTO t2 VALUES (671,196103,37,'icon','certificates','chaperone',''); -INSERT INTO t2 VALUES (672,196104,37,'throttles','Fitzpatrick','Lizzy','A'); -INSERT INTO t2 VALUES (673,196201,37,'communicants','Evanston','clenched','A'); -INSERT INTO t2 VALUES (674,196202,37,'dehydrate','misted','effortlessly',''); -INSERT INTO t2 VALUES (675,196203,37,'priceless','textures','accessed',''); -INSERT INTO t2 VALUES (676,198001,37,'publicly','save','beaters','A'); -INSERT INTO t2 VALUES (677,198003,37,'incidentals','count','Hornblower','FAS'); -INSERT INTO t2 VALUES (678,198004,37,'commonplace','rightful','vests','A'); -INSERT INTO t2 VALUES (679,198005,37,'mumbles','chaperone','indulgences','FAS'); -INSERT INTO t2 VALUES (680,198006,37,'furthermore','Lizzy','infallibly','A'); -INSERT INTO t2 VALUES (681,198007,37,'cautioned','clenched','unwilling','FAS'); -INSERT INTO t2 VALUES (682,198008,37,'parametrized','effortlessly','excrete','FAS'); -INSERT INTO t2 VALUES (683,198009,37,'registration','accessed','spools','A'); -INSERT INTO t2 VALUES (684,198010,37,'sadly','beaters','crunches','FAS'); -INSERT INTO t2 VALUES (685,198011,37,'positioning','Hornblower','overestimating','FAS'); -INSERT INTO t2 VALUES (686,198012,37,'babysitting','vests','ineffective',''); -INSERT INTO t2 VALUES (687,198013,37,'eternal','indulgences','humiliation','A'); -INSERT INTO t2 VALUES (688,198014,37,'hoarder','infallibly','sophomore',''); -INSERT INTO t2 VALUES (689,198015,37,'congregates','unwilling','star',''); -INSERT INTO t2 VALUES (690,198017,37,'rains','excrete','rifles',''); -INSERT INTO t2 VALUES (691,198018,37,'workers','spools','dialysis',''); -INSERT INTO t2 VALUES (692,198019,37,'sags','crunches','arriving',''); -INSERT INTO t2 VALUES (693,198020,37,'unplug','overestimating','indulge',''); -INSERT INTO t2 VALUES (694,198021,37,'garage','ineffective','clockers',''); -INSERT INTO t2 VALUES (695,198022,37,'boulder','humiliation','languages',''); -INSERT INTO t2 VALUES (696,198023,50,'hollowly','sophomore','Antarctica','A'); -INSERT INTO t2 VALUES (697,198024,37,'specifics','star','percentage',''); -INSERT INTO t2 VALUES (698,198101,37,'Teresa','rifles','ceiling','A'); -INSERT INTO t2 VALUES (699,198103,37,'Winsett','dialysis','specification',''); -INSERT INTO t2 VALUES (700,198105,37,'convenient','arriving','regimented','A'); -INSERT INTO t2 VALUES (701,198106,37,'buckboards','indulge','ciphers',''); -INSERT INTO t2 VALUES (702,198201,37,'amenities','clockers','pictures','A'); -INSERT INTO t2 VALUES (703,198204,37,'resplendent','languages','serpents','A'); -INSERT INTO t2 VALUES (704,198301,53,'priding','Antarctica','allot','A'); -INSERT INTO t2 VALUES (705,198302,53,'configurations','percentage','realized','A'); -INSERT INTO t2 VALUES (706,198303,53,'untidiness','ceiling','mayoral','A'); -INSERT INTO t2 VALUES (707,198304,53,'Brice','specification','opaquely','A'); -INSERT INTO t2 VALUES (708,198401,37,'sews','regimented','hostess','FAS'); -INSERT INTO t2 VALUES (709,198402,37,'participated','ciphers','fiftieth',''); -INSERT INTO t2 VALUES (710,198403,37,'Simon','pictures','incorrectly',''); -INSERT INTO t2 VALUES (711,202101,37,'certificates','serpents','decomposition','FAS'); -INSERT INTO t2 VALUES (712,202301,37,'Fitzpatrick','allot','stranglings',''); -INSERT INTO t2 VALUES (713,202302,37,'Evanston','realized','mixture','FAS'); -INSERT INTO t2 VALUES (714,202303,37,'misted','mayoral','electroencephalography','FAS'); -INSERT INTO t2 VALUES (715,202304,37,'textures','opaquely','similarities','FAS'); -INSERT INTO t2 VALUES (716,202305,37,'save','hostess','charges','W'); -INSERT INTO t2 VALUES (717,202601,37,'count','fiftieth','freest','FAS'); -INSERT INTO t2 VALUES (718,202602,37,'rightful','incorrectly','Greenberg','FAS'); -INSERT INTO t2 VALUES (719,202605,37,'chaperone','decomposition','tinting',''); -INSERT INTO t2 VALUES (720,202606,37,'Lizzy','stranglings','expelled','W'); -INSERT INTO t2 VALUES (721,202607,37,'clenched','mixture','warm',''); -INSERT INTO t2 VALUES (722,202901,37,'effortlessly','electroencephalography','smoothed',''); -INSERT INTO t2 VALUES (723,202902,37,'accessed','similarities','deductions','FAS'); -INSERT INTO t2 VALUES (724,202903,37,'beaters','charges','Romano','W'); -INSERT INTO t2 VALUES (725,202904,37,'Hornblower','freest','bitterroot',''); -INSERT INTO t2 VALUES (726,202907,37,'vests','Greenberg','corset',''); -INSERT INTO t2 VALUES (727,202908,37,'indulgences','tinting','securing',''); -INSERT INTO t2 VALUES (728,203101,37,'infallibly','expelled','environing','FAS'); -INSERT INTO t2 VALUES (729,203103,37,'unwilling','warm','cute',''); -INSERT INTO t2 VALUES (730,203104,37,'excrete','smoothed','Crays',''); -INSERT INTO t2 VALUES (731,203105,37,'spools','deductions','heiress','FAS'); -INSERT INTO t2 VALUES (732,203401,37,'crunches','Romano','inform','FAS'); -INSERT INTO t2 VALUES (733,203402,37,'overestimating','bitterroot','avenge',''); -INSERT INTO t2 VALUES (734,203404,37,'ineffective','corset','universals',''); -INSERT INTO t2 VALUES (735,203901,37,'humiliation','securing','Kinsey','W'); -INSERT INTO t2 VALUES (736,203902,37,'sophomore','environing','ravines','FAS'); -INSERT INTO t2 VALUES (737,203903,37,'star','cute','bestseller',''); -INSERT INTO t2 VALUES (738,203906,37,'rifles','Crays','equilibrium',''); -INSERT INTO t2 VALUES (739,203907,37,'dialysis','heiress','extents','0'); -INSERT INTO t2 VALUES (740,203908,37,'arriving','inform','relatively',''); -INSERT INTO t2 VALUES (741,203909,37,'indulge','avenge','pressure','FAS'); -INSERT INTO t2 VALUES (742,206101,37,'clockers','universals','critiques','FAS'); -INSERT INTO t2 VALUES (743,206201,37,'languages','Kinsey','befouled',''); -INSERT INTO t2 VALUES (744,206202,37,'Antarctica','ravines','rightfully','FAS'); -INSERT INTO t2 VALUES (745,206203,37,'percentage','bestseller','mechanizing','FAS'); -INSERT INTO t2 VALUES (746,206206,37,'ceiling','equilibrium','Latinizes',''); -INSERT INTO t2 VALUES (747,206207,37,'specification','extents','timesharing',''); -INSERT INTO t2 VALUES (748,206208,37,'regimented','relatively','Aden',''); -INSERT INTO t2 VALUES (749,208001,37,'ciphers','pressure','embassies',''); -INSERT INTO t2 VALUES (750,208002,37,'pictures','critiques','males','FAS'); -INSERT INTO t2 VALUES (751,208003,37,'serpents','befouled','shapelessly','FAS'); -INSERT INTO t2 VALUES (752,208004,37,'allot','rightfully','genres','FAS'); -INSERT INTO t2 VALUES (753,208008,37,'realized','mechanizing','mastering',''); -INSERT INTO t2 VALUES (754,208009,37,'mayoral','Latinizes','Newtonian',''); -INSERT INTO t2 VALUES (755,208010,37,'opaquely','timesharing','finishers','FAS'); -INSERT INTO t2 VALUES (756,208011,37,'hostess','Aden','abates',''); -INSERT INTO t2 VALUES (757,208101,37,'fiftieth','embassies','teem',''); -INSERT INTO t2 VALUES (758,208102,37,'incorrectly','males','kiting','FAS'); -INSERT INTO t2 VALUES (759,208103,37,'decomposition','shapelessly','stodgy','FAS'); -INSERT INTO t2 VALUES (760,208104,37,'stranglings','genres','scalps','FAS'); -INSERT INTO t2 VALUES (761,208105,37,'mixture','mastering','feed','FAS'); -INSERT INTO t2 VALUES (762,208110,37,'electroencephalography','Newtonian','guitars',''); -INSERT INTO t2 VALUES (763,208111,37,'similarities','finishers','airships',''); -INSERT INTO t2 VALUES (764,208112,37,'charges','abates','store',''); -INSERT INTO t2 VALUES (765,208113,37,'freest','teem','denounces',''); -INSERT INTO t2 VALUES (766,208201,37,'Greenberg','kiting','Pyle','FAS'); -INSERT INTO t2 VALUES (767,208203,37,'tinting','stodgy','Saxony',''); -INSERT INTO t2 VALUES (768,208301,37,'expelled','scalps','serializations','FAS'); -INSERT INTO t2 VALUES (769,208302,37,'warm','feed','Peruvian','FAS'); -INSERT INTO t2 VALUES (770,208305,37,'smoothed','guitars','taxonomically','FAS'); -INSERT INTO t2 VALUES (771,208401,37,'deductions','airships','kingdom','A'); -INSERT INTO t2 VALUES (772,208402,37,'Romano','store','stint','A'); -INSERT INTO t2 VALUES (773,208403,37,'bitterroot','denounces','Sault','A'); -INSERT INTO t2 VALUES (774,208404,37,'corset','Pyle','faithful',''); -INSERT INTO t2 VALUES (775,208501,37,'securing','Saxony','Ganymede','FAS'); -INSERT INTO t2 VALUES (776,208502,37,'environing','serializations','tidiness','FAS'); -INSERT INTO t2 VALUES (777,208503,37,'cute','Peruvian','gainful','FAS'); -INSERT INTO t2 VALUES (778,208504,37,'Crays','taxonomically','contrary','FAS'); -INSERT INTO t2 VALUES (779,208505,37,'heiress','kingdom','Tipperary','FAS'); -INSERT INTO t2 VALUES (780,210101,37,'inform','stint','tropics','W'); -INSERT INTO t2 VALUES (781,210102,37,'avenge','Sault','theorizers',''); -INSERT INTO t2 VALUES (782,210103,37,'universals','faithful','renew','0'); -INSERT INTO t2 VALUES (783,210104,37,'Kinsey','Ganymede','already',''); -INSERT INTO t2 VALUES (784,210105,37,'ravines','tidiness','terminal',''); -INSERT INTO t2 VALUES (785,210106,37,'bestseller','gainful','Hegelian',''); -INSERT INTO t2 VALUES (786,210107,37,'equilibrium','contrary','hypothesizer',''); -INSERT INTO t2 VALUES (787,210401,37,'extents','Tipperary','warningly','FAS'); -INSERT INTO t2 VALUES (788,213201,37,'relatively','tropics','journalizing','FAS'); -INSERT INTO t2 VALUES (789,213203,37,'pressure','theorizers','nested',''); -INSERT INTO t2 VALUES (790,213204,37,'critiques','renew','Lars',''); -INSERT INTO t2 VALUES (791,213205,37,'befouled','already','saplings',''); -INSERT INTO t2 VALUES (792,213206,37,'rightfully','terminal','foothill',''); -INSERT INTO t2 VALUES (793,213207,37,'mechanizing','Hegelian','labeled',''); -INSERT INTO t2 VALUES (794,216101,37,'Latinizes','hypothesizer','imperiously','FAS'); -INSERT INTO t2 VALUES (795,216103,37,'timesharing','warningly','reporters','FAS'); -INSERT INTO t2 VALUES (796,218001,37,'Aden','journalizing','furnishings','FAS'); -INSERT INTO t2 VALUES (797,218002,37,'embassies','nested','precipitable','FAS'); -INSERT INTO t2 VALUES (798,218003,37,'males','Lars','discounts','FAS'); -INSERT INTO t2 VALUES (799,218004,37,'shapelessly','saplings','excises','FAS'); -INSERT INTO t2 VALUES (800,143503,50,'genres','foothill','Stalin',''); -INSERT INTO t2 VALUES (801,218006,37,'mastering','labeled','despot','FAS'); -INSERT INTO t2 VALUES (802,218007,37,'Newtonian','imperiously','ripeness','FAS'); -INSERT INTO t2 VALUES (803,218008,37,'finishers','reporters','Arabia',''); -INSERT INTO t2 VALUES (804,218009,37,'abates','furnishings','unruly',''); -INSERT INTO t2 VALUES (805,218010,37,'teem','precipitable','mournfulness',''); -INSERT INTO t2 VALUES (806,218011,37,'kiting','discounts','boom','FAS'); -INSERT INTO t2 VALUES (807,218020,37,'stodgy','excises','slaughter','A'); -INSERT INTO t2 VALUES (808,218021,50,'scalps','Stalin','Sabine',''); -INSERT INTO t2 VALUES (809,218022,37,'feed','despot','handy','FAS'); -INSERT INTO t2 VALUES (810,218023,37,'guitars','ripeness','rural',''); -INSERT INTO t2 VALUES (811,218024,37,'airships','Arabia','organizer',''); -INSERT INTO t2 VALUES (812,218101,37,'store','unruly','shipyard','FAS'); -INSERT INTO t2 VALUES (813,218102,37,'denounces','mournfulness','civics','FAS'); -INSERT INTO t2 VALUES (814,218103,37,'Pyle','boom','inaccuracy','FAS'); -INSERT INTO t2 VALUES (815,218201,37,'Saxony','slaughter','rules','FAS'); -INSERT INTO t2 VALUES (816,218202,37,'serializations','Sabine','juveniles','FAS'); -INSERT INTO t2 VALUES (817,218203,37,'Peruvian','handy','comprised','W'); -INSERT INTO t2 VALUES (818,218204,37,'taxonomically','rural','investigations',''); -INSERT INTO t2 VALUES (819,218205,37,'kingdom','organizer','stabilizes','A'); -INSERT INTO t2 VALUES (820,218301,37,'stint','shipyard','seminaries','FAS'); -INSERT INTO t2 VALUES (821,218302,37,'Sault','civics','Hunter','A'); -INSERT INTO t2 VALUES (822,218401,37,'faithful','inaccuracy','sporty','FAS'); -INSERT INTO t2 VALUES (823,218402,37,'Ganymede','rules','test','FAS'); -INSERT INTO t2 VALUES (824,218403,37,'tidiness','juveniles','weasels',''); -INSERT INTO t2 VALUES (825,218404,37,'gainful','comprised','CERN',''); -INSERT INTO t2 VALUES (826,218407,37,'contrary','investigations','tempering',''); -INSERT INTO t2 VALUES (827,218408,37,'Tipperary','stabilizes','afore','FAS'); -INSERT INTO t2 VALUES (828,218409,37,'tropics','seminaries','Galatean',''); -INSERT INTO t2 VALUES (829,218410,37,'theorizers','Hunter','techniques','W'); -INSERT INTO t2 VALUES (830,226001,37,'renew','sporty','error',''); -INSERT INTO t2 VALUES (831,226002,37,'already','test','veranda',''); -INSERT INTO t2 VALUES (832,226003,37,'terminal','weasels','severely',''); -INSERT INTO t2 VALUES (833,226004,37,'Hegelian','CERN','Cassites','FAS'); -INSERT INTO t2 VALUES (834,226005,37,'hypothesizer','tempering','forthcoming',''); -INSERT INTO t2 VALUES (835,226006,37,'warningly','afore','guides',''); -INSERT INTO t2 VALUES (836,226007,37,'journalizing','Galatean','vanish','FAS'); -INSERT INTO t2 VALUES (837,226008,37,'nested','techniques','lied','A'); -INSERT INTO t2 VALUES (838,226203,37,'Lars','error','sawtooth','FAS'); -INSERT INTO t2 VALUES (839,226204,37,'saplings','veranda','fated','FAS'); -INSERT INTO t2 VALUES (840,226205,37,'foothill','severely','gradually',''); -INSERT INTO t2 VALUES (841,226206,37,'labeled','Cassites','widens',''); -INSERT INTO t2 VALUES (842,226207,37,'imperiously','forthcoming','preclude',''); -INSERT INTO t2 VALUES (843,226208,37,'reporters','guides','Jobrel',''); -INSERT INTO t2 VALUES (844,226209,37,'furnishings','vanish','hooker',''); -INSERT INTO t2 VALUES (845,226210,37,'precipitable','lied','rainstorm',''); -INSERT INTO t2 VALUES (846,226211,37,'discounts','sawtooth','disconnects',''); -INSERT INTO t2 VALUES (847,228001,37,'excises','fated','cruelty',''); -INSERT INTO t2 VALUES (848,228004,37,'Stalin','gradually','exponentials','A'); -INSERT INTO t2 VALUES (849,228005,37,'despot','widens','affective','A'); -INSERT INTO t2 VALUES (850,228006,37,'ripeness','preclude','arteries',''); -INSERT INTO t2 VALUES (851,228007,37,'Arabia','Jobrel','Crosby','FAS'); -INSERT INTO t2 VALUES (852,228008,37,'unruly','hooker','acquaint',''); -INSERT INTO t2 VALUES (853,228009,37,'mournfulness','rainstorm','evenhandedly',''); -INSERT INTO t2 VALUES (854,228101,37,'boom','disconnects','percentage',''); -INSERT INTO t2 VALUES (855,228108,37,'slaughter','cruelty','disobedience',''); -INSERT INTO t2 VALUES (856,228109,37,'Sabine','exponentials','humility',''); -INSERT INTO t2 VALUES (857,228110,37,'handy','affective','gleaning','A'); -INSERT INTO t2 VALUES (858,228111,37,'rural','arteries','petted','A'); -INSERT INTO t2 VALUES (859,228112,37,'organizer','Crosby','bloater','A'); -INSERT INTO t2 VALUES (860,228113,37,'shipyard','acquaint','minion','A'); -INSERT INTO t2 VALUES (861,228114,37,'civics','evenhandedly','marginal','A'); -INSERT INTO t2 VALUES (862,228115,37,'inaccuracy','percentage','apiary','A'); -INSERT INTO t2 VALUES (863,228116,37,'rules','disobedience','measures',''); -INSERT INTO t2 VALUES (864,228117,37,'juveniles','humility','precaution',''); -INSERT INTO t2 VALUES (865,228118,37,'comprised','gleaning','repelled',''); -INSERT INTO t2 VALUES (866,228119,37,'investigations','petted','primary','FAS'); -INSERT INTO t2 VALUES (867,228120,37,'stabilizes','bloater','coverings',''); -INSERT INTO t2 VALUES (868,228121,37,'seminaries','minion','Artemia','A'); -INSERT INTO t2 VALUES (869,228122,37,'Hunter','marginal','navigate',''); -INSERT INTO t2 VALUES (870,228201,37,'sporty','apiary','spatial',''); -INSERT INTO t2 VALUES (871,228206,37,'test','measures','Gurkha',''); -INSERT INTO t2 VALUES (872,228207,37,'weasels','precaution','meanwhile','A'); -INSERT INTO t2 VALUES (873,228208,37,'CERN','repelled','Melinda','A'); -INSERT INTO t2 VALUES (874,228209,37,'tempering','primary','Butterfield',''); -INSERT INTO t2 VALUES (875,228210,37,'afore','coverings','Aldrich','A'); -INSERT INTO t2 VALUES (876,228211,37,'Galatean','Artemia','previewing','A'); -INSERT INTO t2 VALUES (877,228212,37,'techniques','navigate','glut','A'); -INSERT INTO t2 VALUES (878,228213,37,'error','spatial','unaffected',''); -INSERT INTO t2 VALUES (879,228214,37,'veranda','Gurkha','inmate',''); -INSERT INTO t2 VALUES (880,228301,37,'severely','meanwhile','mineral',''); -INSERT INTO t2 VALUES (881,228305,37,'Cassites','Melinda','impending','A'); -INSERT INTO t2 VALUES (882,228306,37,'forthcoming','Butterfield','meditation','A'); -INSERT INTO t2 VALUES (883,228307,37,'guides','Aldrich','ideas',''); -INSERT INTO t2 VALUES (884,228308,37,'vanish','previewing','miniaturizes','W'); -INSERT INTO t2 VALUES (885,228309,37,'lied','glut','lewdly',''); -INSERT INTO t2 VALUES (886,228310,37,'sawtooth','unaffected','title',''); -INSERT INTO t2 VALUES (887,228311,37,'fated','inmate','youthfulness',''); -INSERT INTO t2 VALUES (888,228312,37,'gradually','mineral','creak','FAS'); -INSERT INTO t2 VALUES (889,228313,37,'widens','impending','Chippewa',''); -INSERT INTO t2 VALUES (890,228314,37,'preclude','meditation','clamored',''); -INSERT INTO t2 VALUES (891,228401,65,'Jobrel','ideas','freezes',''); -INSERT INTO t2 VALUES (892,228402,65,'hooker','miniaturizes','forgivably','FAS'); -INSERT INTO t2 VALUES (893,228403,65,'rainstorm','lewdly','reduce','FAS'); -INSERT INTO t2 VALUES (894,228404,65,'disconnects','title','McGovern','W'); -INSERT INTO t2 VALUES (895,228405,65,'cruelty','youthfulness','Nazis','W'); -INSERT INTO t2 VALUES (896,228406,65,'exponentials','creak','epistle','W'); -INSERT INTO t2 VALUES (897,228407,65,'affective','Chippewa','socializes','W'); -INSERT INTO t2 VALUES (898,228408,65,'arteries','clamored','conceptions',''); -INSERT INTO t2 VALUES (899,228409,65,'Crosby','freezes','Kevin',''); -INSERT INTO t2 VALUES (900,228410,65,'acquaint','forgivably','uncovering',''); -INSERT INTO t2 VALUES (901,230301,37,'evenhandedly','reduce','chews','FAS'); -INSERT INTO t2 VALUES (902,230302,37,'percentage','McGovern','appendixes','FAS'); -INSERT INTO t2 VALUES (903,230303,37,'disobedience','Nazis','raining',''); -INSERT INTO t2 VALUES (904,018062,37,'humility','epistle','infest',''); -INSERT INTO t2 VALUES (905,230501,37,'gleaning','socializes','compartment',''); -INSERT INTO t2 VALUES (906,230502,37,'petted','conceptions','minting',''); -INSERT INTO t2 VALUES (907,230503,37,'bloater','Kevin','ducks',''); -INSERT INTO t2 VALUES (908,230504,37,'minion','uncovering','roped','A'); -INSERT INTO t2 VALUES (909,230505,37,'marginal','chews','waltz',''); -INSERT INTO t2 VALUES (910,230506,37,'apiary','appendixes','Lillian',''); -INSERT INTO t2 VALUES (911,230507,37,'measures','raining','repressions','A'); -INSERT INTO t2 VALUES (912,230508,37,'precaution','infest','chillingly',''); -INSERT INTO t2 VALUES (913,230509,37,'repelled','compartment','noncritical',''); -INSERT INTO t2 VALUES (914,230901,37,'primary','minting','lithograph',''); -INSERT INTO t2 VALUES (915,230902,37,'coverings','ducks','spongers',''); -INSERT INTO t2 VALUES (916,230903,37,'Artemia','roped','parenthood',''); -INSERT INTO t2 VALUES (917,230904,37,'navigate','waltz','posed',''); -INSERT INTO t2 VALUES (918,230905,37,'spatial','Lillian','instruments',''); -INSERT INTO t2 VALUES (919,230906,37,'Gurkha','repressions','filial',''); -INSERT INTO t2 VALUES (920,230907,37,'meanwhile','chillingly','fixedly',''); -INSERT INTO t2 VALUES (921,230908,37,'Melinda','noncritical','relives',''); -INSERT INTO t2 VALUES (922,230909,37,'Butterfield','lithograph','Pandora',''); -INSERT INTO t2 VALUES (923,230910,37,'Aldrich','spongers','watering','A'); -INSERT INTO t2 VALUES (924,230911,37,'previewing','parenthood','ungrateful',''); -INSERT INTO t2 VALUES (925,230912,37,'glut','posed','secures',''); -INSERT INTO t2 VALUES (926,230913,37,'unaffected','instruments','chastisers',''); -INSERT INTO t2 VALUES (927,230914,37,'inmate','filial','icon',''); -INSERT INTO t2 VALUES (928,231304,37,'mineral','fixedly','reuniting','A'); -INSERT INTO t2 VALUES (929,231305,37,'impending','relives','imagining','A'); -INSERT INTO t2 VALUES (930,231306,37,'meditation','Pandora','abiding','A'); -INSERT INTO t2 VALUES (931,231307,37,'ideas','watering','omnisciently',''); -INSERT INTO t2 VALUES (932,231308,37,'miniaturizes','ungrateful','Britannic',''); -INSERT INTO t2 VALUES (933,231309,37,'lewdly','secures','scholastics','A'); -INSERT INTO t2 VALUES (934,231310,37,'title','chastisers','mechanics','A'); -INSERT INTO t2 VALUES (935,231311,37,'youthfulness','icon','humidly','A'); -INSERT INTO t2 VALUES (936,231312,37,'creak','reuniting','masterpiece',''); -INSERT INTO t2 VALUES (937,231313,37,'Chippewa','imagining','however',''); -INSERT INTO t2 VALUES (938,231314,37,'clamored','abiding','Mendelian',''); -INSERT INTO t2 VALUES (939,231315,37,'freezes','omnisciently','jarred',''); -INSERT INTO t2 VALUES (940,232102,37,'forgivably','Britannic','scolds',''); -INSERT INTO t2 VALUES (941,232103,37,'reduce','scholastics','infatuate',''); -INSERT INTO t2 VALUES (942,232104,37,'McGovern','mechanics','willed','A'); -INSERT INTO t2 VALUES (943,232105,37,'Nazis','humidly','joyfully',''); -INSERT INTO t2 VALUES (944,232106,37,'epistle','masterpiece','Microsoft',''); -INSERT INTO t2 VALUES (945,232107,37,'socializes','however','fibrosities',''); -INSERT INTO t2 VALUES (946,232108,37,'conceptions','Mendelian','Baltimorean',''); -INSERT INTO t2 VALUES (947,232601,37,'Kevin','jarred','equestrian',''); -INSERT INTO t2 VALUES (948,232602,37,'uncovering','scolds','Goodrich',''); -INSERT INTO t2 VALUES (949,232603,37,'chews','infatuate','apish','A'); -INSERT INTO t2 VALUES (950,232605,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5950,1232605,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5951,1232606,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5952,1232607,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5953,1232608,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (5954,1232609,37,'appendixes','willed','Adlerian',''); -INSERT INTO t2 VALUES (951,232606,37,'raining','joyfully','Tropez',''); -INSERT INTO t2 VALUES (952,232607,37,'infest','Microsoft','nouns',''); -INSERT INTO t2 VALUES (953,232608,37,'compartment','fibrosities','distracting',''); -INSERT INTO t2 VALUES (954,232609,37,'minting','Baltimorean','mutton',''); -INSERT INTO t2 VALUES (955,236104,37,'ducks','equestrian','bridgeable','A'); -INSERT INTO t2 VALUES (956,236105,37,'roped','Goodrich','stickers','A'); -INSERT INTO t2 VALUES (957,236106,37,'waltz','apish','transcontinental','A'); -INSERT INTO t2 VALUES (958,236107,37,'Lillian','Adlerian','amateurish',''); -INSERT INTO t2 VALUES (959,236108,37,'repressions','Tropez','Gandhian',''); -INSERT INTO t2 VALUES (960,236109,37,'chillingly','nouns','stratified',''); -INSERT INTO t2 VALUES (961,236110,37,'noncritical','distracting','chamberlains',''); -INSERT INTO t2 VALUES (962,236111,37,'lithograph','mutton','creditably',''); -INSERT INTO t2 VALUES (963,236112,37,'spongers','bridgeable','philosophic',''); -INSERT INTO t2 VALUES (964,236113,37,'parenthood','stickers','ores',''); -INSERT INTO t2 VALUES (965,238005,37,'posed','transcontinental','Carleton',''); -INSERT INTO t2 VALUES (966,238006,37,'instruments','amateurish','tape','A'); -INSERT INTO t2 VALUES (967,238007,37,'filial','Gandhian','afloat','A'); -INSERT INTO t2 VALUES (968,238008,37,'fixedly','stratified','goodness','A'); -INSERT INTO t2 VALUES (969,238009,37,'relives','chamberlains','welcoming',''); -INSERT INTO t2 VALUES (970,238010,37,'Pandora','creditably','Pinsky','FAS'); -INSERT INTO t2 VALUES (971,238011,37,'watering','philosophic','halting',''); -INSERT INTO t2 VALUES (972,238012,37,'ungrateful','ores','bibliography',''); -INSERT INTO t2 VALUES (973,238013,37,'secures','Carleton','decoding',''); -INSERT INTO t2 VALUES (974,240401,41,'chastisers','tape','variance','A'); -INSERT INTO t2 VALUES (975,240402,41,'icon','afloat','allowed','A'); -INSERT INTO t2 VALUES (976,240901,41,'reuniting','goodness','dire','A'); -INSERT INTO t2 VALUES (977,240902,41,'imagining','welcoming','dub','A'); -INSERT INTO t2 VALUES (978,241801,41,'abiding','Pinsky','poisoning',''); -INSERT INTO t2 VALUES (979,242101,41,'omnisciently','halting','Iraqis','A'); -INSERT INTO t2 VALUES (980,242102,41,'Britannic','bibliography','heaving',''); -INSERT INTO t2 VALUES (981,242201,41,'scholastics','decoding','population','A'); -INSERT INTO t2 VALUES (982,242202,41,'mechanics','variance','bomb','A'); -INSERT INTO t2 VALUES (983,242501,41,'humidly','allowed','Majorca','A'); -INSERT INTO t2 VALUES (984,242502,41,'masterpiece','dire','Gershwins',''); -INSERT INTO t2 VALUES (985,246201,41,'however','dub','explorers',''); -INSERT INTO t2 VALUES (986,246202,41,'Mendelian','poisoning','libretto','A'); -INSERT INTO t2 VALUES (987,246203,41,'jarred','Iraqis','occurred',''); -INSERT INTO t2 VALUES (988,246204,41,'scolds','heaving','Lagos',''); -INSERT INTO t2 VALUES (989,246205,41,'infatuate','population','rats',''); -INSERT INTO t2 VALUES (990,246301,41,'willed','bomb','bankruptcies','A'); -INSERT INTO t2 VALUES (991,246302,41,'joyfully','Majorca','crying',''); -INSERT INTO t2 VALUES (992,248001,41,'Microsoft','Gershwins','unexpected',''); -INSERT INTO t2 VALUES (993,248002,41,'fibrosities','explorers','accessed','A'); -INSERT INTO t2 VALUES (994,248003,41,'Baltimorean','libretto','colorful','A'); -INSERT INTO t2 VALUES (995,248004,41,'equestrian','occurred','versatility','A'); -INSERT INTO t2 VALUES (996,248005,41,'Goodrich','Lagos','cosy',''); -INSERT INTO t2 VALUES (997,248006,41,'apish','rats','Darius','A'); -INSERT INTO t2 VALUES (998,248007,41,'Adlerian','bankruptcies','mastering','A'); -INSERT INTO t2 VALUES (999,248008,41,'Tropez','crying','Asiaticizations','A'); -INSERT INTO t2 VALUES (1000,248009,41,'nouns','unexpected','offerers','A'); -INSERT INTO t2 VALUES (1001,248010,41,'distracting','accessed','uncles','A'); -INSERT INTO t2 VALUES (1002,248011,41,'mutton','colorful','sleepwalk',''); -INSERT INTO t2 VALUES (1003,248012,41,'bridgeable','versatility','Ernestine',''); -INSERT INTO t2 VALUES (1004,248013,41,'stickers','cosy','checksumming',''); -INSERT INTO t2 VALUES (1005,248014,41,'transcontinental','Darius','stopped',''); -INSERT INTO t2 VALUES (1006,248015,41,'amateurish','mastering','sicker',''); -INSERT INTO t2 VALUES (1007,248016,41,'Gandhian','Asiaticizations','Italianization',''); -INSERT INTO t2 VALUES (1008,248017,41,'stratified','offerers','alphabetic',''); -INSERT INTO t2 VALUES (1009,248018,41,'chamberlains','uncles','pharmaceutic',''); -INSERT INTO t2 VALUES (1010,248019,41,'creditably','sleepwalk','creator',''); -INSERT INTO t2 VALUES (1011,248020,41,'philosophic','Ernestine','chess',''); -INSERT INTO t2 VALUES (1012,248021,41,'ores','checksumming','charcoal',''); -INSERT INTO t2 VALUES (1013,248101,41,'Carleton','stopped','Epiphany','A'); -INSERT INTO t2 VALUES (1014,248102,41,'tape','sicker','bulldozes','A'); -INSERT INTO t2 VALUES (1015,248201,41,'afloat','Italianization','Pygmalion','A'); -INSERT INTO t2 VALUES (1016,248202,41,'goodness','alphabetic','caressing','A'); -INSERT INTO t2 VALUES (1017,248203,41,'welcoming','pharmaceutic','Palestine','A'); -INSERT INTO t2 VALUES (1018,248204,41,'Pinsky','creator','regimented','A'); -INSERT INTO t2 VALUES (1019,248205,41,'halting','chess','scars','A'); -INSERT INTO t2 VALUES (1020,248206,41,'bibliography','charcoal','realest','A'); -INSERT INTO t2 VALUES (1021,248207,41,'decoding','Epiphany','diffusing','A'); -INSERT INTO t2 VALUES (1022,248208,41,'variance','bulldozes','clubroom','A'); -INSERT INTO t2 VALUES (1023,248209,41,'allowed','Pygmalion','Blythe','A'); -INSERT INTO t2 VALUES (1024,248210,41,'dire','caressing','ahead',''); -INSERT INTO t2 VALUES (1025,248211,50,'dub','Palestine','reviver',''); -INSERT INTO t2 VALUES (1026,250501,34,'poisoning','regimented','retransmitting','A'); -INSERT INTO t2 VALUES (1027,250502,34,'Iraqis','scars','landslide',''); -INSERT INTO t2 VALUES (1028,250503,34,'heaving','realest','Eiffel',''); -INSERT INTO t2 VALUES (1029,250504,34,'population','diffusing','absentee',''); -INSERT INTO t2 VALUES (1030,250505,34,'bomb','clubroom','aye',''); -INSERT INTO t2 VALUES (1031,250601,34,'Majorca','Blythe','forked','A'); -INSERT INTO t2 VALUES (1032,250602,34,'Gershwins','ahead','Peruvianizes',''); -INSERT INTO t2 VALUES (1033,250603,34,'explorers','reviver','clerked',''); -INSERT INTO t2 VALUES (1034,250604,34,'libretto','retransmitting','tutor',''); -INSERT INTO t2 VALUES (1035,250605,34,'occurred','landslide','boulevard',''); -INSERT INTO t2 VALUES (1036,251001,34,'Lagos','Eiffel','shuttered',''); -INSERT INTO t2 VALUES (1037,251002,34,'rats','absentee','quotes','A'); -INSERT INTO t2 VALUES (1038,251003,34,'bankruptcies','aye','Caltech',''); -INSERT INTO t2 VALUES (1039,251004,34,'crying','forked','Mossberg',''); -INSERT INTO t2 VALUES (1040,251005,34,'unexpected','Peruvianizes','kept',''); -INSERT INTO t2 VALUES (1041,251301,34,'accessed','clerked','roundly',''); -INSERT INTO t2 VALUES (1042,251302,34,'colorful','tutor','features','A'); -INSERT INTO t2 VALUES (1043,251303,34,'versatility','boulevard','imaginable','A'); -INSERT INTO t2 VALUES (1044,251304,34,'cosy','shuttered','controller',''); -INSERT INTO t2 VALUES (1045,251305,34,'Darius','quotes','racial',''); -INSERT INTO t2 VALUES (1046,251401,34,'mastering','Caltech','uprisings','A'); -INSERT INTO t2 VALUES (1047,251402,34,'Asiaticizations','Mossberg','narrowed','A'); -INSERT INTO t2 VALUES (1048,251403,34,'offerers','kept','cannot','A'); -INSERT INTO t2 VALUES (1049,251404,34,'uncles','roundly','vest',''); -INSERT INTO t2 VALUES (1050,251405,34,'sleepwalk','features','famine',''); -INSERT INTO t2 VALUES (1051,251406,34,'Ernestine','imaginable','sugars',''); -INSERT INTO t2 VALUES (1052,251801,34,'checksumming','controller','exterminated','A'); -INSERT INTO t2 VALUES (1053,251802,34,'stopped','racial','belays',''); -INSERT INTO t2 VALUES (1054,252101,34,'sicker','uprisings','Hodges','A'); -INSERT INTO t2 VALUES (1055,252102,34,'Italianization','narrowed','translatable',''); -INSERT INTO t2 VALUES (1056,252301,34,'alphabetic','cannot','duality','A'); -INSERT INTO t2 VALUES (1057,252302,34,'pharmaceutic','vest','recording','A'); -INSERT INTO t2 VALUES (1058,252303,34,'creator','famine','rouses','A'); -INSERT INTO t2 VALUES (1059,252304,34,'chess','sugars','poison',''); -INSERT INTO t2 VALUES (1060,252305,34,'charcoal','exterminated','attitude',''); -INSERT INTO t2 VALUES (1061,252306,34,'Epiphany','belays','dusted',''); -INSERT INTO t2 VALUES (1062,252307,34,'bulldozes','Hodges','encompasses',''); -INSERT INTO t2 VALUES (1063,252308,34,'Pygmalion','translatable','presentation',''); -INSERT INTO t2 VALUES (1064,252309,34,'caressing','duality','Kantian',''); -INSERT INTO t2 VALUES (1065,256001,34,'Palestine','recording','imprecision','A'); -INSERT INTO t2 VALUES (1066,256002,34,'regimented','rouses','saving',''); -INSERT INTO t2 VALUES (1067,256003,34,'scars','poison','maternal',''); -INSERT INTO t2 VALUES (1068,256004,34,'realest','attitude','hewed',''); -INSERT INTO t2 VALUES (1069,256005,34,'diffusing','dusted','kerosene',''); -INSERT INTO t2 VALUES (1070,258001,34,'clubroom','encompasses','Cubans',''); -INSERT INTO t2 VALUES (1071,258002,34,'Blythe','presentation','photographers',''); -INSERT INTO t2 VALUES (1072,258003,34,'ahead','Kantian','nymph','A'); -INSERT INTO t2 VALUES (1073,258004,34,'reviver','imprecision','bedlam','A'); -INSERT INTO t2 VALUES (1074,258005,34,'retransmitting','saving','north','A'); -INSERT INTO t2 VALUES (1075,258006,34,'landslide','maternal','Schoenberg','A'); -INSERT INTO t2 VALUES (1076,258007,34,'Eiffel','hewed','botany','A'); -INSERT INTO t2 VALUES (1077,258008,34,'absentee','kerosene','curs',''); -INSERT INTO t2 VALUES (1078,258009,34,'aye','Cubans','solidification',''); -INSERT INTO t2 VALUES (1079,258010,34,'forked','photographers','inheritresses',''); -INSERT INTO t2 VALUES (1080,258011,34,'Peruvianizes','nymph','stiller',''); -INSERT INTO t2 VALUES (1081,258101,68,'clerked','bedlam','t1','A'); -INSERT INTO t2 VALUES (1082,258102,68,'tutor','north','suite','A'); -INSERT INTO t2 VALUES (1083,258103,34,'boulevard','Schoenberg','ransomer',''); -INSERT INTO t2 VALUES (1084,258104,68,'shuttered','botany','Willy',''); -INSERT INTO t2 VALUES (1085,258105,68,'quotes','curs','Rena','A'); -INSERT INTO t2 VALUES (1086,258106,68,'Caltech','solidification','Seattle','A'); -INSERT INTO t2 VALUES (1087,258107,68,'Mossberg','inheritresses','relaxes','A'); -INSERT INTO t2 VALUES (1088,258108,68,'kept','stiller','exclaim',''); -INSERT INTO t2 VALUES (1089,258109,68,'roundly','t1','implicated','A'); -INSERT INTO t2 VALUES (1090,258110,68,'features','suite','distinguish',''); -INSERT INTO t2 VALUES (1091,258111,68,'imaginable','ransomer','assayed',''); -INSERT INTO t2 VALUES (1092,258112,68,'controller','Willy','homeowner',''); -INSERT INTO t2 VALUES (1093,258113,68,'racial','Rena','and',''); -INSERT INTO t2 VALUES (1094,258201,34,'uprisings','Seattle','stealth',''); -INSERT INTO t2 VALUES (1095,258202,34,'narrowed','relaxes','coinciding','A'); -INSERT INTO t2 VALUES (1096,258203,34,'cannot','exclaim','founder','A'); -INSERT INTO t2 VALUES (1097,258204,34,'vest','implicated','environing',''); -INSERT INTO t2 VALUES (1098,258205,34,'famine','distinguish','jewelry',''); -INSERT INTO t2 VALUES (1099,258301,34,'sugars','assayed','lemons','A'); -INSERT INTO t2 VALUES (1100,258401,34,'exterminated','homeowner','brokenness','A'); -INSERT INTO t2 VALUES (1101,258402,34,'belays','and','bedpost','A'); -INSERT INTO t2 VALUES (1102,258403,34,'Hodges','stealth','assurers','A'); -INSERT INTO t2 VALUES (1103,258404,34,'translatable','coinciding','annoyers',''); -INSERT INTO t2 VALUES (1104,258405,34,'duality','founder','affixed',''); -INSERT INTO t2 VALUES (1105,258406,34,'recording','environing','warbling',''); -INSERT INTO t2 VALUES (1106,258407,34,'rouses','jewelry','seriously',''); -INSERT INTO t2 VALUES (1107,228123,37,'poison','lemons','boasted',''); -INSERT INTO t2 VALUES (1108,250606,34,'attitude','brokenness','Chantilly',''); -INSERT INTO t2 VALUES (1109,208405,37,'dusted','bedpost','Iranizes',''); -INSERT INTO t2 VALUES (1110,212101,37,'encompasses','assurers','violinist',''); -INSERT INTO t2 VALUES (1111,218206,37,'presentation','annoyers','extramarital',''); -INSERT INTO t2 VALUES (1112,150401,37,'Kantian','affixed','spates',''); -INSERT INTO t2 VALUES (1113,248212,41,'imprecision','warbling','cloakroom',''); -INSERT INTO t2 VALUES (1114,128026,00,'saving','seriously','gazer',''); -INSERT INTO t2 VALUES (1115,128024,00,'maternal','boasted','hand',''); -INSERT INTO t2 VALUES (1116,128027,00,'hewed','Chantilly','tucked',''); -INSERT INTO t2 VALUES (1117,128025,00,'kerosene','Iranizes','gems',''); -INSERT INTO t2 VALUES (1118,128109,00,'Cubans','violinist','clinker',''); -INSERT INTO t2 VALUES (1119,128705,00,'photographers','extramarital','refiner',''); -INSERT INTO t2 VALUES (1120,126303,00,'nymph','spates','callus',''); -INSERT INTO t2 VALUES (1121,128308,00,'bedlam','cloakroom','leopards',''); -INSERT INTO t2 VALUES (1122,128204,00,'north','gazer','comfortingly',''); -INSERT INTO t2 VALUES (1123,128205,00,'Schoenberg','hand','generically',''); -INSERT INTO t2 VALUES (1124,128206,00,'botany','tucked','getters',''); -INSERT INTO t2 VALUES (1125,128207,00,'curs','gems','sexually',''); -INSERT INTO t2 VALUES (1126,118205,00,'solidification','clinker','spear',''); -INSERT INTO t2 VALUES (1127,116801,00,'inheritresses','refiner','serums',''); -INSERT INTO t2 VALUES (1128,116803,00,'stiller','callus','Italianization',''); -INSERT INTO t2 VALUES (1129,116804,00,'t1','leopards','attendants',''); -INSERT INTO t2 VALUES (1130,116802,00,'suite','comfortingly','spies',''); -INSERT INTO t2 VALUES (1131,128605,00,'ransomer','generically','Anthony',''); -INSERT INTO t2 VALUES (1132,118308,00,'Willy','getters','planar',''); -INSERT INTO t2 VALUES (1133,113702,00,'Rena','sexually','cupped',''); -INSERT INTO t2 VALUES (1134,113703,00,'Seattle','spear','cleanser',''); -INSERT INTO t2 VALUES (1135,112103,00,'relaxes','serums','commuters',''); -INSERT INTO t2 VALUES (1136,118009,00,'exclaim','Italianization','honeysuckle',''); -INSERT INTO t2 VALUES (5136,1118009,00,'exclaim','Italianization','honeysuckle',''); -INSERT INTO t2 VALUES (1137,138011,00,'implicated','attendants','orphanage',''); -INSERT INTO t2 VALUES (1138,138010,00,'distinguish','spies','skies',''); -INSERT INTO t2 VALUES (1139,138012,00,'assayed','Anthony','crushers',''); -INSERT INTO t2 VALUES (1140,068304,00,'homeowner','planar','Puritan',''); -INSERT INTO t2 VALUES (1141,078009,00,'and','cupped','squeezer',''); -INSERT INTO t2 VALUES (1142,108013,00,'stealth','cleanser','bruises',''); -INSERT INTO t2 VALUES (1143,084004,00,'coinciding','commuters','bonfire',''); -INSERT INTO t2 VALUES (1144,083402,00,'founder','honeysuckle','Colombo',''); -INSERT INTO t2 VALUES (1145,084003,00,'environing','orphanage','nondecreasing',''); -INSERT INTO t2 VALUES (1146,088504,00,'jewelry','skies','innocents',''); -INSERT INTO t2 VALUES (1147,088005,00,'lemons','crushers','masked',''); -INSERT INTO t2 VALUES (1148,088007,00,'brokenness','Puritan','file',''); -INSERT INTO t2 VALUES (1149,088006,00,'bedpost','squeezer','brush',''); -INSERT INTO t2 VALUES (1150,148025,00,'assurers','bruises','mutilate',''); -INSERT INTO t2 VALUES (1151,148024,00,'annoyers','bonfire','mommy',''); -INSERT INTO t2 VALUES (1152,138305,00,'affixed','Colombo','bulkheads',''); -INSERT INTO t2 VALUES (1153,138306,00,'warbling','nondecreasing','undeclared',''); -INSERT INTO t2 VALUES (1154,152701,00,'seriously','innocents','displacements',''); -INSERT INTO t2 VALUES (1155,148505,00,'boasted','masked','nieces',''); -INSERT INTO t2 VALUES (1156,158003,00,'Chantilly','file','coeducation',''); -INSERT INTO t2 VALUES (1157,156201,00,'Iranizes','brush','brassy',''); -INSERT INTO t2 VALUES (1158,156202,00,'violinist','mutilate','authenticator',''); -INSERT INTO t2 VALUES (1159,158307,00,'extramarital','mommy','Washoe',''); -INSERT INTO t2 VALUES (1160,158402,00,'spates','bulkheads','penny',''); -INSERT INTO t2 VALUES (1161,158401,00,'cloakroom','undeclared','Flagler',''); -INSERT INTO t2 VALUES (1162,068013,00,'gazer','displacements','stoned',''); -INSERT INTO t2 VALUES (1163,068012,00,'hand','nieces','cranes',''); -INSERT INTO t2 VALUES (1164,068203,00,'tucked','coeducation','masterful',''); -INSERT INTO t2 VALUES (1165,088205,00,'gems','brassy','biracial',''); -INSERT INTO t2 VALUES (1166,068704,00,'clinker','authenticator','steamships',''); -INSERT INTO t2 VALUES (1167,068604,00,'refiner','Washoe','windmills',''); -INSERT INTO t2 VALUES (1168,158502,00,'callus','penny','exploit',''); -INSERT INTO t2 VALUES (1169,123103,00,'leopards','Flagler','riverfront',''); -INSERT INTO t2 VALUES (1170,148026,00,'comfortingly','stoned','sisterly',''); -INSERT INTO t2 VALUES (1171,123302,00,'generically','cranes','sharpshoot',''); -INSERT INTO t2 VALUES (1172,076503,00,'getters','masterful','mittens',''); -INSERT INTO t2 VALUES (1173,126304,00,'sexually','biracial','interdependency',''); -INSERT INTO t2 VALUES (1174,068306,00,'spear','steamships','policy',''); -INSERT INTO t2 VALUES (1175,143504,00,'serums','windmills','unleashing',''); -INSERT INTO t2 VALUES (1176,160201,00,'Italianization','exploit','pretenders',''); -INSERT INTO t2 VALUES (1177,148028,00,'attendants','riverfront','overstatements',''); -INSERT INTO t2 VALUES (1178,148027,00,'spies','sisterly','birthed',''); -INSERT INTO t2 VALUES (1179,143505,00,'Anthony','sharpshoot','opportunism',''); -INSERT INTO t2 VALUES (1180,108014,00,'planar','mittens','showroom',''); -INSERT INTO t2 VALUES (1181,076104,00,'cupped','interdependency','compromisingly',''); -INSERT INTO t2 VALUES (1182,078106,00,'cleanser','policy','Medicare',''); -INSERT INTO t2 VALUES (1183,126102,00,'commuters','unleashing','corresponds',''); -INSERT INTO t2 VALUES (1184,128029,00,'honeysuckle','pretenders','hardware',''); -INSERT INTO t2 VALUES (1185,128028,00,'orphanage','overstatements','implant',''); -INSERT INTO t2 VALUES (1186,018410,00,'skies','birthed','Alicia',''); -INSERT INTO t2 VALUES (1187,128110,00,'crushers','opportunism','requesting',''); -INSERT INTO t2 VALUES (1188,148506,00,'Puritan','showroom','produced',''); -INSERT INTO t2 VALUES (1189,123303,00,'squeezer','compromisingly','criticizes',''); -INSERT INTO t2 VALUES (1190,123304,00,'bruises','Medicare','backer',''); -INSERT INTO t2 VALUES (1191,068504,00,'bonfire','corresponds','positively',''); -INSERT INTO t2 VALUES (1192,068305,00,'Colombo','hardware','colicky',''); -INSERT INTO t2 VALUES (1193,000000,00,'nondecreasing','implant','thrillingly',''); select t2.fld3 from t2 where companynr = 58 and fld3 like "%imaginable%"; fld3 imaginable @@ -1687,16 +488,6 @@ price2 double(11,0), key (period), key (name) ); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1001,"Iranizes",37,5987435,234724); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1002,"violinist",37,28357832,8723648); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1003,"extramarital",37,39654943,235872); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1004,"spates",78,726498,72987523); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1005,"cloakroom",78,98439034,823742); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1006,"gazer",101,834598,27348324); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1007,"hand",154,983543950,29837423); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1008,"tucked",311,234298,3275892); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1009,"gems",447,2374834,9872392); -INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1010,"clinker",512,786542,76234234); create temporary table tmp type = myisam select * from t3; insert into t3 select * from tmp; insert into tmp select * from t3; @@ -2499,18 +1290,6 @@ companyname char(30) NOT NULL default '', PRIMARY KEY (companynr), UNIQUE KEY companyname(companyname) ) TYPE=MyISAM MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames'; -INSERT INTO t4 (companynr, companyname) VALUES (29,'company 1'); -INSERT INTO t4 (companynr, companyname) VALUES (34,'company 2'); -INSERT INTO t4 (companynr, companyname) VALUES (36,'company 3'); -INSERT INTO t4 (companynr, companyname) VALUES (37,'company 4'); -INSERT INTO t4 (companynr, companyname) VALUES (40,'company 5'); -INSERT INTO t4 (companynr, companyname) VALUES (41,'company 6'); -INSERT INTO t4 (companynr, companyname) VALUES (53,'company 7'); -INSERT INTO t4 (companynr, companyname) VALUES (58,'company 8'); -INSERT INTO t4 (companynr, companyname) VALUES (65,'company 9'); -INSERT INTO t4 (companynr, companyname) VALUES (68,'company 10'); -INSERT INTO t4 (companynr, companyname) VALUES (50,'company 11'); -INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); select STRAIGHT_JOIN t2.companynr,companyname from t4,t2 where t2.companynr=t4.companynr group by t2.companynr; companynr companyname 00 Unknown diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test index 9884c88b420..3e23fa1a3f2 100644 --- a/mysql-test/t/select.test +++ b/mysql-test/t/select.test @@ -40,6 +40,7 @@ CREATE TABLE t2 ( # Populate table # +--disable_query_log INSERT INTO t2 VALUES (1,000001,00,'Omaha','teethe','neat',''); INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W'); INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring',''); @@ -1239,6 +1240,7 @@ INSERT INTO t2 VALUES (1190,123304,00,'bruises','Medicare','backer',''); INSERT INTO t2 VALUES (1191,068504,00,'bonfire','corresponds','positively',''); INSERT INTO t2 VALUES (1192,068305,00,'Colombo','hardware','colicky',''); INSERT INTO t2 VALUES (1193,000000,00,'nondecreasing','implant','thrillingly',''); +--enable_query_log # # Search with a key @@ -1364,6 +1366,7 @@ create table t3 ( key (name) ); +--disable_query_log INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1001,"Iranizes",37,5987435,234724); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1002,"violinist",37,28357832,8723648); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1003,"extramarital",37,39654943,235872); @@ -1374,6 +1377,7 @@ INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1007,"hand",154,9835 INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1008,"tucked",311,234298,3275892); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1009,"gems",447,2374834,9872392); INSERT INTO t3 (period,name,companynr,price,price2) VALUES (1010,"clinker",512,786542,76234234); +--enable_query_log create temporary table tmp type = myisam select * from t3; @@ -1496,6 +1500,7 @@ create table t4 ( UNIQUE KEY companyname(companyname) ) TYPE=MyISAM MAX_ROWS=50 PACK_KEYS=1 COMMENT='companynames'; +--disable_query_log INSERT INTO t4 (companynr, companyname) VALUES (29,'company 1'); INSERT INTO t4 (companynr, companyname) VALUES (34,'company 2'); INSERT INTO t4 (companynr, companyname) VALUES (36,'company 3'); @@ -1508,6 +1513,7 @@ INSERT INTO t4 (companynr, companyname) VALUES (65,'company 9'); INSERT INTO t4 (companynr, companyname) VALUES (68,'company 10'); INSERT INTO t4 (companynr, companyname) VALUES (50,'company 11'); INSERT INTO t4 (companynr, companyname) VALUES (00,'Unknown'); +--enable_query_log # # Test of stright join to force a full join. -- cgit v1.2.1 From 524fe47d0e8249e82d986eb0a3e30f6d85b2cdd2 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Sep 2003 14:00:43 +0400 Subject: fixed test result to be in sync with the optimiser --- mysql-test/r/distinct.result | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index da0c6a5eb72..9fcb001de2c 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -303,9 +303,9 @@ t1 index id id 4 NULL 2 Using index; Using temporary t2 index id id 8 NULL 1 Using index; Distinct t3 index id id 8 NULL 1 Using index; Distinct j_lj_t2 index id id 4 NULL 2 Using where; Using index; Distinct -t2_lj index id id 8 NULL 1 Using where; Using index; Distinct +t2_lj ref id id 4 j_lj_t2.id 1 Using where; Using index; Distinct j_lj_t3 index id id 4 NULL 2 Using where; Using index; Distinct -t3_lj index id id 8 NULL 1 Using where; Using index; Distinct +t3_lj ref id id 4 j_lj_t3.id 1 Using where; Using index; Distinct SELECT DISTINCT t1.id from -- cgit v1.2.1 From c5e6bcea695811136360462efd7ee04f15c7dfff Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 17 Sep 2003 21:52:05 +0400 Subject: Applied Monty corrections to the FULL SCAN optimiser bug patch. mysql-test/r/distinct.result: test results reverted mysql-test/r/order_by.result: test results reverted sql/sql_select.cc: found_constrain renamed to found_constraint We don't perform full cartesian product in case when JOIN BUFFER is used: it was taken into account. s->read_time may contain range index read time, so to get full table scan time is necessary to call s->table->file->scan_time(). --- mysql-test/r/distinct.result | 6 +++--- mysql-test/r/order_by.result | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 9fcb001de2c..a0343f13394 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -173,9 +173,9 @@ INSERT INTO t2 values (1),(2),(3); INSERT INTO t3 VALUES (1,'1'),(2,'2'),(1,'1'),(2,'2'); explain SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; table type possible_keys key key_len ref rows Extra -t2 index a a 4 NULL 5 Using index; Using temporary -t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 -t3 index a a 5 NULL 5 Using where; Using index +t3 index a a 5 NULL 6 Using index; Using temporary +t2 index a a 4 NULL 5 Using index; Distinct +t1 eq_ref PRIMARY PRIMARY 4 t2.a 1 Using where; Distinct SELECT distinct t3.a FROM t3,t2,t1 WHERE t3.a=t1.b AND t1.a=t2.a; a 1 diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 64fac8af872..58f4972d08f 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -307,17 +307,17 @@ table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 8 Using where; Using index explain select * from t1 where a = 2 and b >0 order by a desc,b desc; table type possible_keys key key_len ref rows Extra -t1 range a a 9 NULL 4 Using where; Using index +t1 range a a 9 NULL 5 Using where; Using index explain select * from t1 where a = 2 and b is null order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 ref a a 9 const,const 1 Using where; Using index; Using filesort explain select * from t1 where a = 2 and (b is null or b > 0) order by a desc,b desc; table type possible_keys key key_len ref rows Extra -t1 range a a 9 NULL 5 Using where; Using index +t1 range a a 9 NULL 6 Using where; Using index explain select * from t1 where a = 2 and b > 0 order by a desc,b desc; table type possible_keys key key_len ref rows Extra -t1 range a a 9 NULL 4 Using where; Using index +t1 range a a 9 NULL 5 Using where; Using index explain select * from t1 where a = 2 and b < 2 order by a desc,b desc; table type possible_keys key key_len ref rows Extra t1 range a a 9 NULL 2 Using where; Using index @@ -466,8 +466,8 @@ t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t1.gid,t3.skr; table type possible_keys key key_len ref rows Extra -t1 index PRIMARY PRIMARY 4 NULL 6 Using index -t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 Using where +t3 ALL PRIMARY NULL NULL NULL 6 Using temporary; Using filesort +t1 eq_ref PRIMARY PRIMARY 4 t3.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t2.sid, t3.uid from t2, t1, t3 where t2.gid = t1.gid and t2.uid = t3.uid order by t3.uid, t1.gid; table type possible_keys key key_len ref rows Extra t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort @@ -475,8 +475,8 @@ t2 eq_ref PRIMARY,uid PRIMARY 4 t1.gid 1 t3 eq_ref PRIMARY PRIMARY 2 t2.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t3.skr,t1.gid; table type possible_keys key key_len ref rows Extra -t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort -t3 eq_ref PRIMARY PRIMARY 2 t1.gid 1 Using where +t3 ALL PRIMARY NULL NULL NULL 6 Using temporary; Using filesort +t1 eq_ref PRIMARY PRIMARY 4 t3.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.skr = t3.uid order by t1.gid,t3.skr; table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort -- cgit v1.2.1 From 11c19587e1aabdac8d2a3d7c6a00f7ce2a51fec3 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 19 Sep 2003 19:07:41 +0200 Subject: removing my chmods so that the test can be run on non-Unix platforms (kind request from the Novell team). Note that old chmods in rpl_rotate_logs remain. mysql-test/r/rpl000009.result: result update mysql-test/t/rpl000009.test: removing my chmods so that the test can be run on non-Unix platforms. --- mysql-test/r/rpl000009.result | 12 ------------ mysql-test/t/rpl000009.test | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 20 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result index 4a8057467f2..569dd301143 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl000009.result @@ -111,22 +111,10 @@ n s 2 two bar 3 three bar 4 four bar -insert into bar.t1 values(10, 'should be there'); -flush tables; -load data from master; -Error on delete of './bar/t1.MYI' (Errcode: 13) -select * from bar.t1; -n s -1 one bar -2 two bar -3 three bar -4 four bar -10 should be there load table bar.t1 from master; Table 't1' already exists drop table bar.t1; load table bar.t1 from master; -start slave; drop database bar; drop database foo; drop database foo; diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 975cfbf9a65..e019e1fc3a7 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -110,13 +110,14 @@ select * from bar.t1; # Check that LOAD DATA FROM MASTER reports the error if it can't drop a # table to be overwritten. -insert into bar.t1 values(10, 'should be there'); -flush tables; -system chmod 500 var/slave-data/bar/; ---error 6 -load data from master; # should fail (errno 13) -system chmod 700 var/slave-data/bar/; -select * from bar.t1; # should contain the row (10, ...) +# DISABLED FOR NOW AS chmod IS NOT PORTABLE ON NON-UNIX +# insert into bar.t1 values(10, 'should be there'); +# flush tables; +# system chmod 500 var/slave-data/bar/; +# --error 6 +# load data from master; # should fail (errno 13) +# system chmod 700 var/slave-data/bar/; +# select * from bar.t1; # should contain the row (10, ...) # Check that LOAD TABLE FROM MASTER fails if the table exists on slave @@ -126,7 +127,8 @@ drop table bar.t1; load table bar.t1 from master; # as LOAD DATA FROM MASTER failed it did not restart slave threads -start slave; +# DISABLED FOR NOW +# start slave; # Now time for cleanup connection master; -- cgit v1.2.1 From 9e2b97fb25defd3478c0e27f9ac85702b24623bf Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 24 Sep 2003 16:13:47 +0500 Subject: #1169: Add --exec command to mysqltest --- mysql-test/mysql-test-run.sh | 8 ++++++++ mysql-test/r/mysqldump.result | 17 +++++++++++++++++ mysql-test/t/mysqldump.test | 10 ++++++++++ 3 files changed, 35 insertions(+) create mode 100644 mysql-test/r/mysqldump.result create mode 100644 mysql-test/t/mysqldump.test (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 1d1293f81d2..a2643e84d9f 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -428,6 +428,11 @@ if [ x$SOURCE_DIST = x1 ] ; then else MYSQL_TEST="$BASEDIR/client/mysqltest" fi + if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then + MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + else + MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" fi @@ -449,6 +454,7 @@ else MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" fi MYSQL_TEST="$BASEDIR/bin/mysqltest" + MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" MYSQLADMIN="$BASEDIR/bin/mysqladmin" WAIT_PID="$BASEDIR/bin/mysql_waitpid" MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" @@ -466,6 +472,8 @@ else fi fi +export MYSQL_DUMP + if [ -z "$MASTER_MYSQLD" ] then MASTER_MYSQLD=$MYSQLD diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result new file mode 100644 index 00000000000..085cf2788f9 --- /dev/null +++ b/mysql-test/r/mysqldump.result @@ -0,0 +1,17 @@ +DROP TABLE IF EXISTS t1; +CREATE TABLE t1(a int); +INSERT INTO t1 VALUES (1), (2); + + + + + + 1 + + + 2 + +
+ + +DROP TABLE t1; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test new file mode 100644 index 00000000000..c98fd4050f2 --- /dev/null +++ b/mysql-test/t/mysqldump.test @@ -0,0 +1,10 @@ +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +# XML output + +CREATE TABLE t1(a int); +INSERT INTO t1 VALUES (1), (2); +--exec $MYSQL_DUMP -X test t1 +DROP TABLE t1; -- cgit v1.2.1 From 97933001fd9141944169aa22b279266100994397 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 24 Sep 2003 16:46:19 +0500 Subject: Added MYSQL_BINLOG variable. --- mysql-test/mysql-test-run.sh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index a2643e84d9f..e63c8866d5a 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -433,6 +433,11 @@ if [ x$SOURCE_DIST = x1 ] ; then else MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" fi + if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then + MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" + else + MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" + fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" fi @@ -455,6 +460,7 @@ else fi MYSQL_TEST="$BASEDIR/bin/mysqltest" MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog" MYSQLADMIN="$BASEDIR/bin/mysqladmin" WAIT_PID="$BASEDIR/bin/mysql_waitpid" MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" @@ -473,6 +479,7 @@ else fi export MYSQL_DUMP +export MYSQL_BINLOG if [ -z "$MASTER_MYSQLD" ] then -- cgit v1.2.1 From 87bc22a509f7309defe94d1579844cddca7218b3 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 24 Sep 2003 23:25:58 +0400 Subject: Test for mysqlbinlog Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec event without seeing Create_file event before mysql-test/mysql-test-run.sh: Now mysqlbinlog will use proper temporary directory --- mysql-test/mysql-test-run.sh | 6 +-- mysql-test/r/mysqlbinlog.result | 84 ++++++++++++++++++++++++++++++++ mysql-test/t/mysqlbinlog-master.opt | 1 + mysql-test/t/mysqlbinlog.test | 95 +++++++++++++++++++++++++++++++++++++ 4 files changed, 183 insertions(+), 3 deletions(-) create mode 100644 mysql-test/r/mysqlbinlog.result create mode 100644 mysql-test/t/mysqlbinlog-master.opt create mode 100644 mysql-test/t/mysqlbinlog.test (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index e63c8866d5a..498c7ccf5ed 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -434,9 +434,9 @@ if [ x$SOURCE_DIST = x1 ] ; then MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" fi if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then - MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" + MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog --local-load=$MYSQL_TMP_DIR" else - MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" + MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog --local-load=$MYSQL_TMP_DIR" fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" @@ -460,7 +460,7 @@ else fi MYSQL_TEST="$BASEDIR/bin/mysqltest" MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" - MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog" + MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog --local-load=$MYSQL_TMP_DIR" MYSQLADMIN="$BASEDIR/bin/mysqladmin" WAIT_PID="$BASEDIR/bin/mysql_waitpid" MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result new file mode 100644 index 00000000000..63f026274af --- /dev/null +++ b/mysql-test/r/mysqlbinlog.result @@ -0,0 +1,84 @@ +drop table if exists t1; +drop table if exists t2; +set timestamp=1000000000; +create table t1 (word varchar(20)); +create table t2 (id int auto_increment not null primary key); +insert into t1 values ("abirvalg"); +insert into t2 values (); +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +insert into t1 values ("Alas"); +flush logs; + +--- Local -- +use test; +SET TIMESTAMP=1000000000; +create table t1 (word varchar(20)); +SET TIMESTAMP=1000000000; +create table t2 (id int auto_increment not null primary key); +SET TIMESTAMP=1000000000; +insert into t1 values ("abirvalg"); +SET INSERT_ID=1; +SET TIMESTAMP=1000000000; +insert into t2 values (); +LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-1-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-2-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-3-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-4-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-5-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); + +--- Broken LOAD DATA -- +use test; +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); + +--- --database -- +SET INSERT_ID=1; + +--- --position -- +use test; +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); + +--- Remote -- +use test; +SET TIMESTAMP=1000000000; +create table t1 (word varchar(20)); +SET TIMESTAMP=1000000000; +create table t2 (id int auto_increment not null primary key); +SET TIMESTAMP=1000000000; +insert into t1 values ("abirvalg"); +SET INSERT_ID=1; +SET TIMESTAMP=1000000000; +insert into t2 values (); +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); + +--- Broken LOAD DATA -- +use test; +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); + +--- --database -- +use test; +SET TIMESTAMP=1000000000; +create table t1 (word varchar(20)); +SET TIMESTAMP=1000000000; +create table t2 (id int auto_increment not null primary key); +SET TIMESTAMP=1000000000; +insert into t1 values ("abirvalg"); +SET INSERT_ID=1; +SET TIMESTAMP=1000000000; +insert into t2 values (); +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); + +--- --position -- +use test; +SET TIMESTAMP=1000000000; +insert into t1 values ("Alas"); +drop table t1; diff --git a/mysql-test/t/mysqlbinlog-master.opt b/mysql-test/t/mysqlbinlog-master.opt new file mode 100644 index 00000000000..ac1a87c73b3 --- /dev/null +++ b/mysql-test/t/mysqlbinlog-master.opt @@ -0,0 +1 @@ +--max-binlog-size=4096 diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test new file mode 100644 index 00000000000..78992cb1e11 --- /dev/null +++ b/mysql-test/t/mysqlbinlog.test @@ -0,0 +1,95 @@ +# We are using .opt file since we need small binlog size +--disable_warnings +drop table if exists t1; +drop table if exists t2; +--enable_warnings + +# we need this for getting fixed timestamps inside of this test +set timestamp=1000000000; + +create table t1 (word varchar(20)); +create table t2 (id int auto_increment not null primary key); + +# simple test for simple statement and various events +insert into t1 values ("abirvalg"); +insert into t2 values (); +# Should be uncommented in 4.1 +# set @a:=1 +# insert into t2 values (@a); + +# test for load data and load data distributed among the several +# files (we need to fill up first binlog) +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +load data infile '../../std_data/words.dat' into table t1; +# simple query to show more in second binlog +insert into t1 values ("Alas"); +flush logs; + +# delimiters are for easier debugging in future +--disable_query_log +select "--- Local --" as ""; +--enable_query_log + +# +# We should use --short-form everywhere because in other case output will +# be time dependend. Better than nothing. +# + +--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.001 +# this should not fail but shouldn't produce any working statements +--disable_query_log +select "--- Broken LOAD DATA --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.002 + +# this should show almost nothing +--disable_query_log +select "--- --database --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --database=nottest $MYSQL_TEST_DIR/var/log/master-bin.001 + +# this test for position option +--disable_query_log +select "--- --position --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --position=27 $MYSQL_TEST_DIR/var/log/master-bin.002 + +# These are tests for remote binlog. +# They should return the same as previous test. +# But now they are not. V. Vagin should fix this. +# We test all the same options second time since code for remote case is +# essentially different. If code for both cases will be unified we'll be +# able to throw out most of this. + +--disable_query_log +select "--- Remote --" as ""; +--enable_query_log + +# This is broken now +# By the way it seems that remote version fetches all events with name >= master-bin.001 +--exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 + +# This is broken too +--disable_query_log +select "--- Broken LOAD DATA --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 + +# And this too ! (altough it is documented) +--disable_query_log +select "--- --database --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 + +# Strangely but this works +--disable_query_log +select "--- --position --" as ""; +--enable_query_log +--exec $MYSQL_BINLOG --short-form --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 + +# clean up +drop table t1; -- cgit v1.2.1 From dae13b541540953f11397d70f482b77d07699f77 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 25 Sep 2003 00:14:46 +0200 Subject: Fix for BUG#1391: "If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files" (the bug is in the master) mysql-test/r/rpl_loaddata.result: result update mysql-test/std_data/rpl_loaddata2.dat: change to introduce a unique key violation mysql-test/t/rpl_loaddata.test: testcase for bug#1391. sql/sql_load.cc: fix for bug#1391: for a small file, we had in the binlog only the Create_file, not the Delete_file (the Create_file was written when the READ_INFO was destroyed). --- mysql-test/r/rpl_loaddata.result | 13 ++++++++++++- mysql-test/std_data/rpl_loaddata2.dat | 2 +- mysql-test/t/rpl_loaddata.test | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index 0302381c119..8b910d0d183 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -19,7 +19,7 @@ select * from t3; day id category name 2003-02-22 2461 b a a a @ %  ' " a 2003-03-22 2161 c asdf -2003-04-22 2416 a bbbbb +2003-03-22 2416 a bbbbb show master status; File Position Binlog_do_db Binlog_ignore_db slave-bin.001 964 @@ -55,3 +55,14 @@ reset slave; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 4 +reset master; +create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), +unique(day)); +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields +terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by +'\n##\n' starting by '>' ignore 1 lines; +Duplicate entry '2003-03-22' for key 1 +show master status; +File Position Binlog_do_db Binlog_ignore_db +master-bin.001 491 +drop table t2; diff --git a/mysql-test/std_data/rpl_loaddata2.dat b/mysql-test/std_data/rpl_loaddata2.dat index b883d9dcd58..04d84f1f45e 100644 --- a/mysql-test/std_data/rpl_loaddata2.dat +++ b/mysql-test/std_data/rpl_loaddata2.dat @@ -4,5 +4,5 @@ ## >2003-03-22,2161,%c%,%asdf% ## ->2003-04-22,2416,%a%,%bbbbb% +>2003-03-22,2416,%a%,%bbbbb% ## diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test index 4c4ff6a093e..a3bb8c9aec9 100644 --- a/mysql-test/t/rpl_loaddata.test +++ b/mysql-test/t/rpl_loaddata.test @@ -112,3 +112,18 @@ stop slave; reset slave; --replace_result $MASTER_MYPORT MASTER_PORT show slave status; + +# Finally, see if logging is done ok on master for a failing LOAD DATA INFILE + +connection master; +reset master; +create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60), +unique(day)); +--error 1062; +load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields +terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by +'\n##\n' starting by '>' ignore 1 lines; +# To test that there is Create_file & Delete_file, we test if the binlog is as +# long as expected (can't do SHOW BINLOG EVENTS because of varying file_id). +show master status; +drop table t2; -- cgit v1.2.1 From 2d9e4e66981844fec25185660f9164b49fc58126 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 24 Sep 2003 19:30:20 -0400 Subject: fixed bug #1194 (changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int) mysql-test/r/user_var.result: added tests for bug #1194 mysql-test/t/user_var.test: added tests for bug #1194 --- mysql-test/r/user_var.result | 32 ++++++++++++++++++++++++++++++++ mysql-test/t/user_var.test | 19 +++++++++++++++++++ 2 files changed, 51 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 67e55acb29b..d94ab6f57c3 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -42,3 +42,35 @@ select @a:=10, @b:=2, @a > @b, @a < @b; select @a:="10", @b:="2", @a > @b, @a < @b; @a:="10" @b:="2" @a > @b @a < @b 10 2 0 1 +select @a:=1; +@a:=1 +1 +select @a, @a:=1; +@a @a:=1 +1 1 +create table t1 (id int); +insert into t1 values (1); +select @c:=0; +@c:=0 +0 +update t1 SET id=(@c:=@c+1); +select @c; +@c +1 +select @c:=0; +@c:=0 +0 +update t1 set id=(@c:=@c+1); +select @c; +@c +1 +select @c:=0; +@c:=0 +0 +select @c:=@c+1; +@c:=@c+1 +1 +drop table t1; +select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; +@a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b +10 2 1 10 2 0 10 2 1 10 2 0 diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index f5f91a8a680..1e466c149bb 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -23,3 +23,22 @@ select @a:=10, @b:=1, @a > @b, @a < @b; select @a:="10", @b:="1", @a > @b, @a < @b; select @a:=10, @b:=2, @a > @b, @a < @b; select @a:="10", @b:="2", @a > @b, @a < @b; + +# Fixed bug #1194 +select @a:=1; +select @a, @a:=1; + +create table t1 (id int); +insert into t1 values (1); +select @c:=0; +update t1 SET id=(@c:=@c+1); +select @c; +select @c:=0; +update t1 set id=(@c:=@c+1); +select @c; +select @c:=0; +select @c:=@c+1; +drop table t1; + +# just fof fun :) +select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; \ No newline at end of file -- cgit v1.2.1 From 3106e3119a2b3ee9155360279e48093d0e3b7d45 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 28 Sep 2003 18:31:49 +0200 Subject: Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES": it's just backquoting the db's and table's names when writing DROP TEMPORARY TABLE to the binlog when a connection ends. A testcase for this. sql/sql_base.cc: backquote db and table name when writing DROP TEMPORARY TABLE to the binlog when a connection ends. --- mysql-test/r/drop_temp_table.result | 11 +++++++++++ mysql-test/t/drop_temp_table.test | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 mysql-test/r/drop_temp_table.result create mode 100644 mysql-test/t/drop_temp_table.test (limited to 'mysql-test') diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result new file mode 100644 index 00000000000..40e363dbf00 --- /dev/null +++ b/mysql-test/r/drop_temp_table.result @@ -0,0 +1,11 @@ +reset master; +create database `drop-temp+table-test`; +use `drop-temp+table-test`; +create temporary table `table:name` (a int); +show binlog events; +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 +master-bin.001 79 Query 1 79 use test; create database `drop-temp+table-test` +master-bin.001 152 Query 1 152 use drop-temp+table-test; create temporary table `table:name` (a int) +master-bin.001 246 Query 1 246 use drop-temp+table-test; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` +drop database `drop-temp+table-test`; diff --git a/mysql-test/t/drop_temp_table.test b/mysql-test/t/drop_temp_table.test new file mode 100644 index 00000000000..4849e998bf5 --- /dev/null +++ b/mysql-test/t/drop_temp_table.test @@ -0,0 +1,13 @@ +connect (con1,localhost,root,,); +connect (con2,localhost,root,,); +connection con1; +reset master; +create database `drop-temp+table-test`; +use `drop-temp+table-test`; +create temporary table `table:name` (a int); +disconnect con1; +connection con2; +let $VERSION=`select version()`; +--replace_result $VERSION VERSION +show binlog events; +drop database `drop-temp+table-test`; -- cgit v1.2.1 From e03265d4d585a86b132c6119cb6363839c2f6e5b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 29 Sep 2003 12:31:35 +0300 Subject: Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog) Add quoting for use `database` for mysqlbinlog Removed test ins0000001 Add support for --replace for exec in mysqltest Don't refer to install dir in mysqlbinlog.result BitKeeper/deleted/.del-ins000001.result~f45c599efdf8352b: Delete: mysql-test/r/ins000001.result BitKeeper/deleted/.del-ins000001.test~2428ee5c9b1bc483: Delete: mysql-test/t/ins000001.test client/mysqlbinlog.cc: Removed random chars after filename for LOAD DATA INFILE client/mysqltest.c: Add support for --replace for 'exec' mysql-test/r/drop_temp_table.result: Updated results after quoting change mysql-test/r/fulltext_multi.result: Updated results after quoting change mysql-test/r/fulltext_order_by.result: Updated results after quoting change mysql-test/r/insert.result: New tests mysql-test/r/insert_select.result: Updated results after quoting change mysql-test/r/mix_innodb_myisam_binlog.result: Updated results after quoting change mysql-test/r/mysqlbinlog.result: Updated results after quoting change mysql-test/r/rpl_log.result: Updated results after quoting change mysql-test/t/fulltext_multi.test: Remove 'use' mysql-test/t/fulltext_order_by.test: Remove 'use' mysql-test/t/insert.test: Merge test with ins0000001.test mysql-test/t/mysqlbinlog.test: Don't refer to install dir in result sql/log_event.cc: Add quoting for use `database` for mysqlbinlog support-files/mysql.server.sh: Move pid_file test after arguments have been parsed --- mysql-test/r/drop_temp_table.result | 6 +- mysql-test/r/fulltext_multi.result | 1 - mysql-test/r/fulltext_order_by.result | 1 - mysql-test/r/ins000001.result | 13 ---- mysql-test/r/insert.result | 22 +++++-- mysql-test/r/insert_select.result | 2 +- mysql-test/r/mix_innodb_myisam_binlog.result | 94 ++++++++++++++-------------- mysql-test/r/mysqlbinlog.result | 13 ++-- mysql-test/r/rpl_log.result | 56 ++++++++--------- mysql-test/t/fulltext_multi.test | 2 +- mysql-test/t/fulltext_order_by.test | 1 - mysql-test/t/ins000001.test | 9 --- mysql-test/t/insert.test | 26 +++++--- mysql-test/t/mysqlbinlog.test | 6 +- 14 files changed, 125 insertions(+), 127 deletions(-) delete mode 100644 mysql-test/r/ins000001.result delete mode 100644 mysql-test/t/ins000001.test (limited to 'mysql-test') diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 40e363dbf00..385a3fb6e5c 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -5,7 +5,7 @@ create temporary table `table:name` (a int); show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.001 79 Query 1 79 use test; create database `drop-temp+table-test` -master-bin.001 152 Query 1 152 use drop-temp+table-test; create temporary table `table:name` (a int) -master-bin.001 246 Query 1 246 use drop-temp+table-test; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` +master-bin.001 79 Query 1 79 use `test`; create database `drop-temp+table-test` +master-bin.001 152 Query 1 152 use `drop-temp+table-test`; create temporary table `table:name` (a int) +master-bin.001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` drop database `drop-temp+table-test`; diff --git a/mysql-test/r/fulltext_multi.result b/mysql-test/r/fulltext_multi.result index 72b7102fd3f..968b00020e2 100644 --- a/mysql-test/r/fulltext_multi.result +++ b/mysql-test/r/fulltext_multi.result @@ -1,4 +1,3 @@ -use test; DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( a int(11) NOT NULL auto_increment, diff --git a/mysql-test/r/fulltext_order_by.result b/mysql-test/r/fulltext_order_by.result index c0e72ff789f..bfee9eba280 100644 --- a/mysql-test/r/fulltext_order_by.result +++ b/mysql-test/r/fulltext_order_by.result @@ -1,4 +1,3 @@ -use test; DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/r/ins000001.result b/mysql-test/r/ins000001.result deleted file mode 100644 index ec4f73e7a5d..00000000000 --- a/mysql-test/r/ins000001.result +++ /dev/null @@ -1,13 +0,0 @@ -use test; -drop table if exists t1,t2; -create table t1 (email varchar(50)); -insert into t1 values ('sasha@mysql.com'),('monty@mysql.com'), -('foo@hotmail.com'),('foo@aol.com'),('bar@aol.com'); -create table t2(id int not null auto_increment primary key, -t2 varchar(50), unique(t2)); -insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1; -select * from t2; -id t2 -1 mysql.com -2 hotmail.com -3 aol.com diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index ebcb7721822..270994e3998 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -1,4 +1,4 @@ -drop table if exists t1; +drop table if exists t1,t2; create table t1 (a int not null); insert into t1 values (1); insert into t1 values (a+2); @@ -68,9 +68,19 @@ id 0 2 drop table t1; -drop database if exists foo; -create database foo; -use foo; +create table t1 (email varchar(50)); +insert into t1 values ('sasha@mysql.com'),('monty@mysql.com'),('foo@hotmail.com'),('foo@aol.com'),('bar@aol.com'); +create table t2(id int not null auto_increment primary key, t2 varchar(50), unique(t2)); +insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1; +select * from t2; +id t2 +1 mysql.com +2 hotmail.com +3 aol.com +drop table t1,t2; +drop database if exists mysqltest; +create database mysqltest; +use mysqltest; create table t1 (c int); -insert into foo.t1 set foo.t1.c = '1'; -drop database foo; +insert into mysqltest.t1 set mysqltest.t1.c = '1'; +drop database mysqltest; diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 0142ef68993..23cb7244f48 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -75,7 +75,7 @@ Duplicate entry '2' for key 1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.001 79 Query 1 79 use test; insert into t1 select * from t2 +master-bin.001 79 Query 1 79 use `test`; insert into t1 select * from t2 drop table t1, t2; drop table if exists t1, t2; create table t1 (a int not null); diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index cd96584b6a4..7b266544c92 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -8,10 +8,10 @@ insert into t2 select * from t1; commit; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(1) -master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 244 Query 1 244 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(1) +master-bin.001 178 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 244 Query 1 244 use `test`; COMMIT delete from t1; delete from t2; reset master; @@ -22,10 +22,10 @@ rollback; Warning: Some non-transactional changed tables couldn't be rolled back show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(2) -master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 244 Query 1 244 use test; ROLLBACK +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(2) +master-bin.001 178 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 244 Query 1 244 use `test`; ROLLBACK delete from t1; delete from t2; reset master; @@ -39,13 +39,13 @@ Warning: Some non-transactional changed tables couldn't be rolled back commit; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(3) -master-bin.001 178 Query 1 79 use test; savepoint my_savepoint -master-bin.001 235 Query 1 79 use test; insert into t1 values(4) -master-bin.001 294 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint -master-bin.001 429 Query 1 429 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(3) +master-bin.001 178 Query 1 79 use `test`; savepoint my_savepoint +master-bin.001 235 Query 1 79 use `test`; insert into t1 values(4) +master-bin.001 294 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 360 Query 1 79 use `test`; rollback to savepoint my_savepoint +master-bin.001 429 Query 1 429 use `test`; COMMIT delete from t1; delete from t2; reset master; @@ -64,14 +64,14 @@ a 7 show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(5) -master-bin.001 178 Query 1 79 use test; savepoint my_savepoint -master-bin.001 235 Query 1 79 use test; insert into t1 values(6) -master-bin.001 294 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 360 Query 1 79 use test; rollback to savepoint my_savepoint -master-bin.001 429 Query 1 79 use test; insert into t1 values(7) -master-bin.001 488 Query 1 488 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(5) +master-bin.001 178 Query 1 79 use `test`; savepoint my_savepoint +master-bin.001 235 Query 1 79 use `test`; insert into t1 values(6) +master-bin.001 294 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 360 Query 1 79 use `test`; rollback to savepoint my_savepoint +master-bin.001 429 Query 1 79 use `test`; insert into t1 values(7) +master-bin.001 488 Query 1 488 use `test`; COMMIT delete from t1; delete from t2; reset master; @@ -86,10 +86,10 @@ get_lock("a",10) 1 show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(8) -master-bin.001 178 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 244 Query 1 244 use test; ROLLBACK +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(8) +master-bin.001 178 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 244 Query 1 244 use `test`; ROLLBACK delete from t1; delete from t2; reset master; @@ -97,8 +97,8 @@ insert into t1 values(9); insert into t2 select * from t1; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; insert into t1 values(9) -master-bin.001 138 Query 1 138 use test; insert into t2 select * from t1 +master-bin.001 79 Query 1 79 use `test`; insert into t1 values(9) +master-bin.001 138 Query 1 138 use `test`; insert into t2 select * from t1 delete from t1; delete from t2; reset master; @@ -107,17 +107,17 @@ begin; insert into t2 select * from t1; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; insert into t1 values(10) -master-bin.001 139 Query 1 139 use test; insert into t2 select * from t1 +master-bin.001 79 Query 1 79 use `test`; insert into t1 values(10) +master-bin.001 139 Query 1 139 use `test`; insert into t2 select * from t1 insert into t1 values(11); commit; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; insert into t1 values(10) -master-bin.001 139 Query 1 139 use test; insert into t2 select * from t1 -master-bin.001 205 Query 1 205 use test; BEGIN -master-bin.001 245 Query 1 205 use test; insert into t1 values(11) -master-bin.001 305 Query 1 305 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; insert into t1 values(10) +master-bin.001 139 Query 1 139 use `test`; insert into t2 select * from t1 +master-bin.001 205 Query 1 205 use `test`; BEGIN +master-bin.001 245 Query 1 205 use `test`; insert into t1 values(11) +master-bin.001 305 Query 1 305 use `test`; COMMIT alter table t2 type=INNODB; delete from t1; delete from t2; @@ -128,10 +128,10 @@ insert into t2 select * from t1; commit; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(12) -master-bin.001 179 Query 1 79 use test; insert into t2 select * from t1 -master-bin.001 245 Query 1 245 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(12) +master-bin.001 179 Query 1 79 use `test`; insert into t2 select * from t1 +master-bin.001 245 Query 1 245 use `test`; COMMIT delete from t1; delete from t2; reset master; @@ -153,9 +153,9 @@ rollback to savepoint my_savepoint; commit; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(14) -master-bin.001 179 Query 1 179 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(14) +master-bin.001 179 Query 1 179 use `test`; COMMIT delete from t1; delete from t2; reset master; @@ -173,8 +173,8 @@ a 18 show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; BEGIN -master-bin.001 119 Query 1 79 use test; insert into t1 values(16) -master-bin.001 179 Query 1 79 use test; insert into t1 values(18) -master-bin.001 239 Query 1 239 use test; COMMIT +master-bin.001 79 Query 1 79 use `test`; BEGIN +master-bin.001 119 Query 1 79 use `test`; insert into t1 values(16) +master-bin.001 179 Query 1 79 use `test`; insert into t1 values(18) +master-bin.001 239 Query 1 239 use `test`; COMMIT drop table t1,t2; diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result index 63f026274af..eeac31ba40b 100644 --- a/mysql-test/r/mysqlbinlog.result +++ b/mysql-test/r/mysqlbinlog.result @@ -1,5 +1,4 @@ -drop table if exists t1; -drop table if exists t2; +drop table if exists t1,t2; set timestamp=1000000000; create table t1 (word varchar(20)); create table t2 (id int auto_increment not null primary key); @@ -25,11 +24,11 @@ insert into t1 values ("abirvalg"); SET INSERT_ID=1; SET TIMESTAMP=1000000000; insert into t2 values (); -LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-1-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-2-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-3-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-4-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); -LOAD DATA LOCAL INFILE '/home/dlenev/src/mysql-4.0-binlog/mysql-test/var/tmp/words.dat-5-0 ' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-1-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-2-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-3-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-4-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); +LOAD DATA LOCAL INFILE 'MYSQL_TEST_DIR/var/tmp/words.dat-5-0' INTO TABLE t1 FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' STARTING BY '' (word); --- Broken LOAD DATA -- use test; diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 26e465f9c3b..7e2a8df75ac 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -20,24 +20,24 @@ drop table t1; show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.001 172 Intvar 1 172 INSERT_ID=1 -master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) -master-bin.001 263 Query 1 263 use test; drop table t1 -master-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) +master-bin.001 263 Query 1 263 use `test`; drop table t1 +master-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581 master-bin.001 1056 Exec_load 1 1056 ;file_id=1 -master-bin.001 1079 Query 1 1079 use test; drop table t1 +master-bin.001 1079 Query 1 1079 use `test`; drop table t1 show binlog events from 79 limit 1; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) show binlog events from 79 limit 2; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.001 172 Intvar 1 172 INSERT_ID=1 show binlog events from 79 limit 2,1; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) +master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) flush logs; create table t5 (a int); drop table t5; @@ -50,22 +50,22 @@ drop table t1; show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) master-bin.001 172 Intvar 1 172 INSERT_ID=1 -master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) -master-bin.001 263 Query 1 263 use test; drop table t1 -master-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +master-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) +master-bin.001 263 Query 1 263 use `test`; drop table t1 +master-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581 master-bin.001 1056 Exec_load 1 1056 ;file_id=1 -master-bin.001 1079 Query 1 1079 use test; drop table t1 +master-bin.001 1079 Query 1 1079 use `test`; drop table t1 master-bin.001 1127 Rotate 1 1127 master-bin.002;pos=4 show binlog events in 'master-bin.002'; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.002 4 Query 1 4 use test; create table t5 (a int) -master-bin.002 62 Query 1 62 use test; drop table t5 -master-bin.002 110 Query 1 110 use test; create table t1 (n int) -master-bin.002 168 Query 1 168 use test; insert into t1 values (1) -master-bin.002 228 Query 1 228 use test; drop table t1 +master-bin.002 4 Query 1 4 use `test`; create table t5 (a int) +master-bin.002 62 Query 1 62 use `test`; drop table t5 +master-bin.002 110 Query 1 110 use `test`; create table t1 (n int) +master-bin.002 168 Query 1 168 use `test`; insert into t1 values (1) +master-bin.002 228 Query 1 228 use `test`; drop table t1 show master logs; Log_name master-bin.001 @@ -78,22 +78,22 @@ slave-bin.002 show binlog events in 'slave-bin.001' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info slave-bin.001 4 Start 2 4 Server ver: VERSION, Binlog ver: 3 -slave-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +slave-bin.001 79 Query 1 79 use `test`; create table t1(n int not null auto_increment primary key) slave-bin.001 172 Intvar 1 172 INSERT_ID=1 -slave-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) -slave-bin.001 263 Query 1 263 use test; drop table t1 -slave-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +slave-bin.001 200 Query 1 200 use `test`; insert into t1 values (NULL) +slave-bin.001 263 Query 1 263 use `test`; drop table t1 +slave-bin.001 311 Query 1 311 use `test`; create table t1 (word char(20) not null) slave-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=581 slave-bin.001 1065 Exec_load 1 1065 ;file_id=1 -slave-bin.001 1088 Query 1 1088 use test; drop table t1 -slave-bin.001 1136 Query 1 1136 use test; create table t5 (a int) -slave-bin.001 1194 Query 1 1194 use test; drop table t5 +slave-bin.001 1088 Query 1 1088 use `test`; drop table t1 +slave-bin.001 1136 Query 1 1136 use `test`; create table t5 (a int) +slave-bin.001 1194 Query 1 1194 use `test`; drop table t5 slave-bin.001 1242 Rotate 2 1242 slave-bin.002;pos=4 show binlog events in 'slave-bin.002' from 4; Log_name Pos Event_type Server_id Orig_log_pos Info -slave-bin.002 4 Query 1 4 use test; create table t1 (n int) -slave-bin.002 62 Query 1 62 use test; insert into t1 values (1) -slave-bin.002 122 Query 1 122 use test; drop table t1 +slave-bin.002 4 Query 1 4 use `test`; create table t1 (n int) +slave-bin.002 62 Query 1 62 use `test`; insert into t1 values (1) +slave-bin.002 122 Query 1 122 use `test`; drop table t1 show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 master-bin.002 276 slave-relay-bin.003 211 master-bin.002 Yes Yes 0 0 276 211 diff --git a/mysql-test/t/fulltext_multi.test b/mysql-test/t/fulltext_multi.test index 233c243146e..f71704e1bb9 100644 --- a/mysql-test/t/fulltext_multi.test +++ b/mysql-test/t/fulltext_multi.test @@ -1,5 +1,5 @@ # several FULLTEXT indexes in one table test -use test; + DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( a int(11) NOT NULL auto_increment, diff --git a/mysql-test/t/fulltext_order_by.test b/mysql-test/t/fulltext_order_by.test index 3b60ee77db2..8c34230cfe3 100644 --- a/mysql-test/t/fulltext_order_by.test +++ b/mysql-test/t/fulltext_order_by.test @@ -1,4 +1,3 @@ -use test; DROP TABLE IF EXISTS t1; CREATE TABLE t1 ( a INT AUTO_INCREMENT PRIMARY KEY, diff --git a/mysql-test/t/ins000001.test b/mysql-test/t/ins000001.test deleted file mode 100644 index 4d75b4e7fe3..00000000000 --- a/mysql-test/t/ins000001.test +++ /dev/null @@ -1,9 +0,0 @@ -use test; -drop table if exists t1,t2; -create table t1 (email varchar(50)); -insert into t1 values ('sasha@mysql.com'),('monty@mysql.com'), -('foo@hotmail.com'),('foo@aol.com'),('bar@aol.com'); -create table t2(id int not null auto_increment primary key, - t2 varchar(50), unique(t2)); -insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1; -select * from t2; diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index be585157e63..fbb9134ff7f 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -2,7 +2,7 @@ # Test of refering to old values # -drop table if exists t1; +drop table if exists t1,t2; create table t1 (a int not null); insert into t1 values (1); insert into t1 values (a+2); @@ -61,14 +61,26 @@ insert into t1 values (1), (NULL), (2); select * from t1; drop table t1; +# +# Test if insert ... select distinct +# + +create table t1 (email varchar(50)); +insert into t1 values ('sasha@mysql.com'),('monty@mysql.com'),('foo@hotmail.com'),('foo@aol.com'),('bar@aol.com'); +create table t2(id int not null auto_increment primary key, t2 varchar(50), unique(t2)); +insert into t2 (t2) select distinct substring(email, locate('@', email)+1) from t1; +select * from t2; +drop table t1,t2; + # # Test of mysqld crash with fully qualified column names # -drop database if exists foo; -create database foo; -use foo; +--disable_warnings +drop database if exists mysqltest; +--enable_warnings +create database mysqltest; +use mysqltest; create table t1 (c int); -insert into foo.t1 set foo.t1.c = '1'; -drop database foo; - +insert into mysqltest.t1 set mysqltest.t1.c = '1'; +drop database mysqltest; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 78992cb1e11..736c5e32622 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -1,7 +1,6 @@ # We are using .opt file since we need small binlog size --disable_warnings -drop table if exists t1; -drop table if exists t2; +drop table if exists t1,t2; --enable_warnings # we need this for getting fixed timestamps inside of this test @@ -39,6 +38,7 @@ select "--- Local --" as ""; # be time dependend. Better than nothing. # +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.001 # this should not fail but shouldn't produce any working statements --disable_query_log @@ -50,12 +50,14 @@ select "--- Broken LOAD DATA --" as ""; --disable_query_log select "--- --database --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --database=nottest $MYSQL_TEST_DIR/var/log/master-bin.001 # this test for position option --disable_query_log select "--- --position --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --position=27 $MYSQL_TEST_DIR/var/log/master-bin.002 # These are tests for remote binlog. -- cgit v1.2.1 From 55dc3dcb82dc13b182c1b44006ec3bde6b83af18 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 29 Sep 2003 23:10:30 +0400 Subject: Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution). client/mysqltest.c: Now resetting replace_result patterns after --exec command (in order to be consistent with ordinary query execution). mysql-test/t/mysqlbinlog.test: Added additional replaces potentially needed after adding reset of replace conditions for exec --- mysql-test/t/mysqlbinlog.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 736c5e32622..22b63146652 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -40,10 +40,12 @@ select "--- Local --" as ""; --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.001 + # this should not fail but shouldn't produce any working statements --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.002 # this should show almost nothing @@ -73,24 +75,28 @@ select "--- Remote --" as ""; # This is broken now # By the way it seems that remote version fetches all events with name >= master-bin.001 +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 # This is broken too --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # And this too ! (altough it is documented) --disable_query_log select "--- --database --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 # Strangely but this works --disable_query_log select "--- --position --" as ""; --enable_query_log +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --exec $MYSQL_BINLOG --short-form --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # clean up -- cgit v1.2.1 From 4e24aff59c1c4e8b292d462d90b6a55affb90334 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 29 Sep 2003 22:56:31 +0200 Subject: fix for a random test failure on hpux/ia64 (a missing synchronization in the test) mysql-test/r/drop_temp_table.result: result update mysql-test/t/drop_temp_table.test: synchronize to be sure that the ending connection has finished binlogging. --- mysql-test/r/drop_temp_table.result | 7 +++++++ mysql-test/t/drop_temp_table.test | 6 ++++++ 2 files changed, 13 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 385a3fb6e5c..6b18b54335d 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -2,10 +2,17 @@ reset master; create database `drop-temp+table-test`; use `drop-temp+table-test`; create temporary table `table:name` (a int); +select get_lock("a",10); +get_lock("a",10) +1 +select get_lock("a",10); +get_lock("a",10) +1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.001 79 Query 1 79 use `test`; create database `drop-temp+table-test` master-bin.001 152 Query 1 152 use `drop-temp+table-test`; create temporary table `table:name` (a int) master-bin.001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` +master-bin.001 365 Query 1 365 use `drop-temp+table-test`; DO RELEASE_LOCK("a") drop database `drop-temp+table-test`; diff --git a/mysql-test/t/drop_temp_table.test b/mysql-test/t/drop_temp_table.test index 4849e998bf5..1a7d8796bb3 100644 --- a/mysql-test/t/drop_temp_table.test +++ b/mysql-test/t/drop_temp_table.test @@ -5,8 +5,14 @@ reset master; create database `drop-temp+table-test`; use `drop-temp+table-test`; create temporary table `table:name` (a int); +select get_lock("a",10); disconnect con1; + connection con2; +# We want to SHOW BINLOG EVENTS, to know what was logged. But there is no +# guarantee that logging of the terminated con1 has been done yet. +# To be sure that logging has been done, we use a user lock. +select get_lock("a",10); let $VERSION=`select version()`; --replace_result $VERSION VERSION show binlog events; -- cgit v1.2.1 From 2985e91acd78841fac42b298cea19c7332895eb9 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Oct 2003 00:40:27 +0300 Subject: Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194) Use forced close of socket to make mysqld shutdown faster when used under valgrind mysql-test/mysql-test-run.sh: Added --skip-bdb for valgrind mysql-test/r/user_var.result: Extended test for user variables mysql-test/t/user_var.test: Extended test for user variables sql/item_func.cc: Optimized code for setting user variables with := and fixed some bugs in old code sql/item_func.h: Optimized code for setting user variables sql/log.cc: Fixed comments sql/mysqld.cc: Use forced close of socket to make mysqld shutdown faster when used under valgrind sql/sql_class.h: Optimized code for setting user variables --- mysql-test/mysql-test-run.sh | 4 ++-- mysql-test/r/user_var.result | 33 ++++++++++++++++++++++++++++----- mysql-test/t/user_var.test | 19 +++++++++++++++---- 3 files changed, 45 insertions(+), 11 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 498c7ccf5ed..93efb4a8cb6 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -337,8 +337,8 @@ while test $# -gt 0; do ;; --valgrind) VALGRIND="valgrind --alignment=8 --leak-check=yes --num-callers=16" - EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc" - EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc" + EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb" + EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb" SLEEP_TIME_AFTER_RESTART=10 SLEEP_TIME_FOR_DELETE=120 USE_RUNNING_SERVER="" diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index d94ab6f57c3..d7c41d5dbc4 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -30,6 +30,7 @@ explain select * from t1 where i=@vv1; table type possible_keys key key_len ref rows Extra t1 ref i i 4 const 1 Using where drop table t1,t2; +set @a=0,@b=0; select @a:=10, @b:=1, @a > @b, @a < @b; @a:=10 @b:=1 @a > @b @a < @b 10 1 1 0 @@ -38,18 +39,18 @@ select @a:="10", @b:="1", @a > @b, @a < @b; 10 1 1 0 select @a:=10, @b:=2, @a > @b, @a < @b; @a:=10 @b:=2 @a > @b @a < @b -10 2 1 0 +10 2 0 1 select @a:="10", @b:="2", @a > @b, @a < @b; @a:="10" @b:="2" @a > @b @a < @b -10 2 0 1 +10 2 1 0 select @a:=1; @a:=1 1 select @a, @a:=1; @a @a:=1 1 1 -create table t1 (id int); -insert into t1 values (1); +create table t1 (id int, d double, c char(10)); +insert into t1 values (1,2.0, "test"); select @c:=0; @c:=0 0 @@ -70,7 +71,29 @@ select @c:=0; select @c:=@c+1; @c:=@c+1 1 +select @d,(@d:=id),@d from t1; +@d (@d:=id) @d +NULL 1 1 +select @e,(@e:=d),@e from t1; +@e (@e:=d) @e +NULL 2 2 +select @f,(@f:=c),@f from t1; +@f (@f:=c) @f +NULL test test +set @g=1; +select @g,(@g:=c),@g from t1; +@g (@g:=c) @g +1 test test +select @c, @d, @e, @f; +@c @d @e @f +1 1 2 test +select @d:=id, @e:=id, @f:=id, @g:=@id from t1; +@d:=id @e:=id @f:=id @g:=@id +1 1 1 NULL +select @c, @d, @e, @f, @g; +@c @d @e @f @g +1 1 1 1 NULL drop table t1; select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b @a:=10 @b:=2 @a>@b @a:="10" @b:="2" @a>@b -10 2 1 10 2 0 10 2 1 10 2 0 +10 2 1 10 2 1 10 2 1 10 2 1 diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index 1e466c149bb..56528405a2a 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -19,8 +19,11 @@ explain select * from t1 where i=@vv1; drop table t1,t2; # Check types of variables +set @a=0,@b=0; select @a:=10, @b:=1, @a > @b, @a < @b; +# Note that here a and b will be avaluated as number select @a:="10", @b:="1", @a > @b, @a < @b; +# Note that here a and b will be avaluated as strings select @a:=10, @b:=2, @a > @b, @a < @b; select @a:="10", @b:="2", @a > @b, @a < @b; @@ -28,8 +31,8 @@ select @a:="10", @b:="2", @a > @b, @a < @b; select @a:=1; select @a, @a:=1; -create table t1 (id int); -insert into t1 values (1); +create table t1 (id int, d double, c char(10)); +insert into t1 values (1,2.0, "test"); select @c:=0; update t1 SET id=(@c:=@c+1); select @c; @@ -38,7 +41,15 @@ update t1 set id=(@c:=@c+1); select @c; select @c:=0; select @c:=@c+1; +select @d,(@d:=id),@d from t1; +select @e,(@e:=d),@e from t1; +select @f,(@f:=c),@f from t1; +set @g=1; +select @g,(@g:=c),@g from t1; +select @c, @d, @e, @f; +select @d:=id, @e:=id, @f:=id, @g:=@id from t1; +select @c, @d, @e, @f, @g; drop table t1; -# just fof fun :) -select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; \ No newline at end of file +# just for fun :) +select @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b, @a:=10, @b:=2, @a>@b, @a:="10", @b:="2", @a>@b; -- cgit v1.2.1 From 1bd7662b896f31786b5de5dd2fcd309d148d32cf Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Oct 2003 22:13:01 +0200 Subject: When the I/O thread was stopped while copying a long transaction, and restarted, Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it by moving the test for corruption to Start_log_event::exec_event(). Changed Rotate_log_event::exec_event() to not increment positions when the event is seen in the middle of a transaction. I did a separate commit in 4.1 (so this should not be merged to 4.0) because code is a bit different in 4.1. A test to see if the slave detects when the master died while writing a transaction to the binlog (uses a forged truncated binlog I made). sql/log_event.cc: When the I/O thread was stopped while copying a long transaction, and restarted, Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it by moving the test for corruption to Start_log_event::exec_event(). Changed Rotate_log_event::exec_event() to not increment positions when the event is seen in the middle of a transaction. --- mysql-test/r/rpl_trunc_binlog.result | 14 ++++++++++++++ mysql-test/std_data/trunc_binlog.001 | Bin 0 -> 119 bytes mysql-test/t/rpl_trunc_binlog.test | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 mysql-test/r/rpl_trunc_binlog.result create mode 100644 mysql-test/std_data/trunc_binlog.001 create mode 100644 mysql-test/t/rpl_trunc_binlog.test (limited to 'mysql-test') diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result new file mode 100644 index 00000000000..6d2158eedfe --- /dev/null +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -0,0 +1,14 @@ +slave stop; +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; +slave start; +stop slave; +flush logs; +reset slave; +start slave; +show slave status; +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space +127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 there is an unfinished transaction in the relay log (could find neither COMMIT nor ROLLBACK in the relay log); it could be that the master died while writing the transaction to its binary log. Now the slave is rolling back the transaction. 0 79 317 +reset master; diff --git a/mysql-test/std_data/trunc_binlog.001 b/mysql-test/std_data/trunc_binlog.001 new file mode 100644 index 00000000000..2c2b4ec6ce4 Binary files /dev/null and b/mysql-test/std_data/trunc_binlog.001 differ diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test new file mode 100644 index 00000000000..efdc3012471 --- /dev/null +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -0,0 +1,22 @@ +# We are testing if a binlog which contains BEGIN but not COMMIT (the master did +# while writing the transaction to the binlog) triggers an error on slave. +# So we use such a truncated binlog and simulate that the master restarted after +# this. + +source include/master-slave.inc; + +connection slave; +stop slave; +connection master; +flush logs; +system mv -f var/log/master-bin.001 var/log/master-bin.002; +system cp std_data/trunc_binlog.001 var/log/master-bin.001; +connection slave; +reset slave; +start slave; +# can't sync_with_master so we must sleep +sleep 3; +--replace_result $MASTER_MYPORT MASTER_PORT +show slave status; +connection master; +reset master; -- cgit v1.2.1 From 496bc77694abe410bed1968fc34cf685d765131f Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 3 Oct 2003 17:54:32 -0400 Subject: Fixed bug #1323 (varchar fields becoming char fields adter create ... select) --- mysql-test/r/create.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test') diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index e6192eb6ccb..7b784e3c3ee 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -78,7 +78,7 @@ Field Type Null Key Default Extra x varchar(50) YES NULL describe t2; Field Type Null Key Default Extra -x char(50) YES NULL +x varchar(50) YES NULL drop table t2; create table t2 select now() as a , curtime() as b, curdate() as c , 1+1 as d , 1.0 + 1 as e , 33333333333333333 + 3 as f; describe t2; -- cgit v1.2.1 From a0e2753e876c80912aa65fd9c2dfc30357b1581f Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 4 Oct 2003 17:41:17 -0500 Subject: Ride hobby horse. mysql-test/mysql-test-run.sh: deamon -> daemon scripts/mysql_install_db.sh: deamon -> daemon support-files/my-small.cnf.sh: deamon -> daemon --- mysql-test/mysql-test-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 93efb4a8cb6..b452023dcb9 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1041,8 +1041,8 @@ EOF mysql_start () { -# We should not start the deamon here as we don't know the argumens -# for the test. Better to let the test start the deamon +# We should not start the daemon here as we don't know the argumens +# for the test. Better to let the test start the daemon # $ECHO "Starting MySQL daemon" # start_master @@ -1364,7 +1364,7 @@ then mysql_install_db start_manager -# Do not automagically start deamons if we are in gdb or running only one test +# Do not automagically start daemons if we are in gdb or running only one test # case if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ] then -- cgit v1.2.1 From bc4a57f01ace40255de2f8d7307254fd1d1d5bfa Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Oct 2003 00:23:29 +0300 Subject: After merge fixes extra/resolveip.c: After merge fix mysql-test/mysql-test-run.sh: Fixed comment mysql-test/r/rpl_trunc_binlog.result: Updated results sql/log_event.cc: Better (shorter) error message --- mysql-test/mysql-test-run.sh | 2 +- mysql-test/r/rpl_trunc_binlog.result | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b452023dcb9..577f396440c 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1041,7 +1041,7 @@ EOF mysql_start () { -# We should not start the daemon here as we don't know the argumens +# We should not start the daemon here as we don't know the arguments # for the test. Better to let the test start the daemon # $ECHO "Starting MySQL daemon" diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index 6d2158eedfe..a006437207a 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -10,5 +10,5 @@ reset slave; start slave; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 there is an unfinished transaction in the relay log (could find neither COMMIT nor ROLLBACK in the relay log); it could be that the master died while writing the transaction to its binary log. Now the slave is rolling back the transaction. 0 79 317 +127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 317 reset master; -- cgit v1.2.1 From c7fd510a4191eb85890dddc235852f3b8a98362d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Oct 2003 15:44:31 +0300 Subject: Simple cleanups client/mysqlbinlog.cc: Add default handling to mysqlbinlog mysql-test/mysql-test-run.sh: Cleanup of mysqldump/mysqlbinlog argument handling scripts/Makefile.am: Remove duplicate scripts/mysql_install_db.sh: Change -eq to = --- mysql-test/mysql-test-run.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 577f396440c..6cba5eecddd 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -429,14 +429,14 @@ if [ x$SOURCE_DIST = x1 ] ; then MYSQL_TEST="$BASEDIR/client/mysqltest" fi if [ -f "$BASEDIR/client/.libs/mysqldump" ] ; then - MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + MYSQL_DUMP="$BASEDIR/client/.libs/mysqldump" else - MYSQL_DUMP="$BASEDIR/client/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" + MYSQL_DUMP="$BASEDIR/client/mysqldump" fi if [ -f "$BASEDIR/client/.libs/mysqlbinlog" ] ; then - MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" else - MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" @@ -459,8 +459,8 @@ else MYSQLD="$VALGRIND $BASEDIR/bin/mysqld" fi MYSQL_TEST="$BASEDIR/bin/mysqltest" - MYSQL_DUMP="$BASEDIR/bin/mysqldump --no-defaults -uroot --socket=$MASTER_MYSOCK" - MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog --local-load=$MYSQL_TMP_DIR" + MYSQL_DUMP="$BASEDIR/bin/mysqldump" + MYSQL_BINLOG="$BASEDIR/bin/mysqlbinlog" MYSQLADMIN="$BASEDIR/bin/mysqladmin" WAIT_PID="$BASEDIR/bin/mysql_waitpid" MYSQL_MANAGER="$BASEDIR/bin/mysqlmanager" @@ -478,6 +478,8 @@ else fi fi +MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK" +MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR" export MYSQL_DUMP export MYSQL_BINLOG -- cgit v1.2.1 From 654d266c8bca6ef770e4a592b32696e920ce0e98 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 7 Oct 2003 20:41:06 +0200 Subject: Fix for a test failure with the standard (no-BDB) binary: as the test is meaningful only if the slave supports transactions, we require this. As in 4.0 the slave runs with --skip-innodb, we test for BDB. --- mysql-test/t/rpl_trunc_binlog.test | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mysql-test') diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index efdc3012471..11ec0026560 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -6,6 +6,10 @@ source include/master-slave.inc; connection slave; +# If we are not supporting transactions in the slave, the unfinished transaction +# won't cause any error, so we need to skip the test. In the 4.0 testsuite, the +# slave always runs without InnoDB, so we check for BDB. +source include/have_bdb.inc; stop slave; connection master; flush logs; -- cgit v1.2.1 From 26456b883808edc0f3aaa186b36f1d7739c2a74e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 8 Oct 2003 10:23:54 +0300 Subject: Fixed test case that my last patch to mysqlbinlog broke. Changed --remote to --read-from-remote-server (mysqlbinlog) client/mysqlbinlog.cc: Changed --remote to --read-from-remote-server to make option more understandable mysql-test/t/mysqlbinlog.test: Fixed test case that --remote broke --- mysql-test/t/mysqlbinlog.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 22b63146652..c5e1be37b01 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -76,28 +76,28 @@ select "--- Remote --" as ""; # This is broken now # By the way it seems that remote version fetches all events with name >= master-bin.001 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 # This is broken too --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # And this too ! (altough it is documented) --disable_query_log select "--- --database --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 # Strangely but this works --disable_query_log select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # clean up drop table t1; -- cgit v1.2.1 From 1ead85e6783e303c2d024aebe4c5a04e0aa6560f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 8 Oct 2003 12:01:58 +0300 Subject: Fixes after merge mysql-test/std_data/trunc_binlog.000001: Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001 client/mysqltest.c: Fixed merge problem mysql-test/mysql-test-run.sh: Fixed merge problem mysql-test/r/distinct.result: Fix after merge mysql-test/r/drop_temp_table.result: Fix after merge mysql-test/r/join_outer.result: Fix after merge mysql-test/r/mysqldump.result: Fix after merge mysql-test/r/null_key.result: Fix after merge mysql-test/r/order_by.result: Fix after merge mysql-test/r/rpl_alter.result: Fix after merge mysql-test/r/rpl_loaddata.result: Fix after merge mysql-test/r/rpl_loaddata_rule_m.result: Fix after merge mysql-test/r/rpl_trunc_binlog.result: Fix after merge mysql-test/r/select_safe.result: Fix after merge mysql-test/t/insert.test: Fix after merge mysql-test/t/mysqlbinlog.test: Fix after merge mysql-test/t/rpl000009.test: Fix after merge mysql-test/t/rpl_alter.test: Fix after merge mysql-test/t/rpl_loaddata_rule_m.test: Fix after merge mysql-test/t/rpl_trunc_binlog.test: Fix after merge sql-common/client.c: Fix after merge sql/item_subselect.cc: Fix after merge sql/repl_failsafe.cc: Fix after merge sql/slave.cc: Fix after merge sql/sql_insert.cc: Fix after merge --- mysql-test/mysql-test-run.sh | 1 + mysql-test/r/distinct.result | 4 +- mysql-test/r/drop_temp_table.result | 10 ++-- mysql-test/r/join_outer.result | 2 +- mysql-test/r/mysqldump.result | 3 ++ mysql-test/r/null_key.result | 4 +- mysql-test/r/order_by.result | 6 +-- mysql-test/r/rpl_alter.result | 22 ++++----- mysql-test/r/rpl_loaddata.result | 4 +- mysql-test/r/rpl_loaddata_rule_m.result | 7 +-- mysql-test/r/rpl_trunc_binlog.result | 8 ++-- mysql-test/r/select_safe.result | 2 +- mysql-test/std_data/trunc_binlog.000001 | Bin 0 -> 119 bytes mysql-test/std_data/trunc_binlog.001 | Bin 119 -> 0 bytes mysql-test/t/insert.test | 10 ++-- mysql-test/t/mysqlbinlog.test | 18 +++---- mysql-test/t/rpl000009.test | 80 +++++++++++++++++++------------- mysql-test/t/rpl_alter.test | 22 ++++----- mysql-test/t/rpl_loaddata_rule_m.test | 11 +++-- mysql-test/t/rpl_trunc_binlog.test | 12 ++--- 20 files changed, 126 insertions(+), 100 deletions(-) create mode 100644 mysql-test/std_data/trunc_binlog.000001 delete mode 100644 mysql-test/std_data/trunc_binlog.001 (limited to 'mysql-test') diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index c4e97d0c92b..b7e39549411 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -437,6 +437,7 @@ if [ x$SOURCE_DIST = x1 ] ; then MYSQL_BINLOG="$BASEDIR/client/.libs/mysqlbinlog" else MYSQL_BINLOG="$BASEDIR/client/mysqlbinlog" + fi if [ -n "$STRACE_CLIENT" ]; then MYSQL_TEST="strace -o $MYSQL_TEST_DIR/var/log/mysqltest.strace $MYSQL_TEST" fi diff --git a/mysql-test/r/distinct.result b/mysql-test/r/distinct.result index 5e713f59100..d9beed25edf 100644 --- a/mysql-test/r/distinct.result +++ b/mysql-test/r/distinct.result @@ -303,9 +303,9 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t2 index id id 8 NULL 1 Using index; Distinct 1 SIMPLE t3 index id id 8 NULL 1 Using index; Distinct 1 SIMPLE j_lj_t2 index id id 4 NULL 2 Using where; Using index; Distinct -1 SIMPLE t2_lj index id id 8 NULL 1 Using where; Using index; Distinct +1 SIMPLE t2_lj ref id id 4 test.j_lj_t2.id 1 Using where; Using index; Distinct 1 SIMPLE j_lj_t3 index id id 4 NULL 2 Using where; Using index; Distinct -1 SIMPLE t3_lj index id id 8 NULL 1 Using where; Using index; Distinct +1 SIMPLE t3_lj ref id id 4 test.j_lj_t3.id 1 Using where; Using index; Distinct SELECT DISTINCT t1.id from diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 6b18b54335d..78efc9d90e2 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -10,9 +10,9 @@ get_lock("a",10) 1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info -master-bin.001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 -master-bin.001 79 Query 1 79 use `test`; create database `drop-temp+table-test` -master-bin.001 152 Query 1 152 use `drop-temp+table-test`; create temporary table `table:name` (a int) -master-bin.001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` -master-bin.001 365 Query 1 365 use `drop-temp+table-test`; DO RELEASE_LOCK("a") +master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 +master-bin.000001 79 Query 1 79 use `test`; create database `drop-temp+table-test` +master-bin.000001 152 Query 1 152 use `drop-temp+table-test`; create temporary table `table:name` (a int) +master-bin.000001 246 Query 1 246 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE `drop-temp+table-test`.`table:name` +master-bin.000001 365 Query 1 365 use `drop-temp+table-test`; DO RELEASE_LOCK("a") drop database `drop-temp+table-test`; diff --git a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result index e852d266664..3a1f68fb6c1 100644 --- a/mysql-test/r/join_outer.result +++ b/mysql-test/r/join_outer.result @@ -614,7 +614,7 @@ INSERT INTO t2 VALUES (1,1); explain SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 2 -1 SIMPLE t2 ref id id 4 t1.id 1 Using where; Using index; Not exists +1 SIMPLE t2 ref id id 4 test.t1.id 1 Using where; Using index; Not exists SELECT * from t1 left join t2 on t1.id=t2.id where t2.id IS NULL; id name id idx 2 no NULL NULL diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 085cf2788f9..cf1ef55ca69 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -4,6 +4,8 @@ INSERT INTO t1 VALUES (1), (2); +DROP TABLE IF EXISTS t1; +LOCK TABLES t1 WRITE; 1 @@ -12,6 +14,7 @@ INSERT INTO t1 VALUES (1), (2); 2
+UNLOCK TABLES; DROP TABLE t1; diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result index 9aaea0d800b..bacd95d852e 100644 --- a/mysql-test/r/null_key.result +++ b/mysql-test/r/null_key.result @@ -153,12 +153,12 @@ a b 7 NULL explain select * from t1 where (a = 7 or a is null) and (b=7 or b is null); id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 range a,b a 10 NULL 3 Using where; Using index +1 SIMPLE t1 ref_or_null a,b a 5 const 4 Using where; Using index select * from t1 where (a = 7 or a is null) and (b=7 or b is null); a b -NULL 7 7 NULL 7 7 +NULL 7 explain select * from t1 where (a = 7 or a is null) and (a = 7 or a is null); id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ref_or_null a a 5 const 5 Using where; Using index diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result index 80fe0c266f8..db747e3a7eb 100644 --- a/mysql-test/r/order_by.result +++ b/mysql-test/r/order_by.result @@ -470,8 +470,8 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t3 eq_ref PRIMARY PRIMARY 2 test.t2.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t1.gid,t3.skr; id select_type table type possible_keys key key_len ref rows Extra -1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 6 Using index -1 SIMPLE t3 eq_ref PRIMARY PRIMARY 2 test.t1.gid 1 Using where +1 SIMPLE t3 ALL PRIMARY NULL NULL NULL 6 Using temporary; Using filesort +1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t3.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t2.sid, t3.uid from t2, t1, t3 where t2.gid = t1.gid and t2.uid = t3.uid order by t3.uid, t1.gid; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 index PRIMARY PRIMARY 4 NULL 6 Using index; Using temporary; Using filesort @@ -480,7 +480,7 @@ id select_type table type possible_keys key key_len ref rows Extra EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.gid = t3.uid order by t3.skr,t1.gid; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t3 ALL PRIMARY NULL NULL NULL 6 Using temporary; Using filesort -1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t3.uid 1 Using where +1 SIMPLE t1 eq_ref PRIMARY PRIMARY 4 test.t3.uid 1 Using where; Using index EXPLAIN SELECT t1.gid, t3.uid from t1, t3 where t1.skr = t3.uid order by t1.gid,t3.skr; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL NULL NULL NULL NULL 6 Using temporary; Using filesort diff --git a/mysql-test/r/rpl_alter.result b/mysql-test/r/rpl_alter.result index e7abc3b3b48..6ef5ce3462a 100644 --- a/mysql-test/r/rpl_alter.result +++ b/mysql-test/r/rpl_alter.result @@ -4,18 +4,18 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -drop database if exists test_$1; -create database test_$1; -create table test_$1.t1 ( n int); -alter table test_$1.t1 add m int; -insert into test_$1.t1 values (1,2); -create table test_$1.t2 (n int); -insert into test_$1.t2 values (45); -rename table test_$1.t2 to test_$1.t3, test_$1.t1 to test_$1.t2; -select * from test_$1.t2; +drop database if exists mysqltest; +create database mysqltest; +create table mysqltest.t1 ( n int); +alter table mysqltest.t1 add m int; +insert into mysqltest.t1 values (1,2); +create table mysqltest.t2 (n int); +insert into mysqltest.t2 values (45); +rename table mysqltest.t2 to mysqltest.t3, mysqltest.t1 to mysqltest.t2; +select * from mysqltest.t2; n m 1 2 -select * from test_$1.t3; +select * from mysqltest.t3; n 45 -drop database test_$1; +drop database mysqltest; diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index 83968eef14f..2dd5dc5ec08 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -61,8 +61,8 @@ unique(day)); load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' starting by '>' ignore 1 lines; -Duplicate entry '2003-03-22' for key 1 +ERROR 23000: Duplicate entry '2003-03-22' for key 1 show master status; File Position Binlog_do_db Binlog_ignore_db -master-bin.001 491 +master-bin.000001 491 drop table t2; diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result index c98b3fb358f..ed0c96bbfe1 100644 --- a/mysql-test/r/rpl_loaddata_rule_m.result +++ b/mysql-test/r/rpl_loaddata_rule_m.result @@ -4,11 +4,12 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +drop database if exists mysqltest; reset master; -create database test2; +create database mysqltest; create table t1(a int, b int, unique(b)); -use test2; +use mysqltest; load data infile '../../std_data/rpl_loaddata.dat' into table test.t1; show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info -drop database test2; +drop database mysqltest; diff --git a/mysql-test/r/rpl_trunc_binlog.result b/mysql-test/r/rpl_trunc_binlog.result index a006437207a..44d3eeb2ba3 100644 --- a/mysql-test/r/rpl_trunc_binlog.result +++ b/mysql-test/r/rpl_trunc_binlog.result @@ -1,14 +1,14 @@ -slave stop; +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; -slave start; +start slave; stop slave; flush logs; reset slave; start slave; show slave status; -Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space -127.0.0.1 root MASTER_PORT 1 master-bin.002 4 slave-relay-bin.002 161 master-bin.001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 317 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Replicate_do_table Replicate_ignore_table Replicate_wild_do_table Replicate_wild_ignore_table Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space Until_condition Until_Log_File Until_Log_pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key +127.0.0.1 root MASTER_PORT 1 master-bin.000002 4 slave-relay-bin.000002 123 master-bin.000001 Yes No 0 Rolling back unfinished transaction (no COMMIT or ROLLBACK) from relay log. Probably cause is that the master died while writing the transaction to it's binary log. 0 79 326 None 0 No reset master; diff --git a/mysql-test/r/select_safe.result b/mysql-test/r/select_safe.result index ea8f2332c3a..6bffdd85aa4 100644 --- a/mysql-test/r/select_safe.result +++ b/mysql-test/r/select_safe.result @@ -70,7 +70,7 @@ insert into t1 values (null,"a"),(null,"a"),(null,"a"),(null,"a"),(null,"a"),(nu explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 ALL b NULL NULL NULL 21 -1 SIMPLE t2 ref b b 21 t1.b 6 Using where +1 SIMPLE t2 ref b b 21 test.t1.b 6 Using where set MAX_SEEKS_FOR_KEY=1; explain select STRAIGHT_JOIN * from t1,t1 as t2 where t1.b=t2.b; id select_type table type possible_keys key key_len ref rows Extra diff --git a/mysql-test/std_data/trunc_binlog.000001 b/mysql-test/std_data/trunc_binlog.000001 new file mode 100644 index 00000000000..2c2b4ec6ce4 Binary files /dev/null and b/mysql-test/std_data/trunc_binlog.000001 differ diff --git a/mysql-test/std_data/trunc_binlog.001 b/mysql-test/std_data/trunc_binlog.001 deleted file mode 100644 index 2c2b4ec6ce4..00000000000 Binary files a/mysql-test/std_data/trunc_binlog.001 and /dev/null differ diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index ae0a87895e1..62d277bfad5 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -80,10 +80,10 @@ drop table t1,t2; # --disable_warnings -drop database if exists test_$1; +drop database if exists mysqltest; --enable_warnings -create database test_$1; -use test_$1; +create database mysqltest; +use mysqltest; create table t1 (c int); -insert into test_$1.t1 set test_$1.t1.c = '1'; -drop database test_$1; +insert into mysqltest.t1 set mysqltest.t1.c = '1'; +drop database mysqltest; diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 22b63146652..3a24efd9f39 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -39,28 +39,28 @@ select "--- Local --" as ""; # --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.001 +--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 # this should not fail but shouldn't produce any working statements --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.002 +--exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000002 # this should show almost nothing --disable_query_log select "--- --database --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --database=nottest $MYSQL_TEST_DIR/var/log/master-bin.001 +--exec $MYSQL_BINLOG --short-form --database=nottest $MYSQL_TEST_DIR/var/log/master-bin.000001 # this test for position option --disable_query_log select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --position=27 $MYSQL_TEST_DIR/var/log/master-bin.002 +--exec $MYSQL_BINLOG --short-form --position=27 $MYSQL_TEST_DIR/var/log/master-bin.000002 # These are tests for remote binlog. # They should return the same as previous test. @@ -74,30 +74,30 @@ select "--- Remote --" as ""; --enable_query_log # This is broken now -# By the way it seems that remote version fetches all events with name >= master-bin.001 +# By the way it seems that remote version fetches all events with name >= master-bin.000001 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.001 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 # This is broken too --disable_query_log select "--- Broken LOAD DATA --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # And this too ! (altough it is documented) --disable_query_log select "--- --database --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.001 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 # Strangely but this works --disable_query_log select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 # clean up drop table t1; diff --git a/mysql-test/t/rpl000009.test b/mysql-test/t/rpl000009.test index 4db62540e7b..cd318efa2b6 100644 --- a/mysql-test/t/rpl000009.test +++ b/mysql-test/t/rpl000009.test @@ -3,9 +3,15 @@ source include/master-slave.inc; --disable_warnings +drop database if exists mysqltest; drop database if exists mysqltest2; -create database mysqltest2; +drop database if exists mysqltest3; +connection slave; drop database if exists mysqltest; +drop database if exists mysqltest2; +drop database if exists mysqltest3; +connection master; +create database mysqltest2; create database mysqltest; --enable_warnings @@ -60,38 +66,42 @@ sync_with_master; # This should show that the slave is empty at this point show databases; -# Create foo and foo2 on slave; we expect that LOAD DATA FROM MASTER will -# neither touch database foo nor foo2. -create database foo; -create table foo.t1(n int, s char(20)); -insert into foo.t1 values (1, 'original foo.t1'); -create table foo.t3(n int, s char(20)); -insert into foo.t3 values (1, 'original foo.t3'); -create database foo2; -create table foo2.t1(n int, s char(20)); -insert into foo2.t1 values (1, 'original foo2.t1'); -# Create bar, and bar.t1, to check that it gets replaced, -# and bar.t3 to check that it is not touched (there is no bar.t3 on master) -create database bar; -create table bar.t1(n int, s char(20)); -insert into bar.t1 values (1, 'original bar.t1'); -create table bar.t3(n int, s char(20)); -insert into bar.t3 values (1, 'original bar.t3'); +# Create mysqltest2 and mysqltest3 on slave; we expect that LOAD DATA FROM +# MASTER will neither touch database mysqltest nor mysqltest3 +create database mysqltest2; +create table mysqltest2.t1(n int, s char(20)); +insert into mysqltest2.t1 values (1, 'original foo.t1'); +create table mysqltest2.t3(n int, s char(20)); +insert into mysqltest2.t3 values (1, 'original foo.t3'); +create database mysqltest3; +create table mysqltest3.t1(n int, s char(20)); +insert into mysqltest3.t1 values (1, 'original foo2.t1'); + +# Create mysqltest, and mysqltest.t1, to check that it gets replaced, +# and mysqltest.t3 to check that it is not touched (there is no +# mysqltest.t3 on master) +create database mysqltest; +create table mysqltest.t1(n int, s char(20)); +insert into mysqltest.t1 values (1, 'original bar.t1'); +create table mysqltest.t3(n int, s char(20)); +insert into mysqltest.t3 values (1, 'original bar.t3'); load data from master; # Now let's check if we have the right tables and the right data in them show databases; use mysqltest2; -# LOAD DATA FROM MASTER uses only replicate_*_db rules to decide which databases -# have to be copied. So it thinks "foo" has to be copied. Before 4.0.16 it would -# first drop "foo", then create "foo". This "drop" is a bug; in that case t3 -# would disappear. -# So here the effect of this bug (BUG#1248) would be to leave an empty "foo" on -# the slave. + +# LOAD DATA FROM MASTER uses only replicate_*_db rules to decide which +# databases have to be copied. So it thinks "mysqltest" has to be +# copied. Before 4.0.16 it would first drop "mysqltest", then create +# "mysqltest". This "drop" is a bug; in that case t3 would disappear. So +# here the effect of this bug (BUG#1248) would be to leave an empty +# "mysqltest" on the slave. + show tables; # should be t1 & t3 select * from t1; # should be slave's original -use foo2; +use mysqltest3; show tables; # should be t1 select * from t1; # should be slave's original use mysqltest; @@ -111,19 +121,24 @@ select * from mysqltest.t1; # Check that LOAD DATA FROM MASTER reports the error if it can't drop a # table to be overwritten. # DISABLED FOR NOW AS chmod IS NOT PORTABLE ON NON-UNIX -# insert into bar.t1 values(10, 'should be there'); +# insert into mysqltest.t1 values(10, 'should be there'); # flush tables; -# system chmod 500 var/slave-data/bar/; +# system chmod 500 var/slave-data/mysqltest/; # --error 6 # load data from master; # should fail (errno 13) -# system chmod 700 var/slave-data/bar/; -# select * from bar.t1; # should contain the row (10, ...) +# system chmod 700 var/slave-data/mysqltest/; +# select * from mysqltest.t1; # should contain the row (10, ...) # Check that LOAD TABLE FROM MASTER fails if the table exists on slave --error 1050 -load table bar.t1 from master; -drop table bar.t1; +load table mysqltest.t1 from master; +drop table mysqltest.t1; +load table mysqltest.t1 from master; + +# Check what happens when requestion not existing table +# +--error 1188 load table bar.t1 from master; # as LOAD DATA FROM MASTER failed it did not restart slave threads @@ -137,5 +152,6 @@ drop database mysqltest2; save_master_pos; connection slave; sync_with_master; -drop database mysqltest; +# These has to be droped on slave as they are not replicated drop database mysqltest2; +drop database mysqltest3; diff --git a/mysql-test/t/rpl_alter.test b/mysql-test/t/rpl_alter.test index 6b8cf773150..a913f01cd81 100644 --- a/mysql-test/t/rpl_alter.test +++ b/mysql-test/t/rpl_alter.test @@ -1,22 +1,22 @@ source include/master-slave.inc; --disable_warnings -drop database if exists test_$1; +drop database if exists mysqltest; --enable_warnings -create database test_$1; +create database mysqltest; -create table test_$1.t1 ( n int); -alter table test_$1.t1 add m int; -insert into test_$1.t1 values (1,2); -create table test_$1.t2 (n int); -insert into test_$1.t2 values (45); -rename table test_$1.t2 to test_$1.t3, test_$1.t1 to test_$1.t2; +create table mysqltest.t1 ( n int); +alter table mysqltest.t1 add m int; +insert into mysqltest.t1 values (1,2); +create table mysqltest.t2 (n int); +insert into mysqltest.t2 values (45); +rename table mysqltest.t2 to mysqltest.t3, mysqltest.t1 to mysqltest.t2; save_master_pos; connection slave; sync_with_master; -select * from test_$1.t2; -select * from test_$1.t3; +select * from mysqltest.t2; +select * from mysqltest.t3; connection master; -drop database test_$1; +drop database mysqltest; save_master_pos; connection slave; sync_with_master; diff --git a/mysql-test/t/rpl_loaddata_rule_m.test b/mysql-test/t/rpl_loaddata_rule_m.test index 18f295f8ce2..ec3a9259e32 100644 --- a/mysql-test/t/rpl_loaddata_rule_m.test +++ b/mysql-test/t/rpl_loaddata_rule_m.test @@ -3,6 +3,11 @@ # This is for BUG#1100 (LOAD DATA INFILE was half-logged). source include/master-slave.inc; + +--disable_warnings +drop database if exists mysqltest; +--enable_warnings + connection slave; reset master; @@ -10,9 +15,9 @@ reset master; connection master; # 'test' is the current database -create database test2; +create database mysqltest; create table t1(a int, b int, unique(b)); -use test2; +use mysqltest; load data infile '../../std_data/rpl_loaddata.dat' into table test.t1; show binlog events from 79; # should be nothing -drop database test2; +drop database mysqltest; diff --git a/mysql-test/t/rpl_trunc_binlog.test b/mysql-test/t/rpl_trunc_binlog.test index efdc3012471..1f224423c97 100644 --- a/mysql-test/t/rpl_trunc_binlog.test +++ b/mysql-test/t/rpl_trunc_binlog.test @@ -1,7 +1,7 @@ -# We are testing if a binlog which contains BEGIN but not COMMIT (the master did -# while writing the transaction to the binlog) triggers an error on slave. -# So we use such a truncated binlog and simulate that the master restarted after -# this. +# We are testing if a binlog which contains BEGIN but not COMMIT (the +# master did while writing the transaction to the binlog) triggers an +# error on slave. So we use such a truncated binlog and simulate that +# the master restarted after this. source include/master-slave.inc; @@ -9,8 +9,8 @@ connection slave; stop slave; connection master; flush logs; -system mv -f var/log/master-bin.001 var/log/master-bin.002; -system cp std_data/trunc_binlog.001 var/log/master-bin.001; +system mv -f var/log/master-bin.000001 var/log/master-bin.000002; +system cp std_data/trunc_binlog.000001 var/log/master-bin.000001; connection slave; reset slave; start slave; -- cgit v1.2.1 From 32747b19de5c6a4a78ecf65378c8268823a3b4ca Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 8 Oct 2003 18:53:31 +0300 Subject: Fixed bug in error handling of CREATE ... SELECT More tests cases After merge fixes BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838: Delete: mysql-test/t/ansi-master.opt mysql-test/r/ansi.result: Cleaned up test to be able to remove ansi-master.opt mysql-test/r/create.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/t/ansi.test: Cleaned up test to be able to remove ansi-master.opt mysql-test/t/create.test: More tests mysql-test/t/insert_select.test: More tests mysql-test/t/mysqlbinlog.test: Fixed test after merge sql/mysql_priv.h: Added character-sets-dir to 'show variables' sql/set_var.cc: Added character-sets-dir to 'show variables' sql/sql_class.cc: Fixed that send_error() is called properly when a SELECT fails sql/sql_class.h: Fixed that send_error() is called properly when a SELECT fails sql/sql_insert.cc: Fixed bug in error handling of CREATE ... SELECT sql/sql_select.cc: Fixed bug in error handling of CREATE ... SELECT --- mysql-test/r/ansi.result | 17 +++++++------ mysql-test/r/create.result | 10 ++++++++ mysql-test/r/insert_select.result | 5 ++++ mysql-test/r/rpl000009.result | 53 ++++++++++++++++++++++++--------------- mysql-test/t/ansi-master.opt | 1 - mysql-test/t/ansi.test | 10 +++++--- mysql-test/t/create.test | 13 ++++++++++ mysql-test/t/insert_select.test | 1 + mysql-test/t/mysqlbinlog.test | 4 +-- 9 files changed, 79 insertions(+), 35 deletions(-) delete mode 100644 mysql-test/t/ansi-master.opt (limited to 'mysql-test') diff --git a/mysql-test/r/ansi.result b/mysql-test/r/ansi.result index 6ec909f84bb..0b86634f67b 100644 --- a/mysql-test/r/ansi.result +++ b/mysql-test/r/ansi.result @@ -1,4 +1,12 @@ drop table if exists t1; +set sql_mode="MySQL40"; +select @@sql_mode; +@@sql_mode +NO_FIELD_OPTIONS,MYSQL40 +set @@sql_mode="ANSI"; +select @@sql_mode; +@@sql_mode +REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI SELECT 'A' || 'B'; 'A' || 'B' AB @@ -8,11 +16,4 @@ id NULL 1 1.1 a SELECT id FROM t1 GROUP BY id2; ERROR 42000: 'test.t1.id' isn't in GROUP BY drop table t1; -set sql_mode="MySQL40"; -select @@sql_mode; -@@sql_mode -NO_FIELD_OPTIONS,MYSQL40 -set sql_mode="ANSI"; -select @@sql_mode; -@@sql_mode -REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ONLY_FULL_GROUP_BY,ANSI +SET @@SQL_MODE=""; diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 8eff870e855..277ae9e0b8d 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -129,6 +129,16 @@ ERROR 42S21: Duplicate column name 'b' drop table if exists t1,t2; Warnings: Note 1051 Unknown table 't2' +CREATE TABLE t1 (a int not null); +INSERT INTO t1 values (1),(2),(1); +CREATE TABLE t2 (primary key(a)) SELECT * FROM t1; +ERROR 23000: Duplicate entry '1' for key 1 +SELECT * from t2; +ERROR 42S02: Table 'test.t2' doesn't exist +DROP TABLE t1; +DROP TABLE IF EXISTS t2; +Warnings: +Note 1051 Unknown table 't2' create table t1 (a int not null, b int, primary key(a), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b)); show create table t1; Table Create Table diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result index 7b8e3c46200..8eecccf6fec 100644 --- a/mysql-test/r/insert_select.result +++ b/mysql-test/r/insert_select.result @@ -74,7 +74,12 @@ insert into t1 select * from t2; ERROR 23000: Duplicate entry '2' for key 1 show binlog events; Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.000001 4 Start 1 4 Server ver: VERSION, Binlog ver: 3 master-bin.000001 79 Query 1 79 use `test`; insert into t1 select * from t2 +select * from t1; +a +1 +2 drop table t1, t2; create table t1 (a int not null); create table t2 (a int not null); diff --git a/mysql-test/r/rpl000009.result b/mysql-test/r/rpl000009.result index fc55de7246c..1f78a505280 100644 --- a/mysql-test/r/rpl000009.result +++ b/mysql-test/r/rpl000009.result @@ -4,9 +4,13 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; +drop database if exists mysqltest; drop database if exists mysqltest2; -create database mysqltest2; +drop database if exists mysqltest3; drop database if exists mysqltest; +drop database if exists mysqltest2; +drop database if exists mysqltest3; +create database mysqltest2; create database mysqltest; create database mysqltest2; create table mysqltest2.foo (n int); @@ -46,45 +50,43 @@ show databases; Database mysql test -create database foo; -create table foo.t1(n int, s char(20)); -insert into foo.t1 values (1, 'original foo.t1'); -create table foo.t3(n int, s char(20)); -insert into foo.t3 values (1, 'original foo.t3'); -create database foo2; -create table foo2.t1(n int, s char(20)); -insert into foo2.t1 values (1, 'original foo2.t1'); -create database bar; -create table bar.t1(n int, s char(20)); -insert into bar.t1 values (1, 'original bar.t1'); -create table bar.t3(n int, s char(20)); -insert into bar.t3 values (1, 'original bar.t3'); +create database mysqltest2; +create table mysqltest2.t1(n int, s char(20)); +insert into mysqltest2.t1 values (1, 'original foo.t1'); +create table mysqltest2.t3(n int, s char(20)); +insert into mysqltest2.t3 values (1, 'original foo.t3'); +create database mysqltest3; +create table mysqltest3.t1(n int, s char(20)); +insert into mysqltest3.t1 values (1, 'original foo2.t1'); +create database mysqltest; +create table mysqltest.t1(n int, s char(20)); +insert into mysqltest.t1 values (1, 'original bar.t1'); +create table mysqltest.t3(n int, s char(20)); +insert into mysqltest.t3 values (1, 'original bar.t3'); load data from master; -Warnings: -Note 1008 Can't drop database 'mysqltest'; database doesn't exist -Note 1008 Can't drop database 'mysqltest2'; database doesn't exist show databases; Database mysql mysqltest mysqltest2 +mysqltest3 test use mysqltest2; show tables; Tables_in_mysqltest2 -use mysqltest; t1 t3 select * from t1; n s 1 original foo.t1 -use foo2; +use mysqltest3; show tables; -Tables_in_foo2 +Tables_in_mysqltest3 t1 select * from t1; n s 1 original foo2.t1 +use mysqltest; show tables; Tables_in_mysqltest t1 @@ -100,6 +102,9 @@ n s 11 eleven test 12 twelve test 13 thirteen test +select * from mysqltest.t3; +n s +1 original bar.t3 insert into mysqltest.t1 values (4, 'four test'); select * from mysqltest.t1; n s @@ -107,5 +112,13 @@ n s 2 two test 3 three test 4 four test +load table mysqltest.t1 from master; +ERROR 42S01: Table 't1' already exists +drop table mysqltest.t1; +load table mysqltest.t1 from master; +load table bar.t1 from master; +ERROR HY000: Error from master: 'Table 'bar.t1' doesn't exist' drop database mysqltest; drop database mysqltest2; +drop database mysqltest2; +drop database mysqltest3; diff --git a/mysql-test/t/ansi-master.opt b/mysql-test/t/ansi-master.opt deleted file mode 100644 index 6bf7a4f30e2..00000000000 --- a/mysql-test/t/ansi-master.opt +++ /dev/null @@ -1 +0,0 @@ ---ansi diff --git a/mysql-test/t/ansi.test b/mysql-test/t/ansi.test index f4aef5c3f8e..faf20f1e57e 100644 --- a/mysql-test/t/ansi.test +++ b/mysql-test/t/ansi.test @@ -6,6 +6,11 @@ drop table if exists t1; --enable_warnings +set sql_mode="MySQL40"; +select @@sql_mode; +set @@sql_mode="ANSI"; +select @@sql_mode; + # Test some functions that works different in ansi mode SELECT 'A' || 'B'; @@ -18,7 +23,4 @@ SELECT id,NULL,1,1.1,'a' FROM t1 GROUP BY id; SELECT id FROM t1 GROUP BY id2; drop table t1; -set sql_mode="MySQL40"; -select @@sql_mode; -set sql_mode="ANSI"; -select @@sql_mode; +SET @@SQL_MODE=""; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index 0b86b67fdbf..d57fd3bb193 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -110,6 +110,19 @@ drop table if exists t2; create table t2 (b int) select a as b, a+1 as b from t1; drop table if exists t1,t2; +# +# Test CREATE ... SELECT when insert fails +# + +CREATE TABLE t1 (a int not null); +INSERT INTO t1 values (1),(2),(1); +--error 1062 +CREATE TABLE t2 (primary key(a)) SELECT * FROM t1; +--error 1146 +SELECT * from t2; +DROP TABLE t1; +DROP TABLE IF EXISTS t2; + # # Test of primary key with 32 index # diff --git a/mysql-test/t/insert_select.test b/mysql-test/t/insert_select.test index 556b1ac9c8f..4effed9b6de 100644 --- a/mysql-test/t/insert_select.test +++ b/mysql-test/t/insert_select.test @@ -86,6 +86,7 @@ insert into t1 select * from t2; let $VERSION=`select version()`; --replace_result $VERSION VERSION show binlog events; +select * from t1; drop table t1, t2; # diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test index 3a24efd9f39..956afb3e7ca 100644 --- a/mysql-test/t/mysqlbinlog.test +++ b/mysql-test/t/mysqlbinlog.test @@ -83,7 +83,7 @@ select "--- Remote --" as ""; select "--- Broken LOAD DATA --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 # And this too ! (altough it is documented) --disable_query_log @@ -97,7 +97,7 @@ select "--- --database --" as ""; select "--- --position --" as ""; --enable_query_log --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR ---exec $MYSQL_BINLOG --short-form --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.002 +--exec $MYSQL_BINLOG --short-form --read-from-remote-server --position=27 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 # clean up drop table t1; -- cgit v1.2.1