List:Internals« Previous MessageNext Message »
From:sasha Date:October 5 2001 7:18pm
Subject:bk commit into 3.23 tree
View as plain text  
Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-10-05 13:18:18-06:00, sasha@stripped
  fixed crash on slave when master aborts a query that has % in it.

  BitKeeper/etc/logging_ok
    1.207 01/10/05 13:18:17 sasha@stripped +1 -0
    Logging to logging@stripped accepted

  mysql-test/t/rpl000001.test
    1.20 01/10/05 13:18:14 sasha@stripped +2 -2
    test for coredump on slave while trying to print aborted query

  sql/slave.cc
    1.115 01/10/05 13:18:14 sasha@stripped +1 -1
    do not coredump printing aborted query if it has % in it.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql

--- 1.114/sql/slave.cc	Wed Oct  3 07:27:20 2001
+++ 1.115/sql/slave.cc	Fri Oct  5 13:18:14 2001
@@ -862,7 +862,7 @@
  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;

--- 1.206/BitKeeper/etc/logging_ok	Wed Oct  3 09:38:28 2001
+++ 1.207/BitKeeper/etc/logging_ok	Fri Oct  5 13:18:17 2001
@@ -3,3 +3,4 @@
 paul@stripped
 serg@stripped
 monty@stripped
+sasha@stripped

--- 1.19/mysql-test/t/rpl000001.test	Mon Sep 17 19:58:14 2001
+++ 1.20/mysql-test/t/rpl000001.test	Fri Oct  5 13:18:14 2001
@@ -42,10 +42,10 @@
 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;
Thread
bk commit into 3.23 treesasha5 Oct