bk commit into 5.1 tree (holyfoot:1.2384)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of abotchkov. When abotchkov 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.2384 06/05/11 13:42:06 holyfoot@stripped +1 -0
  Merge abotchkov@stripped:/home/bk/mysql-5.1-new
  into  production.mysql.com:/usersnfs/abotchkov/mysql-5.1.mrg

  sql/sql_parse.cc
    1.546 06/05/11 13:41:58 holyfoot@stripped +0 -0
    Auto merged

# 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:	holyfoot
# Host:	production.mysql.com
# Root:	/usersnfs/abotchkov/mysql-5.1.mrg/RESYNC

--- 1.545/sql/sql_parse.cc	2006-05-11 09:28:47 +02:00
+++ 1.546/sql/sql_parse.cc	2006-05-11 13:41:58 +02:00
@@ -2468,8 +2468,10 @@
     statistic_increment(thd->status_var.com_stat[lex->sql_command],
                         &LOCK_status);
 
+#ifdef HAVE_ROW_BASED_REPLICATION
   if (lex->binlog_row_based_if_mixed)
     thd->set_current_stmt_binlog_row_based_if_mixed();
+#endif /*HAVE_ROW_BASED_REPLICATION*/
 
   switch (lex->sql_command) {
   case SQLCOM_SELECT:
@@ -5131,7 +5133,9 @@
   */
   if (thd->one_shot_set && lex->sql_command != SQLCOM_SET_OPTION)
     reset_one_shot_variables(thd);
+#ifdef HAVE_ROW_BASED_REPLICATION
   thd->reset_current_stmt_binlog_row_based();
+#endif /*HAVE_ROW_BASED_REPLICATION*/
 
   /*
     The return value for ROW_COUNT() is "implementation dependent" if the