Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/home/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/t/rpl000017.test:
  Auto merged
sql/slave.cc:
  Auto merged

2 files changed, 3 insertions, 3 deletions

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 23475f3b1e8..d2e038bef88 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -925,7 +925,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;