bk commit into 4.1 tree (lars:1.2297) BUG#6883

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
4.1 repository of lars. When lars 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.2297 05/06/07 11:47:59 lars@stripped +1 -0
  BUG#6883: Changed comment, style

  sql/sql_parse.cc
    1.438 05/06/07 11:47:41 lars@stripped +4 -4
    Changed comment, style

# 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:	lars
# Host:	dhcppc0.ver
# Root:	/home/bk/b6883-mysql-4.1

--- 1.437/sql/sql_parse.cc	2005-06-01 15:52:00 +02:00
+++ 1.438/sql/sql_parse.cc	2005-06-07 11:47:41 +02:00
@@ -2420,8 +2420,8 @@
     }
     else 
     {
-      /* So that CREATE TEMPORARY TABLE gets flushed to binlog */
-      thd->options|= (OPTION_STATUS_NO_TRANS_UPDATE);
+      /* So that CREATE TEMPORARY TABLE gets to binlog at commit/rollback */
+      thd->options|= OPTION_STATUS_NO_TRANS_UPDATE;
     }
     /* Skip first table, which is the table we are creating */
     TABLE_LIST *create_table, *create_table_local;
@@ -2989,8 +2989,8 @@
       if (thd->slave_thread)
 	lex->drop_if_exists= 1;
 
-      /* So that DROP TEMPORARY TABLE gets flushed to binlog */
-      thd->options|= (OPTION_STATUS_NO_TRANS_UPDATE);
+      /* So that DROP TEMPORARY TABLE gets to binlog at commit/rollback */
+      thd->options|= OPTION_STATUS_NO_TRANS_UPDATE;
     }
     res= mysql_rm_table(thd,tables,lex->drop_if_exists, lex->drop_temporary);
   }