mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
05dd9e4987
Apply innodb-5.0-ss1696 snapshot Fixes: - Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB - Bug#23710: crash_commit_before fails if innodb_file_per_table=1 At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path. - Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE We need to do some special AUTOINC handling for the following case: INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ... We need to use the AUTOINC counter that was actually used by MySQL in the UPDATE statement, which can be different from the value used in the INSERT statement. - Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB Fix by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". - Bug#29155: Innodb "Parallel recovery" is not prevented Fix by enabling file locking on FreeBSD. It has been disabled because InnoDB has refused to start on FreeBSD & LinuxThreads, but now it starts just fine. innobase/fsp/fsp0fsp.c: Apply innodb-5.0-ss1696 snapshot Revision r1614: branches/5.0: Merge r1605 from trunk: Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB" by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". I verified this fix by creating a sparse file of 6TB and forcing InnoDB to use it without overwriting it with zeroes (by commenting the code that overwrites :newraw files). New type ullint is introduced with the sole purpose of shortening "unsigned long long", please do not define it to something else than "unsigned long long". Approved by: Heikki innobase/include/fsp0fsp.h: Apply innodb-5.0-ss1696 snapshot Revision r1614: branches/5.0: Merge r1605 from trunk: Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB" by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". I verified this fix by creating a sparse file of 6TB and forcing InnoDB to use it without overwriting it with zeroes (by commenting the code that overwrites :newraw files). New type ullint is introduced with the sole purpose of shortening "unsigned long long", please do not define it to something else than "unsigned long long". Approved by: Heikki innobase/include/univ.i: Apply innodb-5.0-ss1696 snapshot Revision r1614: branches/5.0: Merge r1605 from trunk: Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB" by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". I verified this fix by creating a sparse file of 6TB and forcing InnoDB to use it without overwriting it with zeroes (by commenting the code that overwrites :newraw files). New type ullint is introduced with the sole purpose of shortening "unsigned long long", please do not define it to something else than "unsigned long long". Approved by: Heikki innobase/log/log0recv.c: Apply innodb-5.0-ss1696 snapshot Revision r1608: branches/5.0: Bug#23710 Back port of r1607 from trunk At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path. reviewed by: Heikki innobase/os/os0file.c: Apply innodb-5.0-ss1696 snapshot Revision r1615: branches/5.0: Merge r1613 from trunk: Fix Bug#29155 by enabling file locking on FreeBSD. It has been disabled because InnoDB has refused to start on FreeBSD & LinuxThreads, but now it starts just fine. Approved by: Heikki innobase/srv/srv0srv.c: Apply innodb-5.0-ss1696 snapshot Revision r1552: branches/5.0: Fix Bug#20090 as suggested in the bug followup by Heikki. Approved by: Heikki innobase/trx/trx0trx.c: Apply innodb-5.0-ss1696 snapshot Revision r1596: branches/5.0: Merge r1595 from trunk: trx_commit_for_mysql(): Avoid acquiring and releasing kernel_mutex when trx->sess or trx_dummy_sess is non-NULL. sql/ha_innodb.cc: Apply innodb-5.0-ss1696 snapshot Revision r1614: branches/5.0: Merge r1605 from trunk: Fix Bug#29097 "fsp_get_available_space_in_free_extents() is capped at 4TB" by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". I verified this fix by creating a sparse file of 6TB and forcing InnoDB to use it without overwriting it with zeroes (by commenting the code that overwrites :newraw files). New type ullint is introduced with the sole purpose of shortening "unsigned long long", please do not define it to something else than "unsigned long long". Approved by: Heikki Revision r1695: branches/5.0: Merge a change from MySQL AB: ChangeSet@1.2463.166.1 2007-06-20 19:22:27+03:00 monty@mysql.fi Allow multiple calls to mysql_server_end() (Part of fix for Bug 25621 Error in my_thread_global_end(): 1 threads didn't exit) Give correct error message if InnoDB table is not found (This allows us to drop a an innodb table that is not in the InnoDB registery) ha_innodb.cc: Give correct error message if InnoDB table is not found. (This allows us to drop a an innodb table that is not in the InnoDB registery) Revision r1606: branches/5.0: Formatting corrections. spotted by: Vasil Revision r1691: branches/5.0: Merge a change from MySQL AB: ChangeSet@1.2463.261.1 2007-07-20 14:17:15+03:00 gkodinov@magare.gmz Bug 29644: alter table hangs if records locked in share mode by long running transaction On Windows opened files can't be deleted. There was a special upgraded lock mode (TL_WRITE instead of TL_WRITE_ALLOW_READ) in ALTER TABLE to make sure nobody has the table opened when deleting the old table in ALTER TABLE. This special mode was causing ALTER TABLE to hang waiting on a lock inside InnoDB. This special lock is no longer necessary as the server is closing the tables it needs to delete in ALTER TABLE. Fixed by removing the special lock. Note that this also reverses the fix for bug 17264 that deals with another consequence of this special lock mode being used. sql/ha_innodb.cc: Bug 29644: reverse the (now excessive) fix for bug 17264 (but leave the test case). Revision r1601: branches/5.0: Fix for bug#28781 We need to do some special AUTOINC handling for the following case: INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ... We need to use the AUTOINC counter that was actually used by MySQL in the UPDATE statement, which can be different from the value used in the INSERT statement. approved by: Sunny Revision r1692: branches/5.0: Merge a change from MySQL AB: ChangeSet@1.2463.267.1 2007-07-30 17:14:34+04:00 evgen@local Bug 24989: The DEADLOCK error is improperly handled by InnoDB. When innodb detects a deadlock it calls ha_rollback_trans() to rollback the main transaction. But such action isn't allowed from inside of triggers and functions. When it happen the 'Explicit or implicit commit' error is thrown even if there is no commit/rollback statements in the trigger/function. This leads to the user confusion. Now the convert_error_code_to_mysql() function doesn't call the ha_rollback_trans() function directly but rather calls the mark_transaction_to_rollback function and returns an error. The sp_rcontext::find_handler() now doesn't allow errors to be caught by the trigger/function error handlers when the thd->is_fatal_sub_stmt_error flag is set. Procedures are still allowed to catch such errors. The sp_rcontext::find_handler function now accepts a THD handle as a parameter. The transaction_rollback_request and the is_fatal_sub_stmt_error flags are added to the THD class. The are initialized by the THD class constructor. Now the ha_autocommit_or_rollback function rolls back main transaction when not in a sub statement and the thd->transaction_rollback_request is set. The THD::restore_sub_statement_state function now resets the thd->is_fatal_sub_stmt_error flag on exit from a sub-statement. innodb-big.test, innodb-big.result: Added a test case for the bug 24989: The DEADLOCK error is improperly handled by InnoDB. sql/ha_innodb.cc: Bug 24989: The DEADLOCK error is improperly handled by InnoDB. Now the convert_error_code_to_mysql() function doesn't call the ha_rollback_trans() function directly but rather calls the mark_transaction_to_rollback function and returns an error. Revision r1693: branches/5.0: Merge a change from MySQL AB: ChangeSet@1.2489.5.1 2007-07-31 17:42:48+04:00 evgen@local ha_innodb.cc: Warning fixed. |
||
|---|---|---|
| .. | ||
| btr | ||
| buf | ||
| data | ||
| db | ||
| dict | ||
| dyn | ||
| eval | ||
| fil | ||
| fsp | ||
| fut | ||
| ha | ||
| ibuf | ||
| include | ||
| lock | ||
| log | ||
| mach | ||
| mem | ||
| mtr | ||
| os | ||
| page | ||
| pars | ||
| que | ||
| read | ||
| rem | ||
| row | ||
| srv | ||
| sync | ||
| thr | ||
| trx | ||
| usr | ||
| ut | ||
| CMakeLists.txt | ||
| configure.in | ||
| Makefile.am | ||