bk commit into 5.0 tree (aelkin:1.2492) BUG#27395

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of elkin. When elkin 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, 2007-03-24 14:27:07+02:00, aelkin@andrepl.(none) +1 -0
  Bug #27395  OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
  
  eliminating the unnecessary option.

  sql/mysql_priv.h@stripped, 2007-03-24 14:27:05+02:00, aelkin@andrepl.(none) +0 -3
    removal, as part of Bug#27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the
end of SF()

# 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:	aelkin
# Host:	andrepl.(none)
# Root:	/home/elkin/MySQL/MAIN/5.0-marvel-bug23333_sf_side_eff_binlog

--- 1.438/sql/mysql_priv.h	2007-03-16 10:47:51 +02:00
+++ 1.439/sql/mysql_priv.h	2007-03-24 14:27:05 +02:00
@@ -347,9 +347,6 @@ MY_LOCALE *my_locale_by_number(uint numb
    in the user query has requested */
 #define SELECT_ALL              (ULL(1) << 24)    // SELECT, user, parser
 
-/* Set if we are updating a non-transaction safe table */
-#define OPTION_STATUS_NO_TRANS_UPDATE   (ULL(1) << 25) // THD, intern
-
 /* The following can be set when importing tables in a 'wrong order'
    to suppress foreign key checks */
 #define OPTION_NO_FOREIGN_KEY_CHECKS    (ULL(1) << 26) // THD, user, binlog