bzr push into mysql-5.1-bugteam branch (aelkin:2890 to 2891)

[Andrei Elkin]

 2891 Andrei Elkin	2009-05-04
      removing the source of a warning in slave.cc:468
modified:
  sql/slave.cc

 2890 Serge Kozlov	2009-05-02
      Bug#38077.
      1. Replace waiting of SQL thread stop by waiting of SQL error on slave and stopped
      SQL thread.
      2. Remove debug code because it already implemented in MTR2.
modified:
  mysql-test/suite/rpl/t/rpl_incident.test

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2009-04-30 13:17:46 +0000
+++ b/sql/slave.cc	2009-05-04 09:59:10 +0000
@@ -465,8 +465,6 @@ terminate_slave_thread(THD *thd,
                        volatile uint *slave_running,
                        bool skip_lock)
 {
-  int error;
-
   DBUG_ENTER("terminate_slave_thread");
   if (!skip_lock)
   {