bk commit into 5.1 tree (mattiasj:1.2519) BUG#33479

[mattiasj]

Below is the list of changes that have just been committed into a local
5.1 repository of mattiasj.  When mattiasj 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, 2008-04-02 14:00:59+02:00, mattiasj@stripped +1 -0
  Bug#33479 auto_increment failures in partitioning
  
  changed one row for better check if statement based binlogging

  sql/ha_partition.cc@stripped, 2008-04-02 14:00:57+02:00, mattiasj@stripped +1 -1
    Bug#33479 auto_increment failures in partitioning
    
    fix that checks the correct variable if the statement is logged
    as statement or row.

diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2008-04-01 23:04:38 +02:00
+++ b/sql/ha_partition.cc	2008-04-02 14:00:57 +02:00
@@ -5735,7 +5735,7 @@ void ha_partition::get_auto_increment(ul
       based replication.
     */
     if (!auto_increment_multi_row_stmt_lock &&
-        thd->variables.binlog_format == BINLOG_FORMAT_STMT &&
+        !thd->current_stmt_binlog_row_based &&
         (thd->lex->sql_command == SQLCOM_REPLACE_SELECT ||
          thd->lex->sql_command == SQLCOM_INSERT_SELECT ||
          thd->lex->sql_command == SQLCOM_LOAD))