bk commit into 5.0 tree (tnurnberg:1.2509) BUG#22540

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-02 07:13:40+02:00, tnurnberg@stripped +3 -0
  Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
  
  minor fixes to appease pushbuild.

  mysql-test/r/binlog.result@stripped, 2007-07-02 07:13:32+02:00, tnurnberg@stripped +2 -2
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  mysql-test/t/binlog.test@stripped, 2007-07-02 07:13:32+02:00, tnurnberg@stripped +1 -0
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    make test portable so it will work on servers with
    funny names.

  sql/log.cc@stripped, 2007-07-02 07:13:32+02:00, tnurnberg@stripped +2 -2
    Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB
    
    change type to uchar * so it's the same as in 5.1.

diff -Nrup a/mysql-test/r/binlog.result b/mysql-test/r/binlog.result
--- a/mysql-test/r/binlog.result	2007-06-30 02:30:18 +02:00
+++ b/mysql-test/r/binlog.result	2007-07-02 07:13:32 +02:00
@@ -256,7 +256,7 @@ reset master;
 create table t1 (a int) engine=innodb;
 show binlog events from 0;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	98	Server ver: 5.0.46-debug-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	98	Server version, Binlog ver: 4
 master-bin.000001	98	Query	1	198	use `test`; create table t1 (a int) engine=innodb
 master-bin.000001	198	Query	1	266	use `test`; BEGIN
 master-bin.000001	266	Query	1	357	use `test`; insert into t1 values( 400 )
@@ -659,7 +659,7 @@ master-bin.000001	36202	Query	1	36291	us
 master-bin.000001	36291	Query	1	36380	use `test`; insert into t1 values( 3 )
 master-bin.000001	36380	Query	1	36469	use `test`; insert into t1 values( 2 )
 master-bin.000001	36469	Query	1	36558	use `test`; insert into t1 values( 1 )
-master-bin.000001	36558	Xid	1	36585	COMMIT /* xid=186 */
+master-bin.000001	36558	Xid	1	36585	COMMIT /* XID */
 master-bin.000001	36585	Rotate	1	36629	master-bin.000002;pos=4
 drop table t1;
 set global binlog_cache_size=@bcs;
diff -Nrup a/mysql-test/t/binlog.test b/mysql-test/t/binlog.test
--- a/mysql-test/t/binlog.test	2007-06-30 02:30:18 +02:00
+++ b/mysql-test/t/binlog.test	2007-07-02 07:13:32 +02:00
@@ -159,6 +159,7 @@ while ($1)
 commit;
 enable_query_log;
 
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/ /Server ver: [^,]*,/Server version,/
 show binlog events from 0;
 
 drop table t1;
diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc	2007-06-30 02:30:18 +02:00
+++ b/sql/log.cc	2007-07-02 07:13:32 +02:00
@@ -1951,14 +1951,14 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE
           {
             /* we've got a full event-header, and it came in one piece */
 
-            char *log_pos= (char *)cache->read_pos + hdr_offs + LOG_POS_OFFSET;
+            uchar *log_pos= (uchar *)cache->read_pos + hdr_offs + LOG_POS_OFFSET;
 
             /* fix end_log_pos */
             val= uint4korr(log_pos) + group;
             int4store(log_pos, val);
 
             /* next event header at ... */
-            log_pos= (char *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET;
+            log_pos= (uchar *)cache->read_pos + hdr_offs + EVENT_LEN_OFFSET;
             hdr_offs += uint4korr(log_pos);
 
           }