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

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

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
This commit is contained in:
unknown 2008-03-31 12:38:01 +03:00
commit 5ba1762d70
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/include/commit.inc
View File

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

16
mysql-test/r/commit_1innodb.result
View File

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