fixed 'STARTING BY' in replication

vva@eagle.mysql.r18.ru · vva@eagle.mysql.r18.ru · commit 09348e271ac4 · 2003-05-21T14:54:02.000-04:00
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
@@ -7,7 +7,7 @@ slave start;
 create table t1(a int not null auto_increment, b int, primary key(a) );
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60));
-load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' ignore 1 lines;
+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;
 create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60));
 insert into t3 select * from t2;
 select * from t1;
diff --git a/mysql-test/std_data/rpl_loaddata2.dat b/mysql-test/std_data/rpl_loaddata2.dat
@@ -1,8 +1,8 @@
-2003-01-21,6328,%a%,%aaaaa%
+>2003-01-21,6328,%a%,%aaaaa%
 ##
-2003-02-22,2461,b,%a a a @@ @% @b ' " a%
+>2003-02-22,2461,b,%a a a @@ @% @b ' " a%
 ##
-2003-03-22,2161,%c%,%asdf%
+>2003-03-22,2161,%c%,%asdf%
 ##
-2003-04-22,2416,%a%,%bbbbb%
+>2003-04-22,2416,%a%,%bbbbb%
 ##
diff --git a/mysql-test/t/rpl_loaddata.test b/mysql-test/t/rpl_loaddata.test
@@ -10,8 +10,7 @@ create table t1(a int not null auto_increment, b int, primary key(a) );
 load data infile '../../std_data/rpl_loaddata.dat' into table t1;
 
 create temporary table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60));
-#load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionaly enclosed by '%' escaped by '@' lines terminated by '\n%%\n' ignore 1 lines;
- load data infile '../../std_data/rpl_loaddata2.dat' into table t2 fields terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by '\n##\n' ignore 1 lines;
+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;
 
 create table t3 (day date,id int(9),category enum('a','b','c'),name varchar(60));
 insert into t3 select * from t2;
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -309,15 +309,19 @@ void Load_log_event::pack_info(String* packet)
     pretty_print_str(&tmp, sql_ex.escaped, sql_ex.escaped_len);
   }
      
+  bool line_lexem_added= false;
   if (sql_ex.line_term_len)
   {
     tmp.append(" LINES TERMINATED BY ");
     pretty_print_str(&tmp, sql_ex.line_term, sql_ex.line_term_len);
+    line_lexem_added= true;
   }
 
   if (sql_ex.line_start_len)
   {
-    tmp.append(" LINES STARTING BY ");
+    if (!line_lexem_added)
+      tmp.append(" LINES");
+    tmp.append(" STARTING BY ");
     pretty_print_str(&tmp, sql_ex.line_start, sql_ex.line_start_len);
   }
      
@@ -1299,15 +1303,19 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db)
     pretty_print_str(file, sql_ex.escaped, sql_ex.escaped_len);
   }
      
+  bool line_lexem_added= false;
   if (sql_ex.line_term)
   {
     fprintf(file," LINES TERMINATED BY ");
     pretty_print_str(file, sql_ex.line_term, sql_ex.line_term_len);
+    line_lexem_added= true;
   }
 
   if (sql_ex.line_start)
   {
-    fprintf(file," LINES STARTING BY ");
+    if (!line_lexem_added)
+      fprintf(file," LINES");
+    fprintf(file," STARTING BY ");
     pretty_print_str(file, sql_ex.line_start, sql_ex.line_start_len);
   }
      

Original file line number	Diff line number	Diff line change
`@@ -309,15 +309,19 @@ void Load_log_event::pack_info(String* packet)`
`309`	`309`	`pretty_print_str(&tmp, sql_ex.escaped, sql_ex.escaped_len);`
`310`	`310`	`}`
`311`	`311`
	`312`	`+ bool line_lexem_added= false;`
`312`	`313`	`if (sql_ex.line_term_len)`
`313`	`314`	`{`
`314`	`315`	`tmp.append(" LINES TERMINATED BY ");`
`315`	`316`	`pretty_print_str(&tmp, sql_ex.line_term, sql_ex.line_term_len);`
	`317`	`+ line_lexem_added= true;`
`316`	`318`	`}`
`317`	`319`
`318`	`320`	`if (sql_ex.line_start_len)`
`319`	`321`	`{`
`320`		`- tmp.append(" LINES STARTING BY ");`
	`322`	`+ if (!line_lexem_added)`
	`323`	`+ tmp.append(" LINES");`
	`324`	`+ tmp.append(" STARTING BY ");`
`321`	`325`	`pretty_print_str(&tmp, sql_ex.line_start, sql_ex.line_start_len);`
`322`	`326`	`}`
`323`	`327`
`@@ -1299,15 +1303,19 @@ void Load_log_event::print(FILE* file, bool short_form, char* last_db)`
`1299`	`1303`	`pretty_print_str(file, sql_ex.escaped, sql_ex.escaped_len);`
`1300`	`1304`	`}`
`1301`	`1305`
	`1306`	`+ bool line_lexem_added= false;`
`1302`	`1307`	`if (sql_ex.line_term)`
`1303`	`1308`	`{`
`1304`	`1309`	`fprintf(file," LINES TERMINATED BY ");`
`1305`	`1310`	`pretty_print_str(file, sql_ex.line_term, sql_ex.line_term_len);`
	`1311`	`+ line_lexem_added= true;`
`1306`	`1312`	`}`
`1307`	`1313`
`1308`	`1314`	`if (sql_ex.line_start)`
`1309`	`1315`	`{`
`1310`		`- fprintf(file," LINES STARTING BY ");`
	`1316`	`+ if (!line_lexem_added)`
	`1317`	`+ fprintf(file," LINES");`
	`1318`	`+ fprintf(file," STARTING BY ");`
`1311`	`1319`	`pretty_print_str(file, sql_ex.line_start, sql_ex.line_start_len);`
`1312`	`1320`	`}`
`1313`	`1321`