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 15:21:45+02:00, aelkin@stripped
+4 -0
  Bug #27395  OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() 
  
  eliminating the unnecessary option; and replacing site-dependant stuff in the test

  mysql-test/r/sp_trans.result@stripped, 2007-03-24 15:21:41+02:00,
aelkin@stripped +4 -5
    results changed, will be changed again after bug#23333 fixed

  mysql-test/t/sp_trans.test@stripped, 2007-03-24 15:21:41+02:00,
aelkin@stripped +2 -1
    replacing sensitive stuff

  sql/ha_ndbcluster.cc@stripped, 2007-03-24 15:21:42+02:00,
aelkin@stripped +1 -1
    fixing assignment

  sql/mysql_priv.h@stripped, 2007-03-24 15:21:42+02:00,
aelkin@stripped +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:	dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
# 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 15:21:42 +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

--- 1.301/sql/ha_ndbcluster.cc	2007-03-23 17:12:55 +02:00
+++ 1.302/sql/ha_ndbcluster.cc	2007-03-24 15:21:42 +02:00
@@ -3636,7 +3636,7 @@ int ha_ndbcluster::external_lock(THD *th
     {
       m_transaction_on= FALSE;
       /* Would be simpler if has_transactions() didn't always say "yes" */
-      thd->no_trans_update= {TRUE, TRUE};
+      thd->no_trans_update.all= thd->no_trans_update.stmt= TRUE;
     }
     else if (!thd->transaction.on)
       m_transaction_on= FALSE;

--- 1.10/mysql-test/r/sp_trans.result	2007-03-23 17:12:55 +02:00
+++ 1.11/mysql-test/r/sp_trans.result	2007-03-24 15:21:41 +02:00
@@ -546,12 +546,11 @@ return @a;
 end|
 insert into t2 values (bug23333(),1)|
 ERROR 23000: Duplicate entry '1' for key 1
-show binlog events /* must show the insert */|
+show binlog events from 98 /* must show the insert */|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	98	Server ver: 5.0.40-debug-log, Binlog ver: 4
-master-bin.000001	98	Query	1	90	use `test`; insert into t2 values (1,1)
-master-bin.000001	188	Xid	1	215	COMMIT /* xid=1165 */
-master-bin.000001	215	Query	1	446	use `test`; CREATE DEFINER=`root`@`localhost` function
bug23333() 
+master-bin.000001	#	Query	1	#	use `test`; insert into t2 values (1,1)
+master-bin.000001	#	Xid	1	#	COMMIT /* xid=1165 */
+master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` function
bug23333() 
 RETURNS int(11)
 DETERMINISTIC
 begin

--- 1.10/mysql-test/t/sp_trans.test	2007-03-23 17:12:55 +02:00
+++ 1.11/mysql-test/t/sp_trans.test	2007-03-24 15:21:41 +02:00
@@ -580,7 +580,8 @@ end|
 
 --error ER_DUP_ENTRY
 insert into t2 values (bug23333(),1)| 
-show binlog events /* must show the insert */|
+--replace_column 2 # 5 #
+show binlog events from 98 /* must show the insert */|
 select count(*),@a from t1 /* must be 1,1 */|
 
 #