WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.

This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).


mysql-test/r/mix_innodb_myisam_binlog.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_change_master.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_deadlock.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_error_ignored_table.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_flush_log_loop.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_loaddata.result:
  we now use one less byte when storing the catalog in binlog so positions change.
  Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/r/rpl_log.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_max_relay_size.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_relayrotate.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_replicate_do.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_rotate_logs.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_until.result:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog2.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_deadlock.test:
  we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_loaddata.test:
  we now use one less byte when storing the catalog in binlog so positions change.
  Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/t/rpl_until.test:
  we now use one less byte when storing the catalog in binlog so positions change
sql/log_event.cc:
  a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
  This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4
  are explained in the comments in this file.
  b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
  been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
  before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
  c) if slave fails in Execute_load_query_log_event::exec_event(),
  don't delete the file (so that it's re-usable at next START SLAVE).
sql/log_event.h:
  We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
  This saves one byte per Query_log_event on disk. This new storage for
  the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE
  as 5.0.3 slaves of this 5.0.4 master would segfault because it would
  expect a 0 when there is none.
  Renaming get_open_mode() to get_create_or_append() (see log_event.cc)
sql/sql_load.cc:
  Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table
  (i.e. has deleted/added/modified some rows in a non-transactional table),
  we must write an Execute_load_query_log_event to binlog (with the error code,
  as this class beautifully inherits from Query_log_event, it can store
  the error code - thanks Dmitri) and not a Delete_file_log_event (we use
  to write a Delete_file_log_event: no update happened on slave, bug).

1 files changed, 41 insertions, 41 deletions

diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 85b27dcad34..5d61746b984 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	End_log_pos	Info
 master-bin.000001	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	98	Query	1	220	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	220	Intvar	1	248	INSERT_ID=1
-master-bin.000001	248	Query	1	340	use `test`; insert into t1 values (NULL)
-master-bin.000001	340	Query	1	417	use `test`; drop table t1
-master-bin.000001	417	Query	1	521	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	521	Begin_load_query	1	1125	;file_id=1;block_len=581
-master-bin.000001	1125	Execute_load_query	1	1274	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001	1274	Query	1	1351	use `test`; drop table t1
+master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	219	Intvar	1	247	INSERT_ID=1
+master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
+master-bin.000001	338	Query	1	414	use `test`; drop table t1
+master-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
+master-bin.000001	1121	Execute_load_query	1	1269	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001	1269	Query	1	1345	use `test`; drop table t1
 show binlog events from 98 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	220	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
 show binlog events from 98 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	98	Query	1	220	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	220	Intvar	1	248	INSERT_ID=1
+master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	219	Intvar	1	247	INSERT_ID=1
 show binlog events from 98 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	248	Query	1	340	use `test`; insert into t1 values (NULL)
+master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
 flush logs;
 create table t5 (a int);
 drop table t5;
@@ -50,23 +50,23 @@ drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	98	Query	1	220	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	220	Intvar	1	248	INSERT_ID=1
-master-bin.000001	248	Query	1	340	use `test`; insert into t1 values (NULL)
-master-bin.000001	340	Query	1	417	use `test`; drop table t1
-master-bin.000001	417	Query	1	521	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	521	Begin_load_query	1	1125	;file_id=1;block_len=581
-master-bin.000001	1125	Execute_load_query	1	1274	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
-master-bin.000001	1274	Query	1	1351	use `test`; drop table t1
-master-bin.000001	1351	Rotate	1	1395	master-bin.000002;pos=4
+master-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	219	Intvar	1	247	INSERT_ID=1
+master-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
+master-bin.000001	338	Query	1	414	use `test`; drop table t1
+master-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
+master-bin.000001	1121	Execute_load_query	1	1269	use `test`; load data infile '../../std_data/words.dat' into table t1 ignore 1 lines ;file_id=1
+master-bin.000001	1269	Query	1	1345	use `test`; drop table t1
+master-bin.000001	1345	Rotate	1	1389	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	4	Format_desc	1	98	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	98	Query	1	185	use `test`; create table t5 (a int)
-master-bin.000002	185	Query	1	262	use `test`; drop table t5
-master-bin.000002	262	Query	1	349	use `test`; create table t1 (n int)
-master-bin.000002	349	Query	1	438	use `test`; insert into t1 values (1)
-master-bin.000002	438	Query	1	515	use `test`; drop table t1
+master-bin.000002	98	Query	1	184	use `test`; create table t5 (a int)
+master-bin.000002	184	Query	1	260	use `test`; drop table t5
+master-bin.000002	260	Query	1	346	use `test`; create table t1 (n int)
+master-bin.000002	346	Query	1	434	use `test`; insert into t1 values (1)
+master-bin.000002	434	Query	1	510	use `test`; drop table t1
 show binary logs;
 Log_name
 master-bin.000001
@@ -79,25 +79,25 @@ slave-bin.000002
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	98	Query	1	220	use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001	220	Intvar	1	248	INSERT_ID=1
-slave-bin.000001	248	Query	1	340	use `test`; insert into t1 values (NULL)
-slave-bin.000001	340	Query	1	417	use `test`; drop table t1
-slave-bin.000001	417	Query	1	521	use `test`; create table t1 (word char(20) not null)
-slave-bin.000001	521	Begin_load_query	1	1125	;file_id=1;block_len=581
-slave-bin.000001	1125	Execute_load_query	1	1283	use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
-slave-bin.000001	1283	Query	1	1360	use `test`; drop table t1
-slave-bin.000001	1360	Query	1	1447	use `test`; create table t5 (a int)
-slave-bin.000001	1447	Query	1	1524	use `test`; drop table t5
-slave-bin.000001	1524	Rotate	2	1567	slave-bin.000002;pos=4
+slave-bin.000001	98	Query	1	219	use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001	219	Intvar	1	247	INSERT_ID=1
+slave-bin.000001	247	Query	1	338	use `test`; insert into t1 values (NULL)
+slave-bin.000001	338	Query	1	414	use `test`; drop table t1
+slave-bin.000001	414	Query	1	517	use `test`; create table t1 (word char(20) not null)
+slave-bin.000001	517	Begin_load_query	1	1121	;file_id=1;block_len=581
+slave-bin.000001	1121	Execute_load_query	1	1278	use `test`; load data INFILE '../../var/tmp/SQL_LOAD-2-1-1.data' INTO table t1 ignore 1 lines ;file_id=1
+slave-bin.000001	1278	Query	1	1354	use `test`; drop table t1
+slave-bin.000001	1354	Query	1	1440	use `test`; create table t5 (a int)
+slave-bin.000001	1440	Query	1	1516	use `test`; drop table t5
+slave-bin.000001	1516	Rotate	2	1559	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000002	4	Format_desc	2	98	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	98	Query	1	185	use `test`; create table t1 (n int)
-slave-bin.000002	185	Query	1	274	use `test`; insert into t1 values (1)
-slave-bin.000002	274	Query	1	351	use `test`; drop table t1
+slave-bin.000002	98	Query	1	184	use `test`; create table t1 (n int)
+slave-bin.000002	184	Query	1	272	use `test`; insert into t1 values (1)
+slave-bin.000002	272	Query	1	348	use `test`; drop table t1
 show slave status;
 Slave_IO_State	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	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	515	#	#	master-bin.000002	Yes	Yes							0		0	515	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	510	#	#	master-bin.000002	Yes	Yes							0		0	510	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log