Commit 4ba94cc3 authored by unknown's avatar unknown
Browse files

After merge fixes

parent 560d7bcd

libmysql/libmysql.c

+2 −2
Original line number Diff line number Diff line
@@ -1570,8 +1570,8 @@ ulong mysql_hex_string(char *to, const char *from, ulong length) 
            

  for (end= from + length; from < end; from++)

  {

    *to++= _dig_vec[((unsigned char) *from) >> 4];

    *to++= _dig_vec[((unsigned char) *from) & 0x0F];

    *to++= _dig_vec_upper[((unsigned char) *from) >> 4];

    *to++= _dig_vec_upper[((unsigned char) *from) & 0x0F];

  }

  *to= '\0';

  return (ulong) (to-to0);

mysql-test/r/rpl_commit_after_flush.result

+3 −3
Original line number Diff line number Diff line 
slave stop;

stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

slave start;

create table t1 (a int) type=innodb;

start slave;

create table t1 (a int) engine=innodb;

begin;

insert into t1 values(1);

flush tables with read lock;

mysql-test/t/rpl_commit_after_flush.test

+1 −1
Original line number Diff line number Diff line 
source include/master-slave.inc;

source include/have_innodb.inc;

create table t1 (a int) type=innodb;

create table t1 (a int) engine=innodb;

begin;

insert into t1 values(1);

flush tables with read lock;