mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

After merge fixes

Browse source
This commit is contained in:
unknown 2004-10-20 17:28:40 +03:00
parent 560d7bcdd0
commit 4ba94cc3f9
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmysql/libmysql.c
View file

@ -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);

6
mysql-test/r/rpl_commit_after_flush.result
View file

@ -1,10 +1,10 @@
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;

2
mysql-test/t/rpl_commit_after_flush.test
View file

@ -1,6 +1,6 @@
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;