1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()

Browse Source 
eliminating the unnecessary option; and replacing site-dependant stuff in the test


mysql-test/r/sp_trans.result:
  results changed, will be changed again after bug#23333 fixed
mysql-test/t/sp_trans.test:
  replacing sensitive stuff
sql/mysql_priv.h:
  removal, as part of Bug#27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()
This commit is contained in:
unknown 2007-03-24 14:40:38 +02:00
parent 7b41fd46d4
commit d18945535d
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/sp_trans.result
View File

@ -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

3
mysql-test/t/sp_trans.test
View File

@ -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 */|
#

3
sql/mysql_priv.h
View File

@ -347,9 +347,6 @@ MY_LOCALE *my_locale_by_number(uint number);
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