diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-07-02 07:13:40 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-07-02 07:13:40 +0200 |
| commit | 68e1f851ed1d41923da17b5bfafdd2ad4d94f24a (patch) | |
| tree | 9f25f74747626e7fcb9c4fb1e1a336f08e189a60 /sql/log.cc | |
| parent | 0b0cef486d6a35894ce21d7d4242205880700fad (diff) | |
| download | mariadb-git-68e1f851ed1d41923da17b5bfafdd2ad4d94f24a.tar.gz | |
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:
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:
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:
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.
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 289d98e63d3..bcaf352f620 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1951,14 +1951,14 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) { /* 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); } |