bk commit into 4.0 tree (pkarthick:1.2161)

[pkarthick]

Below is the list of changes that have just been committed into a local
4.0 repository of prem. When prem 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.2161 05/11/29 16:32:55 pkarthick@stripped +3 -0
  NetWare specific change to make rpl000001 and rpl_error_ignored_table test cases pass.

  mysql-test/t/rpl_error_ignored_table.test
    1.7 05/11/29 16:32:53 pkarthick@stripped +1 -1
    NetWare specific change to make rpl000001 and rpl_error_ignored_table test cases pass.

  mysql-test/t/rpl000001.test
    1.34 05/11/29 16:32:53 pkarthick@stripped +1 -1
    NetWare specific change to make rpl000001 and rpl_error_ignored_table test cases pass.

  mysql-test/r/rpl000001.result
    1.22 05/11/29 16:32:53 pkarthick@stripped +1 -1
    NetWare specific change to make rpl000001 and rpl_error_ignored_table test cases pass.

# 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:	pkarthick
# Host:	blr-naas-nwl04.blr.novell.com
# Root:	/home/prem/bk/Sawtooth_SP2_

--- 1.6/mysql-test/t/rpl_error_ignored_table.test	2004-05-10 15:45:38 +05:30
+++ 1.7/mysql-test/t/rpl_error_ignored_table.test	2005-11-29 16:32:53 +05:30
@@ -44,7 +44,7 @@
 kill @id;
 drop table t2,t3;
 connection master;
---error 1053,0;
+--error 2013,0;
 reap;
 connection master1;
 show binlog events from 79;

--- 1.21/mysql-test/r/rpl000001.result	2003-03-03 19:27:00 +05:30
+++ 1.22/mysql-test/r/rpl000001.result	2005-11-29 16:32:53 +05:30
@@ -56,7 +56,7 @@
 0
 kill @id;
 drop table t2;
-Server shutdown in progress
+Lost connection to MySQL server during query
 set global sql_slave_skip_counter=1;
 slave start;
 select count(*) from t1;

--- 1.33/mysql-test/t/rpl000001.test	2004-11-22 23:25:40 +05:30
+++ 1.34/mysql-test/t/rpl000001.test	2005-11-29 16:32:53 +05:30
@@ -87,7 +87,7 @@
 # We don't drop t3 as this is a temporary table
 drop table t2;
 connection master;
---error 1053;
+--error 2013;
 reap;
 connection slave;
 # The SQL slave thread should now have stopped because the query was killed on