MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:holyfoot Date:May 24 2006 8:28am
Subject:bk commit into 5.1 tree (holyfoot:1.2185) BUG#19650
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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.2185 06/05/24 13:28:24 holyfoot@deer.(none) +3 -0
  bug #19650 (Embedded crashes in 5.1.10)

  sql/sql_insert.cc
    1.202 06/05/24 13:25:01 holyfoot@stripped +2 -0
    code shouldn't work without row based replication

  sql/log.cc
    1.209 06/05/24 13:25:01 holyfoot@stripped +2 -4
    code shouldn't work without row based replication

  mysql-test/extra/binlog_tests/innodb_stat.test
    1.2 06/05/24 13:25:01 holyfoot@stripped +2 -0
    test doesn't work with the embedded server

# 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:	deer.(none)
# Root:	/home/hf/work/mysql-5.1-release

--- 1.208/sql/log.cc	Mon May 22 23:45:57 2006
+++ 1.209/sql/log.cc	Wed May 24 13:25:01 2006
@@ -2877,7 +2877,7 @@
     }
 #endif /* HAVE_REPLICATION */
 
-#ifdef USING_TRANSACTIONS
+#if defined(USING_TRANSACTIONS) && defined(HAVE_ROW_BASED_REPLICATION)
     /*
       Should we write to the binlog cache or to the binlog on disk?
       Write to the binlog cache if:
@@ -2889,10 +2889,8 @@
     */
     if (opt_using_transactions && thd)
     {
-#ifdef HAVE_ROW_BASED_REPLICATION
       if (thd->binlog_setup_trx_data())
         goto err;
-#endif /*HAVE_ROW_BASED_REPLICATION*/
 
       binlog_trx_data *const trx_data=
         (binlog_trx_data*) thd->ha_data[binlog_hton.slot];
@@ -2916,7 +2914,7 @@
         LOCK_log.
       */
     }
-#endif
+#endif /* USING_TRANSACTIONS && HAVE_ROW_BASED_REPLICATION */
     DBUG_PRINT("info",("event type: %d",event_info->get_type_code()));
 
     /*

--- 1.201/sql/sql_insert.cc	Tue May 23 12:24:59 2006
+++ 1.202/sql/sql_insert.cc	Wed May 24 13:25:01 2006
@@ -2759,7 +2759,9 @@
     on rollback, we clear the OPTION_STATUS_NO_TRANS_UPDATE bit of
     thd->options.
    */
+#ifdef HAVE_ROW_BASED_REPLICATION
   DBUG_ASSERT(thd->current_stmt_binlog_row_based);
+#endif
   DBUG_ASSERT(tables && *tables && count > 0);
 
   thd->options&= ~OPTION_STATUS_NO_TRANS_UPDATE;

--- 1.1/mysql-test/extra/binlog_tests/innodb_stat.test	Thu Dec 22 09:34:50 2005
+++ 1.2/mysql-test/extra/binlog_tests/innodb_stat.test	Wed May 24 13:25:01 2006
@@ -1,3 +1,5 @@
+# Embedded server doesn't support binlog
+-- source include/not_embedded.inc
 -- source include/have_innodb.inc
 
 #
Thread
bk commit into 5.1 tree (holyfoot:1.2185) BUG#19650holyfoot24 May