From 80f52d455182c1f7997b69dca335e1149224c32e Mon Sep 17 00:00:00 2001
From: unknown <monty@hundin.mysql.fi>
Date: Wed, 3 Oct 2001 18:38:32 +0300
Subject: [PATCH 1/2] Portability fix

---
 mysql-test/t/rpl000017.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test
index 04a2bc9c78a..8e4e61cb9d6 100644
--- a/mysql-test/t/rpl000017.test
+++ b/mysql-test/t/rpl000017.test
@@ -3,6 +3,7 @@ connect (slave,localhost,root,,test,0,mysql-slave.sock);
 connection master;
 reset master;
 grant file on *.* to replicate@localhost identified by 'aaaaaaaaaaaaaaab';
+grant file on *.* to replicate@127.0.0.1 identified by 'aaaaaaaaaaaaaaab';
 connection slave;
 slave start;
 connection master;

From 9def70036f82bc3d9338b1584226451bbe88ab96 Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Fri, 5 Oct 2001 13:18:18 -0600
Subject: [PATCH 2/2] fixed crash on slave when master aborts a query that has
 % in it.

mysql-test/t/rpl000001.test:
  test for coredump on slave while trying to print aborted query
sql/slave.cc:
  do not coredump printing aborted query if it has % in it.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
---
 BitKeeper/etc/logging_ok    | 1 +
 mysql-test/t/rpl000001.test | 4 ++--
 sql/slave.cc                | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index c3643d477b3..a221148e3d5 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -3,3 +3,4 @@ monty@hundin.mysql.fi
 paul@central.snake.net
 serg@serg.mysql.com
 monty@work.mysql.com
+sasha@mysql.sashanet.com
diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index 54882d7bd43..113a9637dac 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -42,10 +42,10 @@ save_master_pos;
 connection master1;
 #avoid generating result
 create temporary table t1_temp(n int);
-insert into t1_temp select get_lock('crash_lock', 1) from t2;
+insert into t1_temp select get_lock('crash_lock%20C', 1) from t2;
 
 connection master;
-send update t1 set n = n + get_lock('crash_lock', 2);
+send update t1 set n = n + get_lock('crash_lock%20C', 2);
 connection master1;
 sleep 2;
 select (@id := id) - id from t2;
diff --git a/sql/slave.cc b/sql/slave.cc
index 5836ac441e1..b550b849a09 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -862,7 +862,7 @@ point. If you are sure that your master is ok, run this query manually on the\
  slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1;\
  SLAVE START;", thd->query);
       last_slave_errno = expected_error;
-      sql_print_error(last_slave_error);
+      sql_print_error("%s",last_slave_error);
       return 1;
     default:
       return 0;