List:Commits« Previous MessageNext Message »
From:knielsen Date:January 9 2006 10:23am
Subject:bk commit into 5.1 tree (knielsen:1.2026)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2026 06/01/09 11:23:15 knielsen@stripped +1 -0
  Fix "jump to label crosses initialization" compile error.

  sql/sql_delete.cc
    1.170 06/01/09 11:22:55 knielsen@stripped +4 -4
    Fix "jump to label crosses initialization" compile error.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new-solaris-compile-fix

--- 1.169/sql/sql_delete.cc	2006-01-09 09:47:02 +01:00
+++ 1.170/sql/sql_delete.cc	2006-01-09 11:22:55 +01:00
@@ -41,6 +41,7 @@
   uint usable_index= MAX_KEY;
   SELECT_LEX   *select_lex= &thd->lex->select_lex;
   bool          ha_delete_all_rows= 0;
+  ulonglong const saved_options= thd->options;
   DBUG_ENTER("mysql_delete");
 
   if (open_and_lock_tables(thd, table_list))
@@ -205,11 +206,10 @@
   will_batch= !table->file->start_bulk_delete();
 
   /*
-    Save the thread options before clearing the OPTION_BIN_LOG,
-    effectively disabling the binary log (unless it was already
-    disabled, of course).
+    We saved the thread options above before clearing the
+    OPTION_BIN_LOG, and will restore below, effectively disabling the
+    binary log (unless it was already disabled, of course).
   */
-  ulonglong const saved_options= thd->options;
   if (ha_delete_all_rows)
     thd->options&= ~static_cast<ulonglong>(OPTION_BIN_LOG);
 
Thread
bk commit into 5.1 tree (knielsen:1.2026)knielsen9 Jan