Commit 8642b248 authored by mats@mats-laptop.(none)'s avatar mats@mats-laptop.(none)
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
parents 6a272aec 540247f3

mysql-test/include/commit.inc

+12 −4
Original line number Diff line number Diff line
@@ -542,17 +542,25 @@ call p_verify_status_increment(0, 0, 0, 0); 


--echo # 16. A function changes non-trans-table.

--echo #

--echo # For row-based logging, there is an extra commit for the

--echo # non-transactional changes saved in the transaction cache to

--echo # the binary log. 

--echo #

select f1();

call p_verify_status_increment(0, 0, 0, 0);

call p_verify_status_increment(0, 0, 1, 0);

commit;

call p_verify_status_increment(0, 0, 0, 0);

call p_verify_status_increment(0, 0, 1, 0);



--echo # 17. Read-only statement, a function changes non-trans-table.

--echo #

--echo # For row-based logging, there is an extra commit for the

--echo # non-transactional changes saved in the transaction cache to

--echo # the binary log. 

--echo #

select f1() from t1;

call p_verify_status_increment(1, 0, 1, 0);

call p_verify_status_increment(1, 0, 2, 0);

commit;

call p_verify_status_increment(1, 0, 1, 0);

call p_verify_status_increment(1, 0, 2, 0);



--echo # 18. Read-write statement: UPDATE, change 0 (transactional) rows. 

--echo #

mysql-test/r/commit_1innodb.result

+12 −4
Original line number Diff line number Diff line
@@ -571,27 +571,35 @@ SUCCESS 


# 16. A function changes non-trans-table.

#

# For row-based logging, there is an extra commit for the

# non-transactional changes saved in the transaction cache to

# the binary log. 

#

select f1();

f1()

2

call p_verify_status_increment(0, 0, 0, 0);

call p_verify_status_increment(0, 0, 1, 0);

SUCCESS



commit;

call p_verify_status_increment(0, 0, 0, 0);

call p_verify_status_increment(0, 0, 1, 0);

SUCCESS



# 17. Read-only statement, a function changes non-trans-table.

#

# For row-based logging, there is an extra commit for the

# non-transactional changes saved in the transaction cache to

# the binary log. 

#

select f1() from t1;

f1()

2

2

call p_verify_status_increment(1, 0, 1, 0);

call p_verify_status_increment(1, 0, 2, 0);

SUCCESS



commit;

call p_verify_status_increment(1, 0, 1, 0);

call p_verify_status_increment(1, 0, 2, 0);

SUCCESS



# 18. Read-write statement: UPDATE, change 0 (transactional) rows.