bk commit into 5.1 tree (joerg:1.2568)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg 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@stripped, 2007-08-22 11:50:13+02:00, joerg@trift2. +1 -0
  After-merge fix:  "thd" -> "thd_arg" in parameter lists.

  sql/log_event.cc@stripped, 2007-08-22 11:50:07+02:00, joerg@trift2. +3 -3
    After-merge fix:  "thd" -> "thd_arg" in parameter lists.

diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-08-22 10:02:04 +02:00
+++ b/sql/log_event.cc	2007-08-22 11:50:07 +02:00
@@ -7016,7 +7016,7 @@ int Write_rows_log_event::do_after_row_o
   return error? error : local_error;
 }
 
-int Write_rows_log_event::do_prepare_row(THD *thd,
+int Write_rows_log_event::do_prepare_row(THD *thd_arg,
                                          Relay_log_info const *rli,
                                          TABLE *table,
                                          uchar const *const row_start,
@@ -7748,7 +7748,7 @@ int Delete_rows_log_event::do_after_row_
   return error;
 }
 
-int Delete_rows_log_event::do_prepare_row(THD *thd,
+int Delete_rows_log_event::do_prepare_row(THD *thd_arg,
                                           Relay_log_info const *rli,
                                           TABLE *table,
                                           uchar const *const row_start,
@@ -7928,7 +7928,7 @@ int Update_rows_log_event::do_after_row_
   return error;
 }
 
-int Update_rows_log_event::do_prepare_row(THD *thd,
+int Update_rows_log_event::do_prepare_row(THD *thd_arg,
                                           Relay_log_info const *rli,
                                           TABLE *table,
                                           uchar const *const row_start,