After merge fixes

libmysql/libmysql.c

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

-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

 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;