diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-08-08 12:21:04 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-08-08 12:21:04 -0400 |
| commit | 3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9 (patch) | |
| tree | 43c6e6c692907658893a31e6b94ec334d88e4e8b | |
| parent | aa7519299a307e06f2a155b879fa59699854a1da (diff) | |
| download | mariadb-git-3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9.tar.gz | |
Correct bad merge, and remove version numbers from test case.
mysql-test/r/mysqlbinlog2.result:
Change test case to remove server version number.
mysql-test/t/mysqlbinlog2.test:
Change test case to remove server version number.
mysys/mf_iocache2.c:
Correcting bad merge.
| -rw-r--r-- | mysql-test/r/mysqlbinlog2.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqlbinlog2.test | 2 | ||||
| -rw-r--r-- | mysys/mf_iocache2.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result index bb73ebde777..5347787d829 100644 --- a/mysql-test/r/mysqlbinlog2.result +++ b/mysql-test/r/mysqlbinlog2.result @@ -19,7 +19,7 @@ insert into t1 values(null, "f"); /*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/; DELIMITER /*!*/; # at {pos} -#{yymmdd} {HH:MM:SS} server id 1 end_log_pos {pos} Start: binlog v 4, server v 5.1.18-beta-debug-log created {yymmdd} {HH:MM:SS} at startup +#{yymmdd} {HH:MM:SS} server id 1 end_log_pos {pos} Start: binlog v #, server v ## created {yymmdd} {HH:MM:SS} at startup ROLLBACK/*!*/; # at {pos} #{yymmdd} {HH:MM:SS} server id 1 end_log_pos {pos} Query thread_id={integer} exec_time={integer} error_code=0 diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test index fa487662c10..be9397aafee 100644 --- a/mysql-test/t/mysqlbinlog2.test +++ b/mysql-test/t/mysqlbinlog2.test @@ -41,7 +41,7 @@ select "--- Local --" as ""; # be time dependent (the Start events). Better than nothing. # ---replace_regex /[[:<:]][0-9]{6} [0-9 ][0-9]:[0-9]{2}:[0-9]{2}[[:>:]]/{yymmdd} {HH:MM:SS}/ /=[0-9]+ /={integer} / /# at [0-9]+/# at {pos}/ /(pos:?) [0-9]+/\1 {pos}/ +--replace_regex /[[:<:]][0-9]{6} [0-9 ][0-9]:[0-9]{2}:[0-9]{2}[[:>:]]/{yymmdd} {HH:MM:SS}/ /=[0-9]+ /={integer} / /# at [0-9]+/# at {pos}/ /(pos:?) [0-9]+/\1 {pos}/ /binlog v [0-9]+, server v [^ ]* created/binlog v #, server v ## created/ --exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 --disable_query_log diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c index 39110445481..c54c7d13548 100644 --- a/mysys/mf_iocache2.c +++ b/mysys/mf_iocache2.c @@ -415,6 +415,7 @@ process_flags: if (*fmt == 'd') length2= (size_t) (int10_to_str((long) iarg,buff, -10) - buff); else + length2= (uint) (int10_to_str((long) (uint) iarg,buff,10)- buff); /* minimum width padding */ if (minimum_width > length2) |