mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 06:22:28 +01:00
32b5fb7323
After applying the snapshots, ensure that code conforms to the final version of WL 3914. It is signficant that, after these changes, InnoDB does not define MYSQL_SERVER, and can be built as an independent storage engine plugin. Fixes: Bug#9709: InnoDB inconsistensy causes "Operating System Error 32/33" Bug#18828: If InnoDB runs out of undo slots, it returns misleading 'table is full' Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB Bug#20352: Make ibuf_contract_for_n_pages tunable Bug#21101: Wrong error on exceeding max row size for InnoDB table Bug#21293: Deadlock detection prefers to kill long running FOR UPDATE queries Bug#22819: SHOW INNODB STATUS crashes the server with an assertion failure under high load Bug#25078: Make the replication thread to ignore innodb_thread_concurrency Bug#25645: Assertion failure in file srv0srv.c Bug#28138: indexing column prefixes produces corruption in InnoDB BitKeeper/deleted/.del-Makefile.am~55504c43d99979e4: Delete: storage/innobase/buf/Makefile.am BitKeeper/deleted/.del-Makefile.am~79bb55303929b560: Delete: storage/innobase/dict/Makefile.am BitKeeper/deleted/.del-Makefile.am~7cd88e5f9a8d7ce8: Delete: storage/innobase/data/Makefile.am BitKeeper/deleted/.del-Makefile.am~e19a1fb29b1fe527: Delete: storage/innobase/btr/Makefile.am BitKeeper/deleted/.del-Makefile.am~4ae65b009d41d1d: Delete: storage/innobase/eval/Makefile.am BitKeeper/deleted/.del-Makefile.am~679131a02af3f6fb: Delete: storage/innobase/fsp/Makefile.am BitKeeper/deleted/.del-Makefile.am~6acac9ae30eabdb3: Delete: storage/innobase/dyn/Makefile.am BitKeeper/deleted/.del-Makefile.am~a5e6b4385717fcb7: Delete: storage/innobase/fil/Makefile.am BitKeeper/deleted/.del-Makefile.am~11d601934b49c19: Delete: storage/innobase/fut/Makefile.am BitKeeper/deleted/.del-Makefile.am~5aab37bf3b6c430: Delete: storage/innobase/ibuf/Makefile.am BitKeeper/deleted/.del-Makefile.am~af2d719bb6e66986: Delete: storage/innobase/handler/Makefile.am BitKeeper/deleted/.del-Makefile.am~f0dbbc7a78648e18: Delete: storage/innobase/ha/Makefile.am BitKeeper/deleted/.del-Makefile.am~41684e54a5b0d26a: Delete: storage/innobase/log/Makefile.am BitKeeper/deleted/.del-Makefile.am~edd95d7290ddeff3: Delete: storage/innobase/lock/Makefile.am BitKeeper/deleted/.del-Makefile.i: Delete: storage/innobase/include/Makefile.i BitKeeper/deleted/.del-Makefile.am~2a6ccdba41b591a3: Delete: storage/innobase/mach/Makefile.am BitKeeper/deleted/.del-Makefile.am~2bd35bda856342: Delete: storage/innobase/os/Makefile.am BitKeeper/deleted/.del-Makefile.am~8448688c5ab92132: Delete: storage/innobase/mem/Makefile.am BitKeeper/deleted/.del-Makefile.am~b5a7a8cfa711b6de: Delete: storage/innobase/mtr/Makefile.am BitKeeper/deleted/.del-Makefile.am~2cee8a309eb8eee2: Delete: storage/innobase/page/Makefile.am BitKeeper/deleted/.del-Makefile.am~3d0553f8aa9c456b: Delete: storage/innobase/read/Makefile.am BitKeeper/deleted/.del-Makefile.am~7b0c4abae6684f8c: Delete: storage/innobase/pars/Makefile.am BitKeeper/deleted/.del-Makefile.am~d0e0dd55cbd413f0: Delete: storage/innobase/que/Makefile.am BitKeeper/deleted/.del-Makefile.am~20a219ccf7825d65: Delete: storage/innobase/row/Makefile.am BitKeeper/deleted/.del-Makefile.am~37bdfb2973b2442b: Delete: storage/innobase/rem/Makefile.am BitKeeper/deleted/.del-Makefile.am~557098c4e5c01ee2: Delete: storage/innobase/thr/Makefile.am BitKeeper/deleted/.del-Makefile.am~fdfe12f48c2499af: Delete: storage/innobase/sync/Makefile.am BitKeeper/deleted/.del-Makefile.am~feb2280a52035d8d: Delete: storage/innobase/srv/Makefile.am BitKeeper/deleted/.del-Makefile.am~456d34c4816dbda4: Delete: storage/innobase/ut/Makefile.am BitKeeper/deleted/.del-Makefile.am~5ec2ef0d2c35e138: Delete: storage/innobase/usr/Makefile.am BitKeeper/deleted/.del-Makefile.am~d25c456e48393313: Delete: storage/innobase/trx/Makefile.am mysql-test/r/innodb.result: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1421: Fix the innodb test by shifting some of the contents of the .result file. Approved by: Marko Revision r1422: Fix for Bug#21101 - returns wrong error message when table column defs exceed the max row size. The fix returns a more appropriate error message. Add a test case to innodb.test and expected output to innodb.result. mysql-test/t/innodb.test: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1422: Fix for Bug#21101 - returns wrong error message when table column defs exceed the max row size. The fix returns a more appropriate error message. Add a test case to innodb.test and expected output to innodb.result. storage/innobase/btr/btr0btr.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1546: When buffering an insert to a prefix index of a variable-length column, do not incorrectly mark the column as fixed-length. (Bug#28138) ibuf_entry_build(): Instead of prefix_len, pass fixed_len to dtype_new_store_for_order_and_null_size(). Add debug assertions. btr_index_rec_validate(): Correct a comment about prefix indexes. rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add debug assertions and comments. dict_col_type_assert_equal(): New debug function. storage/innobase/data/data0data.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1490: Add #include <ctype.h>. Apparently, this header is no longer included by the common headers. This may be related to WL#2936 (pluggable storage engines). storage/innobase/data/data0type.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko storage/innobase/dict/dict0crea.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/dict/dict0dict.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1490: Add #include <ctype.h>. Apparently, this header is no longer included by the common headers. This may be related to WL#2936 (pluggable storage engines). Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko Revision r1528: Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible. Revision r1529: Revert r799, which was supposed to prevent similar cases as Bug#21638. In reality, the patch breaks the handling of prefix indexes of variable-length columns in ROW_FORMAT=COMPACT. Reverting the patch is only a partial fix of Bug#28138. Revision r1535: Document that DICT_MAX_INDEX_COL_LEN must not be changed. storage/innobase/fsp/fsp0fsp.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko Revision r1528: Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible. storage/innobase/ibuf/ibuf0ibuf.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1420: Output to the error log information about the limitations of UNIV_IBUF_DEBUG. innobase_start_or_create_for_mysql(): Note that crash recovery is broken when UNIV_IBUF_DEBUG is defined. ibuf_counts[]: Make this a two-dimensional array. No need to allocate anything from the heap. Eliminate ibuf_counts_inited, as the array will be zero-filled by the runtime environment. ibuf_count_check(): New function, to print out an explanation before assertion failure. Revision r1528: Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible. Revision r1546: When buffering an insert to a prefix index of a variable-length column, do not incorrectly mark the column as fixed-length. (Bug#28138) ibuf_entry_build(): Instead of prefix_len, pass fixed_len to dtype_new_store_for_order_and_null_size(). Add debug assertions. btr_index_rec_validate(): Correct a comment about prefix indexes. rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add debug assertions and comments. dict_col_type_assert_equal(): New debug function. storage/innobase/include/db0err.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/include/dict0dict.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1546: When buffering an insert to a prefix index of a variable-length column, do not incorrectly mark the column as fixed-length. (Bug#28138) ibuf_entry_build(): Instead of prefix_len, pass fixed_len to dtype_new_store_for_order_and_null_size(). Add debug assertions. btr_index_rec_validate(): Correct a comment about prefix indexes. rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add debug assertions and comments. dict_col_type_assert_equal(): New debug function. storage/innobase/include/dict0dict.ic: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1546: When buffering an insert to a prefix index of a variable-length column, do not incorrectly mark the column as fixed-length. (Bug#28138) ibuf_entry_build(): Instead of prefix_len, pass fixed_len to dtype_new_store_for_order_and_null_size(). Add debug assertions. btr_index_rec_validate(): Correct a comment about prefix indexes. rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add debug assertions and comments. dict_col_type_assert_equal(): New debug function. storage/innobase/include/dict0mem.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1535: Document that DICT_MAX_INDEX_COL_LEN must not be changed. Revision r1536: Change the comment to a more appropriate one. Discussed with Heikki on IM. Approved by: Heikki storage/innobase/include/ha_prototypes.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1482: Fix Bug#25078 by always letting the replication thread on the slave server to enter InnoDB. This can be made further customizable by the user if we introduce a new config parameter. This will wait until config parameters can be easily added. Approved by: Marko Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki storage/innobase/include/os0file.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1431: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or ERROR_LOCK_VIOLATION is encountered during file operation. This is caused by backup software, so InnoDB should retry while the backup software is done with the file. Approved by: Heikki storage/innobase/include/rem0rec.ic: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1569: Fix some in:/out: comments. Approved by: Marko storage/innobase/include/row0mysql.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1422: Fix for Bug#21101 - returns wrong error message when table column defs exceed the max row size. The fix returns a more appropriate error message. Add a test case to innodb.test and expected output to innodb.result. storage/innobase/include/trx0trx.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1462: Fix typo in comment. Revision r1486: Improve the comment for trx_struct::undo_no. Suggested by: Heikki Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1497: Add the number of locks acquired by a transaction to its weight when choosing the lightest transaction to kill when a deadlock occurs. This fixes Bug#21293 partially. Approved by: Heikki Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki storage/innobase/include/trx0undo.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/include/ut0ut.h: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1528: Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible. storage/innobase/lock/lock0lock.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1457: Fix Bug#22819, remove assertion. (http://bugs.mysql.com/bug.php?id=22819) Revision r1497: Add the number of locks acquired by a transaction to its weight when choosing the lightest transaction to kill when a deadlock occurs. This fixes Bug#21293 partially. Approved by: Heikki Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko storage/innobase/log/log0log.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1521: Forward port r1520 from branches/5.0 Patch to allow monitor threads to stop before proceeding with normal shutdown. Also have a separate time counter for tablespace monitor. reviewed by: Heikki Revision r1524: Undo bad space formatting introduced in earlier commit r1521 spotted by: Marko Revision r1533: logs_empty_and_mark_files_at_shutdown(): Remove trailing whitespace that was added in r1521. storage/innobase/os/os0file.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1431: Fix Bug#9709 by retrying (forever) if ERROR_SHARING_VIOLATION or ERROR_LOCK_VIOLATION is encountered during file operation. This is caused by backup software, so InnoDB should retry while the backup software is done with the file. Approved by: Heikki storage/innobase/rem/rem0rec.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1528: Define an auxiliary macro UT_BITS_IN_BYTES() and use it where possible. Revision r1531: rec_get_converted_size_new(): Simplify and move a debug assertion. Revision r1546: When buffering an insert to a prefix index of a variable-length column, do not incorrectly mark the column as fixed-length. (Bug#28138) ibuf_entry_build(): Instead of prefix_len, pass fixed_len to dtype_new_store_for_order_and_null_size(). Add debug assertions. btr_index_rec_validate(): Correct a comment about prefix indexes. rec_get_converted_size_new(), rec_convert_dtuple_to_rec_new(): Add debug assertions and comments. dict_col_type_assert_equal(): New debug function. Revision r1555: rec_get_converted_size_new(): The total size of the infimum and supremum records in ROW_FORMAT=COMPACT is REC_N_NEW_EXTRA_BYTES + 8. The REC_N_NEW_EXTRA_BYTES was accidentally omitted in r1546. This function should never be called on those records, though. Revision r1569: Fix some in:/out: comments. Approved by: Marko storage/innobase/row/row0ins.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1485: Minor cleanup. row_ins_check_foreign_constraint(), row_ins_scan_sec_index_for_duplicate(): Make use of the predicates page_rec_is_infimum() and page_rec_is_supremum(). Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko storage/innobase/row/row0mysql.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1422: Fix for Bug#21101 - returns wrong error message when table column defs exceed the max row size. The fix returns a more appropriate error message. Add a test case to innodb.test and expected output to innodb.result. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/row/row0row.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko Revision r1529: Revert r799, which was supposed to prevent similar cases as Bug#21638. In reality, the patch breaks the handling of prefix indexes of variable-length columns in ROW_FORMAT=COMPACT. Reverting the patch is only a partial fix of Bug#28138. storage/innobase/row/row0sel.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1452: Fix phantom reads (http://bugs.mysql.com/27197) following Heikki's patch in the bug followup. Approved by: Heikki Revision r1455: Reindent with tabs instead of spaces. Spotted by: Marko storage/innobase/srv/srv0srv.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1424: Bug#20352. Added variable srv_insert_buffer_batch_size. We want to make this variable settable. Since the pluggable engine interface currently doesn't provide a usable mechanism, we will add the latter functionality once it's available. Revision r1426: Fix code indentation from r1424. Revision r1459: Fix typo in the comment. Revision r1482: Fix Bug#25078 by always letting the replication thread on the slave server to enter InnoDB. This can be made further customizable by the user if we introduce a new config parameter. This will wait until config parameters can be easily added. Approved by: Marko Revision r1487: Fix typo in comment. Spotted by: Marko Revision r1521: Forward port r1520 from branches/5.0 Patch to allow monitor threads to stop before proceeding with normal shutdown. Also have a separate time counter for tablespace monitor. reviewed by: Heikki Revision r1532: srv_lock_timeout_and_monitor_thread(): Correct the indentation that was broken in r1521. Revision r1553: Fix Bug#20090 as suggested in the bug followup by Heikki. Approved by: Heikki storage/innobase/srv/srv0start.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1420: Output to the error log information about the limitations of UNIV_IBUF_DEBUG. innobase_start_or_create_for_mysql(): Note that crash recovery is broken when UNIV_IBUF_DEBUG is defined. ibuf_counts[]: Make this a two-dimensional array. No need to allocate anything from the heap. Eliminate ibuf_counts_inited, as the array will be zero-filled by the runtime environment. ibuf_count_check(): New function, to print out an explanation before assertion failure. storage/innobase/sync/sync0arr.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko storage/innobase/trx/trx0rec.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/trx/trx0trx.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1491: Fix typo in comment. Revision r1497: Add the number of locks acquired by a transaction to its weight when choosing the lightest transaction to kill when a deadlock occurs. This fixes Bug#21293 partially. Approved by: Heikki Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki Revision r1522: trx0trx.c: Add missing #include "ha_prototypes.h". storage/innobase/trx/trx0undo.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. storage/innobase/ut/ut0ut.c: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1490: Add #include <ctype.h>. Apparently, this header is no longer included by the common headers. This may be related to WL#2936 (pluggable storage engines). mysql-test/r/innodb_trx_weight.result: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1498: Add a test about the behavior introduced in r1497. Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki mysql-test/include/innodb_trx_weight.inc: Apply the following innodb-5.1-* snapshots: ss1489, ss1496, ss1550, ss1569. Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki Revision r1556: mysql-test/innodb_trx_weight.inc: Add username root to the "connect" statement. The Unix user running mysql-test-run usually does not have any privileges on the MySQL test database. mysql-test/t/innodb_trx_weight.test: Fixes after merging InnoDB snapshots. Revision r1498: Add a test about the behavior introduced in r1497. Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki sql/sql_class.cc: Fixes after merging InnoDB snapshots. storage/innobase/Makefile.am: Fixes after merging InnoDB snapshots. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. storage/innobase/handler/ha_innodb.cc: Fixes after merging InnoDB snapshots. Revision r1422: Fix for Bug#21101 - returns wrong error message when table column defs exceed the max row size. The fix returns a more appropriate error message. Add a test case to innodb.test and expected output to innodb.result. Revision r1423: Fix for Bug#18828. Return DB_TOO_MANY_CONCURRENT_TRXS when we run out of UNDO slots in the rollback segment. This is a partial fix since the MySQL error code requested to properly report the error condition back to the client has not yet materialized. Currently we have #ifdef'd the error code translation in ha_innodb.cc. This will have to be changed as and when MySQl add the new requested code or an equivalent code that we can then use. Given the above, currently we will get the old behaviour, not the "fixed" and intended behaviour. Revision r1425: Fixed a missing function decoration that slipped into r1422. Revision r1434: Fix typo. Revision r1442: Potential fix for Bug#25645: "Move innobase_release_stat_resources(trx) outside the 'if' in ha_innobase::external_lock(). That would add more safety that whatever MySQL does at a query end, there would be no risk of a hang on the btr search latch." Also call innobase_release_temporary_latches() in the beginning of ha_innobase::close(). Approved by: Heikki Revision r1453: Bugfix: only call innobase_release_temporary_latches() in case of current_thd is not NULL, otherwise we get NULL pointer dereferencing. Approved by: Heikki Revision r1474: Fix typo in comment: the exact prototype is in include/data0type.ic, not in data/data0type.ic Revision r1482: Fix Bug#25078 by always letting the replication thread on the slave server to enter InnoDB. This can be made further customizable by the user if we introduce a new config parameter. This will wait until config parameters can be easily added. Approved by: Marko Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. Revision r1489: thd_to_trx(), check_trx_exists(): Remove the handlerton parameter. It is a singleton object whose address is stored into innodb_hton_ptr. Revision r1492: Convert innobase_buffer_pool_size and innobase_log_file_size types from longlong to long long because MYSQL_SYSVAR_LONGLONG marco expects long long type. Also change ((ulint)innobase_buffer_pool_size) / 1024 to (ulint)(innobase_buffer_pool_size / 1024) and remove comment which is no longer true. Provided that innobase_buffer_pool_size is always 64bits these statements are equivalent if ulint is 64 bit (well it will screw up if innobase_buffer_pool_size is negative). And if ulint is 32 bit the later variant gives a little more chance that the value will fit. Approved by: Heikki Revision r1493: ha_innodb.cc: Remove the declarations of some global InnoDB variables whose name starts with srv_. These variables are declared in the header files that are covered by #include directives in ha_innodb.cc. Revision r1495: Introduce the function reset_template() for resetting some fields of row_prebuilt_t; currently prebuilt->read_just_key and prebuilt->keep_other_fields_on_keyread. Revision r1496: ha_innobase::extra(): Replace references to prebuilt->trx with thd_to_trx(ha_thd()), in order to avoid potential memory corruption. Revision r1501: Fix Bug#21293: Consider transactions that had edited non-transactional tables heavier than ones that had not. This helps killing the "right" transaction in case of a deadlock. Approved by: Heikki Revision r1513: Split ut_a(a && b [&& c...]); into separate ut_a(a); ut_a(b); [ut_a(c); ...]. This makes it possible to see which expression was false by looking at the error message. Approved by: Marko Revision r1527: Cleanup in ha_innodb.cc: thd_is_replication_slave_thread(), thd_has_edited_nontrans_tables(): Remove blank line between the function comment and the function definition. There should be exactly one line between the return type and the function comment, and this line should be one of '', 'static', 'UNIV_INLINE', and 'extern "C"'. Revision r1538: Do not return error in ha_innobase::info if srv_force_recovery >= 4. This is to allow for normal processing of the query by MySQL instead of generating an error. Reviewed by: Heikki Revision r1551: ha_innobase::innobase_read_and_init_auto_inc(): Remember and restore prebuilt->sql_stat_start. In an ALTER TABLE statement in the innodb_gis test, an ut_ad() assertion failed, because no IX lock had been acquired on the table, because prebuilt->sql_stat_start was inadvertently reset to FALSE, by this function. This function was called via ha_innobase::info() and mysql_prepare_alter_table(). storage/innobase/plug.in: Fixes after merging InnoDB snapshots. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead. storage/innobase/handler/ha_innodb.h: Fixes after merging InnoDB snapshots. Revision r1488: Make InnoDB pluggable. That is, merge the modifications from MySQL WL#2936 and adapt some things. Note that ha_innodb.cc depends on mysql_tmpfile() being declared in <mysql/plugin.h>. Until the function is declared there, you can uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc. Remove storage/innobase/*/Makefile.am. The whole compilation is driven by storage/innobase/Makefile.am and storage/innobase/plug.in. plug.in: Declare InnoDB as a dynamic plugin. ha_innodb.h: Remove the declarations of many global variables. The variables are no longer directly referenced outside of storage/innobase. trx_t: Add the field trx->duplicates. trx_create(): Initialize the fields trx->active_trans and trx->duplicates. innobase_query_is_update(): Remove. Consult trx->duplicates instead.
785 lines
27 KiB
C
785 lines
27 KiB
C
/******************************************************
|
|
The transaction
|
|
|
|
(c) 1996 Innobase Oy
|
|
|
|
Created 3/26/1996 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#ifndef trx0trx_h
|
|
#define trx0trx_h
|
|
|
|
#include "univ.i"
|
|
#include "trx0types.h"
|
|
#include "lock0types.h"
|
|
#include "usr0types.h"
|
|
#include "que0types.h"
|
|
#include "mem0mem.h"
|
|
#include "read0types.h"
|
|
#include "dict0types.h"
|
|
#include "trx0xa.h"
|
|
|
|
extern ulint trx_n_mysql_transactions;
|
|
|
|
/*****************************************************************
|
|
Resets the new record lock info in a transaction struct. */
|
|
UNIV_INLINE
|
|
void
|
|
trx_reset_new_rec_lock_info(
|
|
/*========================*/
|
|
trx_t* trx); /* in: transaction struct */
|
|
/*****************************************************************
|
|
Registers that we have set a new record lock on an index. We only have space
|
|
to store 2 indexes! If this is called to store more than 2 indexes after
|
|
trx_reset_new_rec_lock_info(), then this function does nothing. */
|
|
UNIV_INLINE
|
|
void
|
|
trx_register_new_rec_lock(
|
|
/*======================*/
|
|
trx_t* trx, /* in: transaction struct */
|
|
dict_index_t* index); /* in: trx sets a new record lock on this
|
|
index */
|
|
/*****************************************************************
|
|
Checks if trx has set a new record lock on an index. */
|
|
UNIV_INLINE
|
|
ibool
|
|
trx_new_rec_locks_contain(
|
|
/*======================*/
|
|
/* out: TRUE if trx has set a new record lock
|
|
on index */
|
|
trx_t* trx, /* in: transaction struct */
|
|
dict_index_t* index); /* in: index */
|
|
/************************************************************************
|
|
Releases the search latch if trx has reserved it. */
|
|
|
|
void
|
|
trx_search_latch_release_if_reserved(
|
|
/*=================================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/**********************************************************************
|
|
Set detailed error message for the transaction. */
|
|
void
|
|
trx_set_detailed_error(
|
|
/*===================*/
|
|
trx_t* trx, /* in: transaction struct */
|
|
const char* msg); /* in: detailed error message */
|
|
/*****************************************************************
|
|
Set detailed error message for the transaction from a file. Note that the
|
|
file is rewinded before reading from it. */
|
|
|
|
void
|
|
trx_set_detailed_error_from_file(
|
|
/*=============================*/
|
|
trx_t* trx, /* in: transaction struct */
|
|
FILE* file); /* in: file to read message from */
|
|
/********************************************************************
|
|
Retrieves the error_info field from a trx. */
|
|
|
|
void*
|
|
trx_get_error_info(
|
|
/*===============*/
|
|
/* out: the error info */
|
|
trx_t* trx); /* in: trx object */
|
|
/********************************************************************
|
|
Creates and initializes a transaction object. */
|
|
|
|
trx_t*
|
|
trx_create(
|
|
/*=======*/
|
|
/* out, own: the transaction */
|
|
sess_t* sess); /* in: session or NULL */
|
|
/************************************************************************
|
|
Creates a transaction object for MySQL. */
|
|
|
|
trx_t*
|
|
trx_allocate_for_mysql(void);
|
|
/*========================*/
|
|
/* out, own: transaction object */
|
|
/************************************************************************
|
|
Creates a transaction object for background operations by the master thread. */
|
|
|
|
trx_t*
|
|
trx_allocate_for_background(void);
|
|
/*=============================*/
|
|
/* out, own: transaction object */
|
|
/************************************************************************
|
|
Frees a transaction object. */
|
|
|
|
void
|
|
trx_free(
|
|
/*=====*/
|
|
trx_t* trx); /* in, own: trx object */
|
|
/************************************************************************
|
|
Frees a transaction object for MySQL. */
|
|
|
|
void
|
|
trx_free_for_mysql(
|
|
/*===============*/
|
|
trx_t* trx); /* in, own: trx object */
|
|
/************************************************************************
|
|
Frees a transaction object of a background operation of the master thread. */
|
|
|
|
void
|
|
trx_free_for_background(
|
|
/*====================*/
|
|
trx_t* trx); /* in, own: trx object */
|
|
/********************************************************************
|
|
Creates trx objects for transactions and initializes the trx list of
|
|
trx_sys at database start. Rollback segment and undo log lists must
|
|
already exist when this function is called, because the lists of
|
|
transactions to be rolled back or cleaned up are built based on the
|
|
undo log lists. */
|
|
|
|
void
|
|
trx_lists_init_at_db_start(void);
|
|
/*============================*/
|
|
/********************************************************************
|
|
Starts a new transaction. */
|
|
|
|
ibool
|
|
trx_start(
|
|
/*======*/
|
|
/* out: TRUE if success, FALSE if the rollback
|
|
segment could not support this many transactions */
|
|
trx_t* trx, /* in: transaction */
|
|
ulint rseg_id);/* in: rollback segment id; if ULINT_UNDEFINED
|
|
is passed, the system chooses the rollback segment
|
|
automatically in a round-robin fashion */
|
|
/********************************************************************
|
|
Starts a new transaction. */
|
|
|
|
ibool
|
|
trx_start_low(
|
|
/*==========*/
|
|
/* out: TRUE */
|
|
trx_t* trx, /* in: transaction */
|
|
ulint rseg_id);/* in: rollback segment id; if ULINT_UNDEFINED
|
|
is passed, the system chooses the rollback segment
|
|
automatically in a round-robin fashion */
|
|
/*****************************************************************
|
|
Starts the transaction if it is not yet started. */
|
|
UNIV_INLINE
|
|
void
|
|
trx_start_if_not_started(
|
|
/*=====================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/*****************************************************************
|
|
Starts the transaction if it is not yet started. Assumes we have reserved
|
|
the kernel mutex! */
|
|
UNIV_INLINE
|
|
void
|
|
trx_start_if_not_started_low(
|
|
/*=========================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/*****************************************************************
|
|
Starts the transaction if it is not yet started. */
|
|
|
|
void
|
|
trx_start_if_not_started_noninline(
|
|
/*===============================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/********************************************************************
|
|
Commits a transaction. */
|
|
|
|
void
|
|
trx_commit_off_kernel(
|
|
/*==================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/********************************************************************
|
|
Cleans up a transaction at database startup. The cleanup is needed if
|
|
the transaction already got to the middle of a commit when the database
|
|
crashed, andf we cannot roll it back. */
|
|
|
|
void
|
|
trx_cleanup_at_db_startup(
|
|
/*======================*/
|
|
trx_t* trx); /* in: transaction */
|
|
/**************************************************************************
|
|
Does the transaction commit for MySQL. */
|
|
|
|
ulint
|
|
trx_commit_for_mysql(
|
|
/*=================*/
|
|
/* out: 0 or error number */
|
|
trx_t* trx); /* in: trx handle */
|
|
/**************************************************************************
|
|
Does the transaction prepare for MySQL. */
|
|
|
|
ulint
|
|
trx_prepare_for_mysql(
|
|
/*==================*/
|
|
/* out: 0 or error number */
|
|
trx_t* trx); /* in: trx handle */
|
|
/**************************************************************************
|
|
This function is used to find number of prepared transactions and
|
|
their transaction objects for a recovery. */
|
|
|
|
int
|
|
trx_recover_for_mysql(
|
|
/*==================*/
|
|
/* out: number of prepared transactions */
|
|
XID* xid_list, /* in/out: prepared transactions */
|
|
ulint len); /* in: number of slots in xid_list */
|
|
/***********************************************************************
|
|
This function is used to find one X/Open XA distributed transaction
|
|
which is in the prepared state */
|
|
trx_t *
|
|
trx_get_trx_by_xid(
|
|
/*===============*/
|
|
/* out: trx or NULL */
|
|
XID* xid); /* in: X/Open XA transaction identification */
|
|
/**************************************************************************
|
|
If required, flushes the log to disk if we called trx_commit_for_mysql()
|
|
with trx->flush_log_later == TRUE. */
|
|
|
|
ulint
|
|
trx_commit_complete_for_mysql(
|
|
/*==========================*/
|
|
/* out: 0 or error number */
|
|
trx_t* trx); /* in: trx handle */
|
|
/**************************************************************************
|
|
Marks the latest SQL statement ended. */
|
|
|
|
void
|
|
trx_mark_sql_stat_end(
|
|
/*==================*/
|
|
trx_t* trx); /* in: trx handle */
|
|
/************************************************************************
|
|
Assigns a read view for a consistent read query. All the consistent reads
|
|
within the same transaction will get the same read view, which is created
|
|
when this function is first called for a new started transaction. */
|
|
|
|
read_view_t*
|
|
trx_assign_read_view(
|
|
/*=================*/
|
|
/* out: consistent read view */
|
|
trx_t* trx); /* in: active transaction */
|
|
/***************************************************************
|
|
The transaction must be in the TRX_QUE_LOCK_WAIT state. Puts it to
|
|
the TRX_QUE_RUNNING state and releases query threads which were
|
|
waiting for a lock in the wait_thrs list. */
|
|
|
|
void
|
|
trx_end_lock_wait(
|
|
/*==============*/
|
|
trx_t* trx); /* in: transaction */
|
|
/********************************************************************
|
|
Sends a signal to a trx object. */
|
|
|
|
void
|
|
trx_sig_send(
|
|
/*=========*/
|
|
trx_t* trx, /* in: trx handle */
|
|
ulint type, /* in: signal type */
|
|
ulint sender, /* in: TRX_SIG_SELF or
|
|
TRX_SIG_OTHER_SESS */
|
|
que_thr_t* receiver_thr, /* in: query thread which wants the
|
|
reply, or NULL; if type is
|
|
TRX_SIG_END_WAIT, this must be NULL */
|
|
trx_savept_t* savept, /* in: possible rollback savepoint, or
|
|
NULL */
|
|
que_thr_t** next_thr); /* in/out: next query thread to run;
|
|
if the value which is passed in is
|
|
a pointer to a NULL pointer, then the
|
|
calling function can start running
|
|
a new query thread; if the parameter
|
|
is NULL, it is ignored */
|
|
/********************************************************************
|
|
Send the reply message when a signal in the queue of the trx has
|
|
been handled. */
|
|
|
|
void
|
|
trx_sig_reply(
|
|
/*==========*/
|
|
trx_sig_t* sig, /* in: signal */
|
|
que_thr_t** next_thr); /* in/out: next query thread to run;
|
|
if the value which is passed in is
|
|
a pointer to a NULL pointer, then the
|
|
calling function can start running
|
|
a new query thread */
|
|
/********************************************************************
|
|
Removes the signal object from a trx signal queue. */
|
|
|
|
void
|
|
trx_sig_remove(
|
|
/*===========*/
|
|
trx_t* trx, /* in: trx handle */
|
|
trx_sig_t* sig); /* in, own: signal */
|
|
/********************************************************************
|
|
Starts handling of a trx signal. */
|
|
|
|
void
|
|
trx_sig_start_handle(
|
|
/*=================*/
|
|
trx_t* trx, /* in: trx handle */
|
|
que_thr_t** next_thr); /* in/out: next query thread to run;
|
|
if the value which is passed in is
|
|
a pointer to a NULL pointer, then the
|
|
calling function can start running
|
|
a new query thread */
|
|
/********************************************************************
|
|
Ends signal handling. If the session is in the error state, and
|
|
trx->graph_before_signal_handling != NULL, returns control to the error
|
|
handling routine of the graph (currently only returns the control to the
|
|
graph root which then sends an error message to the client). */
|
|
|
|
void
|
|
trx_end_signal_handling(
|
|
/*====================*/
|
|
trx_t* trx); /* in: trx */
|
|
/*************************************************************************
|
|
Creates a commit command node struct. */
|
|
|
|
commit_node_t*
|
|
commit_node_create(
|
|
/*===============*/
|
|
/* out, own: commit node struct */
|
|
mem_heap_t* heap); /* in: mem heap where created */
|
|
/***************************************************************
|
|
Performs an execution step for a commit type node in a query graph. */
|
|
|
|
que_thr_t*
|
|
trx_commit_step(
|
|
/*============*/
|
|
/* out: query thread to run next, or NULL */
|
|
que_thr_t* thr); /* in: query thread */
|
|
|
|
/**************************************************************************
|
|
Prints info about a transaction to the given file. The caller must own the
|
|
kernel mutex and must have called
|
|
innobase_mysql_prepare_print_arbitrary_thd(), unless he knows that MySQL
|
|
or InnoDB cannot meanwhile change the info printed here. */
|
|
|
|
void
|
|
trx_print(
|
|
/*======*/
|
|
FILE* f, /* in: output stream */
|
|
trx_t* trx, /* in: transaction */
|
|
ulint max_query_len); /* in: max query length to print, or 0 to
|
|
use the default max length */
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
/**************************************************************************
|
|
Determines if the currently running transaction has been interrupted. */
|
|
|
|
ibool
|
|
trx_is_interrupted(
|
|
/*===============*/
|
|
/* out: TRUE if interrupted */
|
|
trx_t* trx); /* in: transaction */
|
|
#else /* !UNIV_HOTBACKUP */
|
|
#define trx_is_interrupted(trx) FALSE
|
|
#endif /* !UNIV_HOTBACKUP */
|
|
|
|
/***********************************************************************
|
|
Compares the "weight" (or size) of two transactions. The weight of one
|
|
transaction is estimated as the number of altered rows + the number of
|
|
locked rows. Transactions that have edited non-transactional tables are
|
|
considered heavier than ones that have not. */
|
|
|
|
int
|
|
trx_weight_cmp(
|
|
/*===========*/
|
|
/* out: <0, 0 or >0; similar to strcmp(3) */
|
|
trx_t* a, /* in: the first transaction to be compared */
|
|
trx_t* b); /* in: the second transaction to be compared */
|
|
|
|
/* Signal to a transaction */
|
|
struct trx_sig_struct{
|
|
ulint type; /* signal type */
|
|
ulint sender; /* TRX_SIG_SELF or
|
|
TRX_SIG_OTHER_SESS */
|
|
que_thr_t* receiver; /* non-NULL if the sender of the signal
|
|
wants reply after the operation induced
|
|
by the signal is completed */
|
|
trx_savept_t savept; /* possible rollback savepoint */
|
|
UT_LIST_NODE_T(trx_sig_t)
|
|
signals; /* queue of pending signals to the
|
|
transaction */
|
|
UT_LIST_NODE_T(trx_sig_t)
|
|
reply_signals; /* list of signals for which the sender
|
|
transaction is waiting a reply */
|
|
};
|
|
|
|
#define TRX_MAGIC_N 91118598
|
|
|
|
/* The transaction handle; every session has a trx object which is freed only
|
|
when the session is freed; in addition there may be session-less transactions
|
|
rolling back after a database recovery */
|
|
|
|
struct trx_struct{
|
|
ulint magic_n;
|
|
/* All the next fields are protected by the kernel mutex, except the
|
|
undo logs which are protected by undo_mutex */
|
|
const char* op_info; /* English text describing the
|
|
current operation, or an empty
|
|
string */
|
|
unsigned is_purge:1; /* 0=user transaction, 1=purge */
|
|
ulint conc_state; /* state of the trx from the point
|
|
of view of concurrency control:
|
|
TRX_ACTIVE, TRX_COMMITTED_IN_MEMORY,
|
|
... */
|
|
time_t start_time; /* time the trx object was created
|
|
or the state last time became
|
|
TRX_ACTIVE */
|
|
ulint isolation_level;/* TRX_ISO_REPEATABLE_READ, ... */
|
|
ibool check_foreigns; /* normally TRUE, but if the user
|
|
wants to suppress foreign key checks,
|
|
(in table imports, for example) we
|
|
set this FALSE */
|
|
ibool check_unique_secondary;
|
|
/* normally TRUE, but if the user
|
|
wants to speed up inserts by
|
|
suppressing unique key checks
|
|
for secondary indexes when we decide
|
|
if we can use the insert buffer for
|
|
them, we set this FALSE */
|
|
dulint id; /* transaction id */
|
|
XID xid; /* X/Open XA transaction
|
|
identification to identify a
|
|
transaction branch */
|
|
ibool support_xa; /* normally we do the XA two-phase
|
|
commit steps, but by setting this to
|
|
FALSE, one can save CPU time and about
|
|
150 bytes in the undo log size as then
|
|
we skip XA steps */
|
|
dulint no; /* transaction serialization number ==
|
|
max trx id when the transaction is
|
|
moved to COMMITTED_IN_MEMORY state */
|
|
ibool flush_log_later;/* when we commit the transaction
|
|
in MySQL's binlog write, we will
|
|
flush the log to disk later in
|
|
a separate call */
|
|
ibool must_flush_log_later;/* this flag is set to TRUE in
|
|
trx_commit_off_kernel() if
|
|
flush_log_later was TRUE, and there
|
|
were modifications by the transaction;
|
|
in that case we must flush the log
|
|
in trx_commit_complete_for_mysql() */
|
|
dulint commit_lsn; /* lsn at the time of the commit */
|
|
ibool dict_operation; /* TRUE if the trx is used to create
|
|
a table, create an index, or drop a
|
|
table. This is a hint that the table
|
|
may need to be dropped in crash
|
|
recovery. */
|
|
dulint table_id; /* table id if the preceding field is
|
|
TRUE */
|
|
/*------------------------------*/
|
|
unsigned duplicates:2; /* TRX_DUP_IGNORE | TRX_DUP_REPLACE */
|
|
unsigned active_trans:2; /* 1 - if a transaction in MySQL
|
|
is active. 2 - if prepare_commit_mutex
|
|
was taken */
|
|
void* mysql_thd; /* MySQL thread handle corresponding
|
|
to this trx, or NULL */
|
|
char** mysql_query_str;/* pointer to the field in mysqld_thd
|
|
which contains the pointer to the
|
|
current SQL query string */
|
|
const char* mysql_log_file_name;
|
|
/* if MySQL binlog is used, this field
|
|
contains a pointer to the latest file
|
|
name; this is NULL if binlog is not
|
|
used */
|
|
ib_longlong mysql_log_offset;/* if MySQL binlog is used, this field
|
|
contains the end offset of the binlog
|
|
entry */
|
|
const char* mysql_master_log_file_name;
|
|
/* if the database server is a MySQL
|
|
replication slave, we have here the
|
|
master binlog name up to which
|
|
replication has processed; otherwise
|
|
this is a pointer to a null
|
|
character */
|
|
ib_longlong mysql_master_log_pos;
|
|
/* if the database server is a MySQL
|
|
replication slave, this is the
|
|
position in the log file up to which
|
|
replication has processed */
|
|
/* A MySQL variable mysql_thd->synchronous_repl tells if we have
|
|
to use synchronous replication. See ha_innodb.cc. */
|
|
char* repl_wait_binlog_name;/* NULL, or if synchronous MySQL
|
|
replication is used, the binlog name
|
|
up to which we must communicate the
|
|
binlog to the slave, before returning
|
|
from a commit; this is the same as
|
|
mysql_log_file_name, but we allocate
|
|
and copy the name to a separate buffer
|
|
here */
|
|
ib_longlong repl_wait_binlog_pos;/* see above at
|
|
repl_wait_binlog_name */
|
|
|
|
os_thread_id_t mysql_thread_id;/* id of the MySQL thread associated
|
|
with this transaction object */
|
|
ulint mysql_process_no;/* since in Linux, 'top' reports
|
|
process id's and not thread id's, we
|
|
store the process number too */
|
|
ibool allow_duplicates;/* normally FALSE, but if the user
|
|
wants to update duplicate rows,
|
|
(in table inserts, for example) we
|
|
set this TRUE */
|
|
ibool replace_duplicates;/* normally FALSE, but if the user
|
|
wants to replace duplicate rows,
|
|
(in table inserts, for example) we
|
|
set this TRUE */
|
|
/*------------------------------*/
|
|
ulint n_mysql_tables_in_use; /* number of Innobase tables
|
|
used in the processing of the current
|
|
SQL statement in MySQL */
|
|
ulint mysql_n_tables_locked;
|
|
/* how many tables the current SQL
|
|
statement uses, except those
|
|
in consistent read */
|
|
ibool dict_operation_lock_mode;
|
|
/* 0, RW_S_LATCH, or RW_X_LATCH:
|
|
the latch mode trx currently holds
|
|
on dict_operation_lock */
|
|
ibool has_search_latch;
|
|
/* TRUE if this trx has latched the
|
|
search system latch in S-mode */
|
|
ulint search_latch_timeout;
|
|
/* If we notice that someone is
|
|
waiting for our S-lock on the search
|
|
latch to be released, we wait in
|
|
row0sel.c for BTR_SEA_TIMEOUT new
|
|
searches until we try to keep
|
|
the search latch again over
|
|
calls from MySQL; this is intended
|
|
to reduce contention on the search
|
|
latch */
|
|
/*------------------------------*/
|
|
ibool declared_to_be_inside_innodb;
|
|
/* this is TRUE if we have declared
|
|
this transaction in
|
|
srv_conc_enter_innodb to be inside the
|
|
InnoDB engine */
|
|
ulint n_tickets_to_enter_innodb;
|
|
/* this can be > 0 only when
|
|
declared_to_... is TRUE; when we come
|
|
to srv_conc_innodb_enter, if the value
|
|
here is > 0, we decrement this by 1 */
|
|
/*------------------------------*/
|
|
lock_t* auto_inc_lock; /* possible auto-inc lock reserved by
|
|
the transaction; note that it is also
|
|
in the lock list trx_locks */
|
|
dict_index_t* new_rec_locks[2];/* these are normally NULL; if
|
|
srv_locks_unsafe_for_binlog is TRUE
|
|
or session is using READ COMMITTED
|
|
isolation level,
|
|
in a cursor search, if we set a new
|
|
record lock on an index, this is set
|
|
to point to the index; this is
|
|
used in releasing the locks under the
|
|
cursors if we are performing an UPDATE
|
|
and we determine after retrieving
|
|
the row that it does not need to be
|
|
locked; thus, these can be used to
|
|
implement a 'mini-rollback' that
|
|
releases the latest record locks */
|
|
UT_LIST_NODE_T(trx_t)
|
|
trx_list; /* list of transactions */
|
|
UT_LIST_NODE_T(trx_t)
|
|
mysql_trx_list; /* list of transactions created for
|
|
MySQL */
|
|
/*------------------------------*/
|
|
ulint error_state; /* 0 if no error, otherwise error
|
|
number; NOTE That ONLY the thread
|
|
doing the transaction is allowed to
|
|
set this field: this is NOT protected
|
|
by the kernel mutex */
|
|
void* error_info; /* if the error number indicates a
|
|
duplicate key error, a pointer to
|
|
the problematic index is stored here */
|
|
sess_t* sess; /* session of the trx, NULL if none */
|
|
ulint que_state; /* TRX_QUE_RUNNING, TRX_QUE_LOCK_WAIT,
|
|
... */
|
|
que_t* graph; /* query currently run in the session,
|
|
or NULL if none; NOTE that the query
|
|
belongs to the session, and it can
|
|
survive over a transaction commit, if
|
|
it is a stored procedure with a COMMIT
|
|
WORK statement, for instance */
|
|
ulint n_active_thrs; /* number of active query threads */
|
|
ibool handling_signals;/* this is TRUE as long as the trx
|
|
is handling signals */
|
|
que_t* graph_before_signal_handling;
|
|
/* value of graph when signal handling
|
|
for this trx started: this is used to
|
|
return control to the original query
|
|
graph for error processing */
|
|
trx_sig_t sig; /* one signal object can be allocated
|
|
in this space, avoiding mem_alloc */
|
|
UT_LIST_BASE_NODE_T(trx_sig_t)
|
|
signals; /* queue of processed or pending
|
|
signals to the trx */
|
|
UT_LIST_BASE_NODE_T(trx_sig_t)
|
|
reply_signals; /* list of signals sent by the query
|
|
threads of this trx for which a thread
|
|
is waiting for a reply; if this trx is
|
|
killed, the reply requests in the list
|
|
must be canceled */
|
|
/*------------------------------*/
|
|
lock_t* wait_lock; /* if trx execution state is
|
|
TRX_QUE_LOCK_WAIT, this points to
|
|
the lock request, otherwise this is
|
|
NULL */
|
|
ibool was_chosen_as_deadlock_victim;
|
|
/* when the transaction decides to wait
|
|
for a lock, it sets this to FALSE;
|
|
if another transaction chooses this
|
|
transaction as a victim in deadlock
|
|
resolution, it sets this to TRUE */
|
|
time_t wait_started; /* lock wait started at this time */
|
|
UT_LIST_BASE_NODE_T(que_thr_t)
|
|
wait_thrs; /* query threads belonging to this
|
|
trx that are in the QUE_THR_LOCK_WAIT
|
|
state */
|
|
ulint deadlock_mark; /* a mark field used in deadlock
|
|
checking algorithm */
|
|
/*------------------------------*/
|
|
mem_heap_t* lock_heap; /* memory heap for the locks of the
|
|
transaction */
|
|
UT_LIST_BASE_NODE_T(lock_t)
|
|
trx_locks; /* locks reserved by the transaction */
|
|
/*------------------------------*/
|
|
mem_heap_t* global_read_view_heap;
|
|
/* memory heap for the global read
|
|
view */
|
|
read_view_t* global_read_view;
|
|
/* consistent read view associated
|
|
to a transaction or NULL */
|
|
read_view_t* read_view; /* consistent read view used in the
|
|
transaction or NULL, this read view
|
|
if defined can be normal read view
|
|
associated to a transaction (i.e.
|
|
same as global_read_view) or read view
|
|
associated to a cursor */
|
|
/*------------------------------*/
|
|
UT_LIST_BASE_NODE_T(trx_named_savept_t)
|
|
trx_savepoints; /* savepoints set with SAVEPOINT ...,
|
|
oldest first */
|
|
/*------------------------------*/
|
|
mutex_t undo_mutex; /* mutex protecting the fields in this
|
|
section (down to undo_no_arr), EXCEPT
|
|
last_sql_stat_start, which can be
|
|
accessed only when we know that there
|
|
cannot be any activity in the undo
|
|
logs! */
|
|
dulint undo_no; /* next undo log record number to
|
|
assign; since the undo log is
|
|
private for a transaction, this
|
|
is a simple ascending sequence
|
|
with no gaps; thus it represents
|
|
the number of modified/inserted
|
|
rows in a transaction */
|
|
trx_savept_t last_sql_stat_start;
|
|
/* undo_no when the last sql statement
|
|
was started: in case of an error, trx
|
|
is rolled back down to this undo
|
|
number; see note at undo_mutex! */
|
|
trx_rseg_t* rseg; /* rollback segment assigned to the
|
|
transaction, or NULL if not assigned
|
|
yet */
|
|
trx_undo_t* insert_undo; /* pointer to the insert undo log, or
|
|
NULL if no inserts performed yet */
|
|
trx_undo_t* update_undo; /* pointer to the update undo log, or
|
|
NULL if no update performed yet */
|
|
dulint roll_limit; /* least undo number to undo during
|
|
a rollback */
|
|
ulint pages_undone; /* number of undo log pages undone
|
|
since the last undo log truncation */
|
|
trx_undo_arr_t* undo_no_arr; /* array of undo numbers of undo log
|
|
records which are currently processed
|
|
by a rollback operation */
|
|
/*------------------------------*/
|
|
char detailed_error[256]; /* detailed error message for last
|
|
error, or empty. */
|
|
};
|
|
|
|
#define TRX_MAX_N_THREADS 32 /* maximum number of
|
|
concurrent threads running a
|
|
single operation of a
|
|
transaction, e.g., a parallel
|
|
query */
|
|
/* Transaction concurrency states (trx->conc_state) */
|
|
#define TRX_NOT_STARTED 1
|
|
#define TRX_ACTIVE 2
|
|
#define TRX_COMMITTED_IN_MEMORY 3
|
|
#define TRX_PREPARED 4 /* Support for 2PC/XA */
|
|
|
|
/* Transaction execution states when trx->conc_state == TRX_ACTIVE */
|
|
#define TRX_QUE_RUNNING 1 /* transaction is running */
|
|
#define TRX_QUE_LOCK_WAIT 2 /* transaction is waiting for a lock */
|
|
#define TRX_QUE_ROLLING_BACK 3 /* transaction is rolling back */
|
|
#define TRX_QUE_COMMITTING 4 /* transaction is committing */
|
|
|
|
/* Transaction isolation levels (trx->isolation_level) */
|
|
#define TRX_ISO_READ_UNCOMMITTED 1 /* dirty read: non-locking
|
|
SELECTs are performed so that
|
|
we do not look at a possible
|
|
earlier version of a record;
|
|
thus they are not 'consistent'
|
|
reads under this isolation
|
|
level; otherwise like level
|
|
2 */
|
|
|
|
#define TRX_ISO_READ_COMMITTED 2 /* somewhat Oracle-like
|
|
isolation, except that in
|
|
range UPDATE and DELETE we
|
|
must block phantom rows
|
|
with next-key locks;
|
|
SELECT ... FOR UPDATE and ...
|
|
LOCK IN SHARE MODE only lock
|
|
the index records, NOT the
|
|
gaps before them, and thus
|
|
allow free inserting;
|
|
each consistent read reads its
|
|
own snapshot */
|
|
|
|
#define TRX_ISO_REPEATABLE_READ 3 /* this is the default;
|
|
all consistent reads in the
|
|
same trx read the same
|
|
snapshot;
|
|
full next-key locking used
|
|
in locking reads to block
|
|
insertions into gaps */
|
|
|
|
#define TRX_ISO_SERIALIZABLE 4 /* all plain SELECTs are
|
|
converted to LOCK IN SHARE
|
|
MODE reads */
|
|
|
|
/* Treatment of duplicate values (trx->duplicates; for example, in inserts).
|
|
Multiple flags can be combined with bitwise OR. */
|
|
#define TRX_DUP_IGNORE 1 /* duplicate rows are to be updated */
|
|
#define TRX_DUP_REPLACE 2 /* duplicate rows are to be replaced */
|
|
|
|
|
|
/* Types of a trx signal */
|
|
#define TRX_SIG_NO_SIGNAL 100
|
|
#define TRX_SIG_TOTAL_ROLLBACK 1
|
|
#define TRX_SIG_ROLLBACK_TO_SAVEPT 2
|
|
#define TRX_SIG_COMMIT 3
|
|
#define TRX_SIG_ERROR_OCCURRED 4
|
|
#define TRX_SIG_BREAK_EXECUTION 5
|
|
|
|
/* Sender types of a signal */
|
|
#define TRX_SIG_SELF 1 /* sent by the session itself, or
|
|
by an error occurring within this
|
|
session */
|
|
#define TRX_SIG_OTHER_SESS 2 /* sent by another session (which
|
|
must hold rights to this) */
|
|
|
|
/* Commit command node in a query graph */
|
|
struct commit_node_struct{
|
|
que_common_t common; /* node type: QUE_NODE_COMMIT */
|
|
ulint state; /* node execution state */
|
|
};
|
|
|
|
/* Commit node states */
|
|
#define COMMIT_NODE_SEND 1
|
|
#define COMMIT_NODE_WAIT 2
|
|
|
|
|
|
#ifndef UNIV_NONINL
|
|
#include "trx0trx.ic"
|
|
#endif
|
|
|
|
#endif
|