bzr commit into mysql-6.0 branch (mats:2685)

[Mats Kindahl]

#At file:///home/bzr/merges/merge-6.0-rpl-merge/

 2685 Mats Kindahl	2008-09-18
      Fixes to eliminate some red in the 6.0-rpl-merge tree
modified:
  mysql-test/t/completion_type_func.test
  sql/sql_repl.cc

per-file messages:
  mysql-test/t/completion_type_func.test
    Disabling test for embedded server since it uses several threads.
  sql/sql_repl.cc
    Adding code to clear I/O thread error fields in
    SHOW SLAVE STATUS when executing a CHANGE MASTER.
=== modified file 'mysql-test/t/completion_type_func.test'
--- a/mysql-test/t/completion_type_func.test	2008-04-16 08:23:07 +0000
+++ b/mysql-test/t/completion_type_func.test	2008-09-18 10:15:43 +0000
@@ -14,12 +14,16 @@
 # Description: Test Cases of Dynamic System Variable "completion_type"         #
 #              that checks functinality of this variable                       #
 #                                                                              #
+#              Matz: Test designed to use several connections, so it           #
+#              cannot be used for embedded servers.                            #
+#                                                                              #
 # Reference: http://dev.mysql.com/doc/refman/5.1/en/                           #
 #          server-system-variables.html#option_mysqld_completion_type          #
 #                                                                              #
 ################################################################################
 
 --source include/have_innodb.inc
+--source include/not_embedded.inc;
 
 --disable_warnings
 drop table if exists t1;

=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc	2008-09-17 14:16:38 +0000
+++ b/sql/sql_repl.cc	2008-09-18 10:15:43 +0000
@@ -1478,6 +1478,7 @@ bool change_master(THD* thd, Master_info
   pthread_mutex_lock(&mi->rli.data_lock);
   mi->rli.abort_pos_wait++; /* for MASTER_POS_WAIT() to abort */
   /* Clear the errors, for a clean start */
+  mi->clear_error();
   mi->rli.clear_error();
   mi->rli.clear_until_condition();
   /*