Commit 69b7c5fe authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz

Merge bk-internal:/home/bk/mysql-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
parents 0463ba57 8642b248
...@@ -542,17 +542,25 @@ call p_verify_status_increment(0, 0, 0, 0); ...@@ -542,17 +542,25 @@ call p_verify_status_increment(0, 0, 0, 0);
--echo # 16. A function changes non-trans-table. --echo # 16. A function changes non-trans-table.
--echo # --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(); select f1();
call p_verify_status_increment(0, 0, 0, 0); call p_verify_status_increment(0, 0, 1, 0);
commit; 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 # 17. Read-only statement, a function changes non-trans-table.
--echo # --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; select f1() from t1;
call p_verify_status_increment(1, 0, 1, 0); call p_verify_status_increment(1, 0, 2, 0);
commit; 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 # 18. Read-write statement: UPDATE, change 0 (transactional) rows.
--echo # --echo #
......
...@@ -571,27 +571,35 @@ SUCCESS ...@@ -571,27 +571,35 @@ SUCCESS
# 16. A function changes non-trans-table. # 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(); select f1();
f1() f1()
2 2
call p_verify_status_increment(0, 0, 0, 0); call p_verify_status_increment(0, 0, 1, 0);
SUCCESS SUCCESS
commit; commit;
call p_verify_status_increment(0, 0, 0, 0); call p_verify_status_increment(0, 0, 1, 0);
SUCCESS SUCCESS
# 17. Read-only statement, a function changes non-trans-table. # 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; select f1() from t1;
f1() f1()
2 2
2 2
call p_verify_status_increment(1, 0, 1, 0); call p_verify_status_increment(1, 0, 2, 0);
SUCCESS SUCCESS
commit; commit;
call p_verify_status_increment(1, 0, 1, 0); call p_verify_status_increment(1, 0, 2, 0);
SUCCESS SUCCESS
# 18. Read-write statement: UPDATE, change 0 (transactional) rows. # 18. Read-write statement: UPDATE, change 0 (transactional) rows.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment