From: Date: December 14 2005 6:42pm
Subject: bk commit into 5.0 tree (ramil:1.2003) BUG#15668
List-Archive: http://lists.mysql.com/internals/33246
X-Bug: 15668
Message-Id: <200512141742.jBEHgF5e018384@myoffice.izhnet.ru>

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2003 05/12/14 21:42:08 ramil@stripped +5 -0
  Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
  and bug #15668: Test 'sp-error' crashes server on Mac OS X.

  sql/sql_class.cc
    1.227 05/12/14 21:42:01 ramil@stripped +3 -1
    Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
    and bug #15668: Test 'sp-error' crashes server on Mac OS X.
    - don't call the close_active_vio() in case of KILL_QUERY.

  mysql-test/t/rpl_error_ignored_table.test
    1.21 05/12/14 21:42:01 ramil@stripped +1 -1
    Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
    and bug #15668: Test 'sp-error' crashes server on Mac OS X.
    - accept 2013 error as well.

  mysql-test/t/rpl000001.test
    1.42 05/12/14 21:42:01 ramil@stripped +1 -1
    Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
    and bug #15668: Test 'sp-error' crashes server on Mac OS X.
    - accept 2013 error as well.

  mysql-test/t/flush_read_lock_kill.test
    1.4 05/12/14 21:42:01 ramil@stripped +1 -1
    Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
    and bug #15668: Test 'sp-error' crashes server on Mac OS X.
    - accept 2013 error as well.

  mysql-test/r/rpl000001.result
    1.30 05/12/14 21:42:00 ramil@stripped +1 -1
    Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX 
    and bug #15668: Test 'sp-error' crashes server on Mac OS X.
    - accept 2013 error as well.

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/mysql-5.0-release

--- 1.226/sql/sql_class.cc	2005-12-01 14:31:16 +04:00
+++ 1.227/sql/sql_class.cc	2005-12-14 21:42:01 +04:00
@@ -473,10 +473,12 @@ void THD::awake(THD::killed_state state_
 
   killed= state_to_set;
   if (state_to_set != THD::KILL_QUERY)
+  {
     thr_alarm_kill(real_id);
 #ifdef SIGNAL_WITH_VIO_CLOSE
-  close_active_vio();
+    close_active_vio();
 #endif    
+  }
   if (mysys_var)
   {
     pthread_mutex_lock(&mysys_var->mutex);

--- 1.3/mysql-test/t/flush_read_lock_kill.test	2005-09-01 20:01:14 +05:00
+++ 1.4/mysql-test/t/flush_read_lock_kill.test	2005-12-14 21:42:01 +04:00
@@ -42,7 +42,7 @@ connection con1;
 # debug build running without our --debug=make_global..., will be
 # error 0 (no error). The only important thing to test is that on
 # debug builds with our --debug=make_global... we don't hang forever.
---error 0,1053
+--error 0,1053,2013
 reap;
 
 connection con2;

--- 1.20/mysql-test/t/rpl_error_ignored_table.test	2005-09-16 00:17:37 +05:00
+++ 1.21/mysql-test/t/rpl_error_ignored_table.test	2005-12-14 21:42:01 +04:00
@@ -45,7 +45,7 @@ select (@id := id) - id from t3;
 kill @id;
 drop table t2,t3;
 connection master;
---error 0,1053
+--error 0,1053,2013
 reap;
 connection master1;
 --replace_column 2 # 5 #

--- 1.29/mysql-test/r/rpl000001.result	2005-04-06 07:45:07 +05:00
+++ 1.30/mysql-test/r/rpl000001.result	2005-12-14 21:42:00 +04:00
@@ -50,7 +50,7 @@ select (@id := id) - id from t2;
 0
 kill @id;
 drop table t2;
-ERROR 08S01: Server shutdown in progress
+Got one of the listed errors
 set global sql_slave_skip_counter=1;
 start slave;
 select count(*) from t1;

--- 1.41/mysql-test/t/rpl000001.test	2005-09-01 20:27:02 +05:00
+++ 1.42/mysql-test/t/rpl000001.test	2005-12-14 21:42:01 +04:00
@@ -92,7 +92,7 @@ kill @id;
 # We don't drop t3 as this is a temporary table
 drop table t2;
 connection master;
---error 1053
+--error 1053,2013
 reap;
 connection slave;
 # The SQL slave thread should now have stopped because the query was killed on