From 4102f1589c23309de968a5bf9511d3228a1b9319 Mon Sep 17 00:00:00 2001 From: Monty Date: Sat, 2 May 2020 13:19:53 +0300 Subject: Aria will now register it's transactions MDEV-22531 Remove maria::implicit_commit() MDEV-22607 Assertion `ha_info->ht() != binlog_hton' failed in MYSQL_BIN_LOG::unlog_xa_prepare From the handler point of view, Aria now looks like a transactional engine. One effect of this is that we don't need to call maria::implicit_commit() anymore. This change also forces the server to call trans_commit_stmt() after doing any read or writes to system tables. This work will also make it easier to later allow users to have system tables in other engines than Aria. To handle the case that Aria doesn't support rollback, a new handlerton flag, HTON_NO_ROLLBACK, was added to engines that has transactions without rollback (for the moment only binlog and Aria). Other things - Moved freeing of MARIA_SHARE to a separate function as the MARIA_SHARE can be still part of a transaction even if the table has closed. - Changed Aria checkpoint to use the new MARIA_SHARE free function. This fixes a possible memory leak when using S3 tables - Changed testing of binlog_hton to instead test for HTON_NO_ROLLBACK - Removed checking of has_transaction_manager() in handler.cc as we can assume that as the transaction was started by the engine, it does support transactions. - Added new class 'start_new_trans' that can be used to start indepdendent sub transactions, for example while reading mysql.proc, using help or status tables etc. - open_system_tables...() and open_proc_table_for_Read() doesn't anymore take a Open_tables_backup list. This is now handled by 'start_new_trans'. - Split thd::has_transactions() to thd::has_transactions() and thd::has_transactions_and_rollback() - Added handlerton code to free cached transactions objects. Needed by InnoDB. squash! 2ed35999f2a2d84f1c786a21ade5db716b6f1bbc --- mysql-test/main/commit_1innodb.result | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'mysql-test/main/commit_1innodb.result') diff --git a/mysql-test/main/commit_1innodb.result b/mysql-test/main/commit_1innodb.result index 7d21540b548..cf673f81d82 100644 --- a/mysql-test/main/commit_1innodb.result +++ b/mysql-test/main/commit_1innodb.result @@ -385,6 +385,11 @@ end if; end| # Reset Handler_commit and Handler_prepare counters flush status; +# +# Count of reading of p_verify_status_increment() from mysql.proc +call p_verify_status_increment(2, 0, 2, 0); +SUCCESS + # # 1. Read-only statement: SELECT # @@ -568,7 +573,7 @@ begin insert t2 set a=2; return 2; end| -call p_verify_status_increment(0, 0, 0, 0); +call p_verify_status_increment(4, 0, 4, 0); SUCCESS # 16. A function changes non-trans-table. @@ -580,7 +585,7 @@ SUCCESS select f1(); f1() 2 -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(3, 0, 3, 0); SUCCESS commit; @@ -688,9 +693,9 @@ SUCCESS # 24. DDL: TRUNCATE TEMPORARY TABLE truncate table t2; -call p_verify_status_increment(4, 0, 4, 0); -ERROR -Expected commit increment: 4 actual: 2 +call p_verify_status_increment(2, 0, 2, 0); +SUCCESS + commit; # There is nothing left to commit call p_verify_status_increment(0, 0, 0, 0); @@ -855,7 +860,7 @@ call p_verify_status_increment(2, 0, 2, 0); SUCCESS create view v1 as select * from t2; -call p_verify_status_increment(2, 0, 2, 0); +call p_verify_status_increment(4, 0, 4, 0); SUCCESS check table t1; @@ -882,7 +887,7 @@ call p_verify_status_increment(0, 0, 0, 0); SUCCESS drop view v1; -call p_verify_status_increment(0, 0, 0, 0); +call p_verify_status_increment(2, 0, 2, 0); SUCCESS # -- cgit v1.2.1