------------------------------------------------------------ revno: 3690 tags: clone-mysql-5.1.47-ndb-7.1.5a-src-build, mysql-5.1.47-ndb-7.1.5 committer: Bernd Ocklin branch nick: clone-mysql-5.1.47-ndb-7.1.5-src-build timestamp: Tue 2010-06-29 12:46:18 +0200 message: disable ndbjtie test for none cluster builds ------------------------------------------------------------ revno: 3689 [merge] tags: clone-mysql-5.1.47-ndb-7.1.5-src-build committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-06-22 09:54:10 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.103 tags: clone-mysql-5.1.47-ndb-7.0.16-src-build, mysql-5.1.47-ndb-7.0.16 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-06-22 09:53:38 +0200 message: ndb - bug-50621 refix which got lost in gull-ification ------------------------------------------------------------ revno: 3688 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-06-22 09:24:39 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.102 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-06-22 09:23:36 +0200 message: ndb - wl2342 - stricten checks in alterTable_parse and let master-parse set changeMask bits ------------------------------------------------------------ revno: 3362.41.101 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-06-22 08:46:58 +0200 message: ndb - wl2342 - add Rope::equal(Rope) ------------------------------------------------------------ revno: 3687 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Tue 2010-06-22 08:45:00 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.100 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Tue 2010-06-22 08:43:34 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.11 [merge] tags: clone-mysql-5.1.47-ndb-6.3.35-src-build, mysql-5.1.47-ndb-6.3.35 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Tue 2010-06-22 08:41:58 +0200 message: ndb - merge 62 to 63 ------------------------------------------------------------ revno: 2572.82.10 committer: Jonas Oreland branch nick: telco-6.2 timestamp: Tue 2010-06-22 08:38:51 +0200 message: ndb - bug#54685 - release memory if no API connected in Qmgr::execAPI_BROADCAST_REP ------------------------------------------------------------ revno: 2572.82.9 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Thu 2010-06-17 13:54:48 +0200 message: Merge ------------------------------------------------------------ revno: 3686 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-21 11:59:32 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.99 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-21 11:56:51 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.10 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-06-21 11:55:21 +0200 message: ndb - bahh... windows doesnt have rand_r, do a simple stupid ndb_rand_r ------------------------------------------------------------ revno: 3362.41.98 committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-21 11:00:32 +0200 message: ndb - NdbDictionary::supportedAlterTable should/can not initiate schema-transaction ------------------------------------------------------------ revno: 3685 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-21 10:52:22 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.97 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-21 10:51:07 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.9 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-06-21 10:49:20 +0200 message: ndb - move testDict -n DictRestart from devel into basic ------------------------------------------------------------ revno: 2585.155.8 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-06-21 10:28:54 +0200 message: ndb - extend testDict -n DictRestart with alter tables, and make NdbMixRestarter and RandSchemaOp use own rand-sequence for stable reruns ------------------------------------------------------------ revno: 3684 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Mon 2010-06-21 10:48:00 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.96 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Mon 2010-06-21 10:46:45 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.7 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Mon 2010-06-21 09:37:52 +0200 message: ndb - bug#54651 - check for duplicate table name in alter-table rename ------------------------------------------------------------ revno: 3683 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-06-18 13:12:40 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.95 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-06-18 13:11:46 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.6 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-06-18 13:10:41 +0200 message: ndb - darn, missed #ifdef ERROR_INSERT in last push ------------------------------------------------------------ revno: 3682 [merge] committer: Jonas Oreland branch nick: telco-7.1 timestamp: Fri 2010-06-18 13:02:51 +0200 message: ndb - merge 70 to 71 ------------------------------------------------------------ revno: 3362.41.94 [merge] committer: Jonas Oreland branch nick: telco-6.4 timestamp: Fri 2010-06-18 12:57:02 +0200 message: ndb - merge 63 to 70 ------------------------------------------------------------ revno: 2585.155.5 committer: Jonas Oreland branch nick: telco-6.3 timestamp: Fri 2010-06-18 12:50:09 +0200 message: ndb - bug#54611 - fix so that latest completed LCP is used even if cluster shutsdown directly afterwards ------------------------------------------------------------ revno: 2585.155.4 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Thu 2010-06-17 13:46:11 +0200 message: Merge ------------------------------------------------------------ revno: 3681 [merge] committer: Magnus Blåudd branch nick: 7.1 timestamp: Thu 2010-06-17 14:31:49 +0200 message: Merge 7.0 -> 7.1 ------------------------------------------------------------ revno: 3362.41.93 committer: Magnus Blåudd branch nick: 7.0 timestamp: Thu 2010-06-17 14:28:52 +0200 message: WL#4523 - Properly redirect stdout and stderr to log file ndb__out.log ------------------------------------------------------------ revno: 3362.41.92 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-06-17 13:40:14 +0200 message: Merge ------------------------------------------------------------ revno: 3680 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.1 timestamp: Thu 2010-06-17 12:59:23 +0200 message: Merge ------------------------------------------------------------ revno: 3362.41.91 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Thu 2010-06-17 11:24:19 +0200 message: Merge ------------------------------------------------------------ revno: 2585.155.3 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Thu 2010-06-17 11:18:37 +0200 message: Merge ------------------------------------------------------------ revno: 2572.82.8 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Thu 2010-06-17 10:42:10 +0200 message: Added explicit type conversion to avoid compiler warning ------------------------------------------------------------ revno: 2572.82.7 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Thu 2010-06-17 10:35:28 +0200 message: Bug#52062 Compiler warning in os0file.c on windows 64-bit ------------------------------------------------------------ revno: 3362.41.90 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-7.0 timestamp: Wed 2010-06-16 22:49:05 +0200 message: Merged in mysql-5.1-telco-6.3(mysql-5.1.45,mysql-5.1.46,mysql-5.1.47) ------------------------------------------------------------ revno: 2585.155.2 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-06-16 20:47:16 +0200 message: Merge ------------------------------------------------------------ revno: 2572.82.6 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Wed 2010-06-16 20:41:53 +0200 message: Server variable ndb_use_exact_count had wrong default value ------------------------------------------------------------ revno: 2572.82.5 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Wed 2010-06-16 20:35:38 +0200 message: Initialized variables to avoid compiler warnings ------------------------------------------------------------ revno: 2585.155.1 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2010-06-16 14:04:53 +0200 message: Merged in mysql-5.1-telco-6.2(mysql-5.1.45,mysql-5.1.46,mysql-5.1.47) ------------------------------------------------------------ revno: 2572.82.4 committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Tue 2010-06-15 11:50:37 +0200 message: Forward port of patch for bug#52884 3391 Sergey Glukhov 2010-05-20 Bug#52884 mysql-test-run does not work with --debug option Server crashes on 64bit linux with 'double free or corruption' message, on 32bit mysql-test-run silently fails on bootstrap stage. The problem is that FreeState() is called twice for init_settings struct in _db_end_ function. The fix is to remove superfluous FreeState() call. Additional fix: fixed discrepancy of result file when debug & valgrind options are enabled for MTR. @ dbug/dbug.c The problem is that FreeState() is called twice for init_settings struct in _db_end_ function. The fix is to remove superfluous FreeState() call. @ mysql-test/r/variables_debug.result fixed discrepancy of result file when debug & valgrind options are enabled for MTR. @ mysql-test/t/variables_debug.test fixed discrepancy of result file when debug & valgrind options are enabled for MTR. @ sql/set_var.cc fixed discrepancy of result file when debug & valgrind options are enabled for MTR. ------------------------------------------------------------ revno: 2572.82.3 [merge] committer: Martin Skold branch nick: mysql-5.1-telco-6.2 timestamp: Tue 2010-06-15 11:07:26 +0200 message: Merged in 5.1.47 ------------------------------------------------------------ revno: 2555.764.21 [merge] tags: mysql-5.1.47 committer: Karen Langford branch nick: mysql-5.1.47-release timestamp: Thu 2010-05-06 17:14:10 +0200 message: Merge ------------------------------------------------------------ revno: 2555.738.73 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-05-04 12:31:28 +0300 message: btr_page_split_and_insert(): Correct the fix of Bug #52964. When split_rec==NULL, choose the correct node pointer key (first_rec). ------------------------------------------------------------ revno: 2555.738.72 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-05-03 15:28:59 +0300 message: buf_zip_decompress(): Allow BUF_NO_CHECKSUM_MAGIC as the stamped checksum. buf_page_get_gen(): Assert that buf_zip_decompress() succeeds. Callers are not prepared for a NULL return value. (Bug #53248) ------------------------------------------------------------ revno: 2555.764.20 [merge] tags: clone-5.1.47-build committer: Georgi Kodinov branch nick: merge-5.1-bugteam timestamp: Wed 2010-05-05 17:57:53 +0300 message: tree name change ------------------------------------------------------------ revno: 1810.3989.17 [merge] committer: Georgi Kodinov branch nick: merge-5.0-bugteam timestamp: Wed 2010-05-05 12:40:18 +0300 message: merge ------------------------------------------------------------ revno: 1810.3991.2 author: sunanda.menon@sun.com committer: MySQL Build Team branch nick: mysql-5.0 timestamp: Mon 2010-05-03 12:06:18 +0200 message: Raise version number after cloning 5.0.91 ------------------------------------------------------------ revno: 1810.3991.1 tags: clone-5.0.91-build committer: Georgi Kodinov branch nick: merge-5.0-bugteam timestamp: Sat 2010-05-01 16:46:04 +0300 message: tree name change ------------------------------------------------------------ revno: 1810.3989.16 committer: Georgi Kodinov branch nick: merge-5.0-bugteam timestamp: Wed 2010-05-05 12:38:59 +0300 message: tree name change ------------------------------------------------------------ revno: 2555.764.19 committer: Georgi Kodinov branch nick: B53417-5.1-bugteam timestamp: Wed 2010-05-05 11:54:52 +0300 message: On behalf of Kristofer : Bug#53417 my_getwd() makes assumptions on the buffer sizes which not always hold true The mysys library contains many functions for rewriting file paths. Most of these functions makes implicit assumptions on the buffer sizes they write to. If a path is put in my_realpath() it will propagate to my_getwd() which assumes that the buffer holding the path name is greater than 2. This is not true in cases. In the special case where a VARBIN_ITEM is passed as argument to the LOAD_FILE function this can lead to a crash. This patch fixes the issue by introduce more safe guards agaist buffer overruns. ------------------------------------------------------------ revno: 2555.764.18 [merge] committer: Alfranio Correia branch nick: mysql-5.1-bugteam.merge timestamp: Tue 2010-05-04 23:15:10 +0100 message: merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam ------------------------------------------------------------ revno: 2555.775.2 committer: Alfranio Correia branch nick: mysql-5.1-bugteam timestamp: Tue 2010-05-04 10:41:28 +0100 message: BUG#43407 SET GLOBAL SQL_SLAVE_SKIP_COUNTER should log previous state in error log When issuing a 'SET GLOBAL SQL_SLAVE_SKIP_COUNTER' statement, the previous position along with the new position is dumped into the error log. Namely, the following information is printed out: skip_counter, group_relay_log_name and group_relay_log_pos. ------------------------------------------------------------ revno: 2555.775.1 committer: Alfranio Correia branch nick: mysql-5.1-bugteam timestamp: Tue 2010-05-04 10:17:20 +0100 message: BUG#43406 CHANGE MASTER TO should log previous state in error log When issuing a 'CHANGE MASTER TO' statement, key elements of the previous state, namely the host, port, the master_log_file and the master_log_pos are dumped into the error log. ------------------------------------------------------------ revno: 2555.764.17 committer: Omer BarNir branch nick: bug-5.1 timestamp: Tue 2010-05-04 14:24:36 -0700 message: Updates to README file of the 'engines' test suites ------------------------------------------------------------ revno: 2555.764.16 [merge] committer: Georgi Kodinov branch nick: B53371-5.1-bugteam timestamp: Tue 2010-05-04 17:03:28 +0300 message: Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. This is the 5.1 merge and extension of the fix. The server was happily accepting paths in table name in all places a table name is accepted (e.g. a SELECT). This allowed all users that have some privilege over some database to read all tables in all databases in all mysql server instances that the server file system has access to. Fixed by : 1. making sure no path elements are allowed in quoted table name when constructing the path (note that the path symbols are still valid in table names when they're properly escaped by the server). 2. checking the #mysql50# prefixed names the same way they're checked for path elements in mysql-5.0. ------------------------------------------------------------ revno: 1810.3989.15 committer: Georgi Kodinov branch nick: B53371-5.0-bugteam timestamp: Mon 2010-05-03 18:16:51 +0300 message: Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants. The server was not checking the supplied to COM_FIELD_LIST table name for validity and compliance to acceptable table names standards. Fixed by checking the table name for compliance similar to how it's normally checked by the parser and returning an error message if it's not compliant. ------------------------------------------------------------ revno: 2555.764.15 [merge] committer: Kristofer Pettersson branch nick: mysql-5.1-bugteam timestamp: Mon 2010-05-03 19:21:09 +0200 message: Automerge ------------------------------------------------------------ revno: 2555.774.1 [merge] committer: Georgi Kodinov branch nick: merge-5.1-bugteam timestamp: Sat 2010-05-01 19:12:12 +0300 message: merged 5.1-innodb ------------------------------------------------------------ revno: 2555.738.71 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-30 13:02:36 +0300 message: Disable innodb.innodb, main.ps_3innodb and main.partition_innodb_plugin mysql-tests because those emit (spurious?) valgrind warnings. ------------------------------------------------------------ revno: 2555.738.70 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-29 15:41:47 +0200 message: recv_sys_init(), recv_sys_empty_hash(): Shrink recv_sys->addr_hash. This addresses Bug #53122 in the built-in InnoDB. ------------------------------------------------------------ revno: 2555.738.69 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-29 15:37:50 +0200 message: recv_sys_init(), recv_sys_empty_hash(): Shrink recv_sys->addr_hash. recv_addr_t: Turn space,page_no into bitfields to save space on 64-bit. This addresses Bug #53122 in the InnoDB Plugin. ------------------------------------------------------------ revno: 2555.738.68 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-29 15:29:45 +0200 message: Reduce the next-key locking of READ UNCOMMITTED to match that of READ COMMITTED in the built-in InnoDB. (Bug #48607) ------------------------------------------------------------ revno: 2555.738.67 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-29 15:27:43 +0200 message: Reduce the next-key locking of READ UNCOMMITTED to match that of READ COMMITTED in the InnoDB Plugin. (Bug #48607) ------------------------------------------------------------ revno: 2555.738.66 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-28 13:34:52 +0300 message: Bug#53046 dict_update_statistics_low can still be run concurrently on same table Followup to vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr : Add more asserions, which I forgot. ------------------------------------------------------------ revno: 2555.738.65 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-28 13:32:00 +0300 message: Revert the fix of Bug#38996 Race condition in ANALYZE TABLE This is branches/zip@r6032 in SVN and _is part_ of revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6113 in BZR. This is being reverted because now the code is serialized directly on index->stat_n_diff_key_vals[] as the fix for Bug#53046 dict_update_statistics_low can still be run concurrently on same table goes. ------------------------------------------------------------ revno: 2555.738.64 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-28 13:20:33 +0300 message: Followup to vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7: Address Marko's suggestions wrt the fix of Bug#53046 dict_update_statistics_low can still be run concurrently on same table ------------------------------------------------------------ revno: 2555.738.63 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-28 11:46:27 +0300 message: Fix Bug#53046 dict_update_statistics_low can still be run concurrently on same table Protect dict_index_t::stat_n_diff_key_vals[] with an array of mutexes. Testing: tested all code paths under UNIV_SYNC_DEBUG for the one in dict_print() one has to enable the InnoDB table monitor: CREATE TABLE innodb_table_monitor (a int) ENGINE=INNODB; ------------------------------------------------------------ revno: 2555.738.62 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-28 08:33:25 +0200 message: Merge r6103 from InnoDB Plugin to the built-in InnoDB to fix Bug #53202: ------------------------------------------------------------------------ r6103 | marko | 2009-10-26 15:46:18 +0200 (Mon, 26 Oct 2009) | 4 lines Changed paths: M /branches/zip/row/row0ins.c branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless Valgrind warnings about uninitialized data. (The warnings were harmless, because the fields would be initialized at a later stage.) ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 2555.738.61 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Tue 2010-04-27 17:45:30 +0300 message: Merge mysql-5.1 -> mysql-5.1-innodb, this merge does not change any files. ------------------------------------------------------------ revno: 2555.738.60 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Tue 2010-04-27 17:05:41 +0300 message: Do not define UNIV_DEBUG_VALGRIND when HAVE_purify because this results in some valgrind errors. Bug#53202 valgrind: uninitialized bytes in dtuple_print() has been opened to track this. ------------------------------------------------------------ revno: 2555.738.59 [merge] committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-04-27 16:51:54 +0300 message: Merge ------------------------------------------------------------ revno: 2555.773.3 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Tue 2010-04-27 09:16:45 +0300 message: Merge 3417..3421 from mysql-5.1-innodb ------------------------------------------------------------ revno: 2555.773.2 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Tue 2010-04-27 09:09:08 +0300 message: Split the innodb.innodb mysql-test. Extract part of innodb.innodb into innodb.innodb_misc1 This is needed in order to be able to more easily debug this test, under valgrind, it is too huge. ------------------------------------------------------------ revno: 2555.738.58 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-04-27 16:47:38 +0300 message: row_merge_drop_temp_indexes(): Remove a bogus char-to-ulint cast. ------------------------------------------------------------ revno: 2555.738.57 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 16:10:29 +0300 message: lock_rec_queue_validate(): Disable a bogus check that a transaction that holds a lock on a clustered index record also holds a lock on the secondary index record. ------------------------------------------------------------ revno: 2555.738.56 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 14:26:09 +0300 message: recv_sys_init(): Skip the red-black tree in Hot Backup. ------------------------------------------------------------ revno: 2555.738.55 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 14:08:56 +0300 message: Add a test case for Bug #52745. ------------------------------------------------------------ revno: 2555.738.54 [merge] committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 13:52:15 +0300 message: Merge Vasil Dimov 2010-04-26 Bump InnoDB Plugin version number after 1.0.7 ------------------------------------------------------------ revno: 2555.773.1 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Mon 2010-04-26 11:35:57 +0300 message: Bump InnoDB Plugin version number after 1.0.7 has been released in MySQL 5.1.46. ------------------------------------------------------------ revno: 2555.738.53 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 13:27:25 +0300 message: row_search_for_mysql(): Never try semi-consistent read in unique searches. They are only useful in table scans. (Bug #52663) ------------------------------------------------------------ revno: 2555.738.52 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Mon 2010-04-26 10:39:49 +0300 message: btr_page_split_and_insert(): Silence a compiler warning about possibly uninitialized variable insert_left. ------------------------------------------------------------ revno: 2555.738.51 committer: Calvin Sun branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-22 14:16:14 -0500 message: mysql-5.1-innodb: add error codes to innodb_bug51920.test kill of active connection yields different error code depending on platform. ------------------------------------------------------------ revno: 2555.738.50 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Thu 2010-04-22 12:33:42 +0300 message: Correct the definition of DICT_SYS_INDEXES_NAME_FIELD. When row_merge_drop_temp_indexes() was reworked to drop the indexes via the data dictionary cache, the code was broken because it would read the index name from the wrong field. ------------------------------------------------------------ revno: 2555.738.49 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 21:53:59 +0300 message: btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964) btr_page_tuple_smaller(): New function, refactored from btr_page_split_and_insert(). btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec(). Note that a NULL return may mean that the tuple is to be inserted into either the lower or upper page, to be determined by btr_page_tuple_smaller(). btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL, invoke btr_page_tuple_smaller() to determine which half-page the tuple belongs to. Reviewed by Sunny Bains ------------------------------------------------------------ revno: 2555.738.48 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 13:27:23 +0300 message: dict_create_index_step(): Be strict about DYNAMIC and COMPRESSED tables. Bug #50495 is about REDUNDANT and COMPACT tables, after all. ------------------------------------------------------------ revno: 2555.738.47 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 13:00:29 +0300 message: ha_innobase::add_index(): Only check for duplicate indexes when the data dictionary is locked. This fixes a UNIV_DEBUG assertion failure in innodb-index.test. ------------------------------------------------------------ revno: 2555.738.46 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 12:50:33 +0300 message: dtuple_convert_big_rec(): Store locally any fields whose maximum length is less than 256 bytes. (Bug #52745) Add related comments and debug assertions to the "offsets" functions in rem0rec.c. Approved by Sunny Bains ------------------------------------------------------------ revno: 2555.738.45 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 12:40:32 +0300 message: Adjust tests for the Bug #50495 fix. ------------------------------------------------------------ revno: 2555.738.44 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 12:16:11 +0300 message: rec_convert_dtuple_to_rec(): Correct the debug check. The "extern" accessor functions return zero or nonzero, not 0 or 1. ------------------------------------------------------------ revno: 2555.738.43 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Wed 2010-04-21 09:39:16 +0300 message: rec_convert_dtuple_to_rec(): Add a debug check. ------------------------------------------------------------ revno: 2555.738.42 committer: Marko Makela branch nick: 5.1-innodb timestamp: Tue 2010-04-20 23:15:50 +0300 message: btr_cur_optimistic_insert(): Remove unused variable "heap". ------------------------------------------------------------ revno: 2555.738.41 committer: Marko Makela branch nick: 5.1-innodb timestamp: Tue 2010-04-20 14:42:22 +0300 message: dict_create_index_step(): Invoke dict_index_add_to_cache() in strict mode only if innodb_strict_mode is set. (Bug #50495) trx_is_strict(): New function, for checking innodb_strict_mode. ------------------------------------------------------------ revno: 2555.738.40 committer: Marko Mäkelä branch nick: 5.1-innodb timestamp: Tue 2010-04-20 11:29:08 +0300 message: Implement UNIV_BTR_AVOID_COPY, an optimization of page splits. ------------------------------------------------------------ revno: 2555.738.39 committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= branch nick: 5.1-innodb timestamp: Mon 2010-04-19 13:36:03 +0300 message: Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set. ------------------------------------------------------------ revno: 2555.738.38 committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= branch nick: 5.1-innodb timestamp: Mon 2010-04-19 12:44:05 +0300 message: Enable innodb_plugin tests based on the presence of lib_innodb_plugin. ------------------------------------------------------------ revno: 2555.738.37 committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= branch nick: 5.1-innodb timestamp: Mon 2010-04-19 12:21:13 +0300 message: Do not require innodb for running innodb_plugin tests. ------------------------------------------------------------ revno: 2555.738.36 committer: Marko Makela branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-15 09:01:22 +0200 message: storage/innodb_plugin: Relax too strict assertions about prefix indexed BLOBs for ROW_FORMAT=DYNAMIC and ROW_FORMAT_COMPRESSED tables (Bug #52746). In these tables, the locally stored prefix of a BLOB can be as small as 20 bytes (BTR_EXTERN_FIELD_REF_SIZE). ROW_FORMAT=REDUNDANT and ROW_FORMAT=COMPACT store a prefix of 768 bytes (REC_MAX_INDEX_COL_LEN). trx_undo_rec_get_col_val(): Relax the ut_ad() assertion and add a reference to dtuple_convert_big_rec(). trx_undo_rec_get_partial_row(): Relax the ut_a() assertion that prompted Bug #52746. ------------------------------------------------------------ revno: 2555.738.35 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-14 23:04:13 +0300 message: Also send emails to innodb_dev_ww@oracle.com ------------------------------------------------------------ revno: 2555.738.34 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-14 23:02:47 +0300 message: Change the tree name to mysql-5.1-innodb in .bzr-mysql/default.conf ------------------------------------------------------------ revno: 2555.738.33 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Mon 2010-04-12 17:26:20 +0300 message: Fix path to have_innodb_plugin.inc ------------------------------------------------------------ revno: 2555.738.32 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Mon 2010-04-12 17:23:00 +0300 message: Remove unused file ------------------------------------------------------------ revno: 2555.738.31 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Mon 2010-04-12 16:58:47 +0300 message: Fix path to innodb-index.inc ------------------------------------------------------------ revno: 2555.738.30 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Mon 2010-04-12 14:56:24 +0300 message: Remove outdated InnoDB Plugin tests from mysql-test/suite/innodb, the InnoDB Plugin tests are now in mysql-test/suite/innodb_plugin. Move InnoDB tests to the innodb suite at mysql-test/suite/innodb. ------------------------------------------------------------ revno: 2555.738.29 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 16:38:28 +0300 message: Convert InnoDB Plugin tests to include have_innodb_plugin.inc. This also instructs mtr to transparently load the plugin. ------------------------------------------------------------ revno: 2555.738.28 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 16:33:42 +0300 message: Fix mtr warning in innodb-autoinc-44030.test ------------------------------------------------------------ revno: 2555.738.27 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 16:29:13 +0300 message: Fix a failure of innodb_plugin.innodb-autoinc-44030 now that MySQL and InnoDB dictionaries do not get out of sync. ------------------------------------------------------------ revno: 2555.738.26 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 16:25:17 +0300 message: Fix a mtr warning in innodb_plugin.innodb-autoinc ------------------------------------------------------------ revno: 2555.738.25 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 16:07:41 +0300 message: Merge from innodb-branches-zip ------------------------------------------------------------ revno: 0.3.2081 [merge] committer: Vasil Dimov branch nick: innodb-branches-zip timestamp: Fri 2010-04-09 16:05:29 +0300 message: Merge from innodb-branches-zip ------------------------------------------------------------ revno: 0.4.4 committer: vdimov timestamp: Thu 2010-04-08 14:05:17 +0000 message: branches/zip: Adjust the innodb test after change in behavior in MySQL The change in behavior was introduced by this changeset: ------------------------------------------------------------ revno: 3405 revision-id: joro@sun.com-20100317141846-es0qyf5zcqb0hu1c parent: davi.arnaut@sun.com-20100309125156-z2c4uyqque49v61k committer: Georgi Kodinov branch nick: B49838-5.1-bugteam timestamp: Wed 2010-03-17 16:18:46 +0200 message: Bug #49838: DROP INDEX and ADD UNIQUE INDEX for same index may corrupt definition at engine If a single ALTER TABLE contains both DROP INDEX and ADD INDEX using the same index name (a.k.a. index modification) we need to disable in-place alter table because we can't ask the storage engine to have two copies of the index with the same name even temporarily (if we first do the ADD INDEX and then DROP INDEX) and we can't modify indexes that are needed by e.g. foreign keys if we first do DROP INDEX and then ADD INDEX. Fixed the problem by disabling in-place ALTER TABLE for these cases. modified: mysql-test/r/innodb_mysql.result sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv mysql-test/t/innodb_mysql.test sp1f-innodb_mysql.test-20060816102624-6ymo37d3nyhvbqyzqn5ohsfuydwo426k sql/sql_table.cc sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu ------------------------------------------------------------ revno: 2555.738.24 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Fri 2010-04-09 15:56:51 +0300 message: Move the InnoDB Plugin tests from storage/innodb_plugin/mysql-test/ where they are ignored to a new test suite "innodb_plugin". Remove a hack in mtr that was deployed to run the builtin InnoDB tests against the InnoDB Plugin. Also detect if a test is an 'innodb plugin test' and if so then transparently replace the builtin InnoDB with the InnoDB Plugin. ------------------------------------------------------------ revno: 2555.738.23 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Thu 2010-04-08 19:55:55 +0300 message: Adjust mysql-test/suite/binlog/t/binlog_killed.test after a change in behavior in InnoDB. The change in behavior was introduced by this changeset: ------------------------------------------------------------ revno: 3370 revision-id: vasil.dimov@oracle.com-20100331130613-8ja7n0vh36a80457 parent: vasil.dimov@oracle.com-20100331130440-l0y517y3mjsjqy4v parent: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-03-31 16:06:13 +0300 message: Merge from innodb-branches-5.1 ------------------------------------------------------------ revno: 0.1.819 revision-id: vasil.dimov@oracle.com-20100331113119-2kbgkaz1d426a43c parent: vasil.dimov@oracle.com-20100331064722-9rc3wypzmer7d6jj parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918 committer: Vasil Dimov branch nick: innodb-branches-5.1 timestamp: Wed 2010-03-31 14:31:19 +0300 message: Merge from SVN ------------------------------------------------------------ revno: 0.2.1 revision-id: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6918 parent: svn-v4:cee13dc7-1704-0410-992b-c9b4543f1246:branches/5.1:6912 committer: mmakela timestamp: Wed 2010-03-31 07:14:51 +0000 message: branches/5.1: Obey KILL during a lock wait (Bug #51920). srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread(): Check trx_is_interrupted() in addition to checking the lock wait timeout. rb://279 approved by Sunny Bains ------------------------------------------------------------ revno: 2555.738.22 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 22:42:25 +0300 message: Merge from innodb-branches-zip ------------------------------------------------------------ revno: 0.3.2080 [merge] committer: Vasil Dimov branch nick: innodb-branches-zip timestamp: Wed 2010-04-07 22:41:50 +0300 message: Merge from SVN ------------------------------------------------------------ revno: 0.4.3 committer: vdimov timestamp: Wed 2010-04-07 18:40:38 +0000 message: branches/zip: Whitespace fixup in univ.i ------------------------------------------------------------ revno: 0.4.2 committer: csun timestamp: Wed 2010-04-07 18:24:55 +0000 message: branches/zip: fix compiler errors on Windows. Move ut_ad() to after declarations for C file. ------------------------------------------------------------ revno: 2555.738.21 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 22:00:06 +0300 message: Merge from innodb-branches-zip ------------------------------------------------------------ revno: 0.3.2079 [merge] committer: Vasil Dimov branch nick: innodb-branches-zip timestamp: Wed 2010-04-07 21:53:09 +0300 message: Merge from SVN ------------------------------------------------------------ revno: 0.4.1 committer: mmakela timestamp: Wed 2010-04-07 11:03:54 +0000 message: branches/zip: innobase_init(): Correct the error message about wrong innodb_change_buffering value. Reported by Ranger. ------------------------------------------------------------ revno: 2555.738.20 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 21:59:02 +0300 message: Merge from innodb-branches-5.1 ------------------------------------------------------------ revno: 0.1.822 [merge] committer: Vasil Dimov branch nick: innodb-branches-5.1 timestamp: Wed 2010-04-07 21:52:37 +0300 message: Merge from SVN ------------------------------------------------------------ revno: 0.2.5 committer: vdimov timestamp: Tue 2010-04-06 16:18:25 +0000 message: branches/5.1: Fix ./export.sh to honor ENDREV ------------------------------------------------------------ revno: 0.2.4 committer: mmakela timestamp: Tue 2010-04-06 06:14:51 +0000 message: branches/zip: trx0sys.ic: Correct a typo in a comment. ------------------------------------------------------------ revno: 2555.738.19 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 21:33:36 +0300 message: Repply changes to storage/innodb_plugin/plug.in that were made by MySQL ------------------------------------------------------------ revno: 2555.738.18 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 21:30:44 +0300 message: Repply changes to storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt that were made by MySQL ------------------------------------------------------------ revno: 2555.738.17 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 21:17:13 +0300 message: Repply changes to storage/innodb_plugin/mysql-test/*.opt that were made by MySQL ------------------------------------------------------------ revno: 2555.738.16 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 20:44:47 +0300 message: Repply changes to storage/innodb_plugin/handler/ha_innodb.cc that were made by MySQL ------------------------------------------------------------ revno: 2555.738.15 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 20:24:43 +0300 message: Repply changes to storage/innodb_plugin/Makefile.am that were made by MySQL ------------------------------------------------------------ revno: 2555.738.14 committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 20:21:15 +0300 message: Reapply changes to storage/innodb_plugin/CMakeLists.txt that were made by MySQL ------------------------------------------------------------ revno: 2555.738.13 [merge] committer: Vasil Dimov branch nick: mysql-5.1-innodb timestamp: Wed 2010-04-07 19:53:14 +0300 message: Import branches/zip@r6960 from SVN on top of storage/innodb_plugin ------------------------------------------------------------ revno: 0.3.2078 committer: Vasil Dimov branch nick: innodb-branches-zip timestamp: Wed 2010-04-07 14:18:43 +0300 message: Move everything into a subdirectory xyz/ ------------------------------------------------------------ revno: 0.3.2077 committer: mmakela timestamp: Wed 2010-04-07 06:21:26 +0000 message: branches/zip: buf_flush_block_cmp(): Do not mix declarations and code. Stick to C90, because some build platforms are not C99 yet. ------------------------------------------------------------ revno: 0.3.2076 committer: vdimov timestamp: Tue 2010-04-06 18:05:54 +0000 message: branches/zip: Whitespace fixup ------------------------------------------------------------ revno: 0.3.2075 committer: vdimov timestamp: Tue 2010-04-06 17:55:02 +0000 message: Change the BZR property ------------------------------------------------------------ revno: 0.3.2074 committer: vdimov timestamp: Tue 2010-04-06 17:48:35 +0000 message: Set some experimental properties ------------------------------------------------------------ revno: 0.3.2073 committer: vdimov timestamp: Tue 2010-04-06 16:20:33 +0000 message: Set some experimental properties that could help with the merge into BZR. ------------------------------------------------------------ revno: 0.3.2072 committer: mmakela timestamp: Tue 2010-04-06 12:11:46 +0000 message: branches/zip: Add debug checks to track down Issue #461. dict_table_check_for_dup_indexes(): Add the flag tmp_ok. If !tmp_ok, check that no index name starts with TEMP_INDEX_PREFIX. ha_innobase::add_index(), ha_innobase::prepare_drop_index(), ha_innobase::final_drop_index(): Call dict_table_check_for_dup_indexes(). ------------------------------------------------------------ revno: 0.3.2071 committer: mmakela timestamp: Wed 2010-03-31 11:30:56 +0000 message: branches/zip: Merge revisions 6921:6924 from branches/5.1: ------------------------------------------------------------------------ r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Fix a race condition. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2070 committer: mmakela timestamp: Wed 2010-03-31 10:54:30 +0000 message: branches/zip: Merge revisions 6918:6921 from branches/5.1: ------------------------------------------------------------------------ r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug51920.result M /branches/5.1/mysql-test/innodb_bug51920.test branches/5.1: innodb_bug51920.test: Make the test quicker and more deterministic. Suggested by Vasil Dimov. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2069 committer: mmakela timestamp: Wed 2010-03-31 07:49:08 +0000 message: branches/zip: Fix a compilation error that sneaked in in r6919. ------------------------------------------------------------ revno: 0.3.2068 committer: mmakela timestamp: Wed 2010-03-31 07:34:22 +0000 message: branches/zip: Merge revisions 6788:6918 from branches/5.1: ------------------------------------------------------------------------ r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines Changed paths: M /branches/5.1/row/row0sel.c branches/5.1: Typecast to silence a compiler warning: row/row0sel.c: 4548 C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data row/row0sel.c: 4553 C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data Reported by: Jonas Oreland Discussed with: Sunny Bains ------------------------------------------------------------------------ r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Fix a non-determinism in innodb_bug38231. Reported by: Sergey Vojtovich ------------------------------------------------------------------------ r6911 | vdimov | 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) | 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup ------------------------------------------------------------------------ r6912 | vdimov | 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) | 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Whitespace fixup on line 354 ------------------------------------------------------------------------ r6918 | mmakela | 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) | 6 lines Changed paths: A /branches/5.1/mysql-test/innodb_bug51920.result A /branches/5.1/mysql-test/innodb_bug51920.test M /branches/5.1/srv/srv0srv.c branches/5.1: Obey KILL during a lock wait (Bug #51920). srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread(): Check trx_is_interrupted() in addition to checking the lock wait timeout. rb://279 approved by Sunny Bains ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2067 committer: mmakela timestamp: Mon 2010-03-29 09:54:57 +0000 message: branches/zip: Merge c6899 from branches/innodb+: Add debug assertions to track down Bug #52360. hash_table_t::magic_n: Add HASH_TABLE_MAGIC_N checks, which were fully absent. ut_hash_ulint(): Assert table_size > 0 before division. ------------------------------------------------------------ revno: 0.3.2066 committer: mmakela timestamp: Mon 2010-03-29 07:36:19 +0000 message: branches/zip: innodb_mutex_show_status(): Fix a condition that was accidentally negated in r6781, making SHOW ENGINE INNODB MUTEX STATUS display only locks with no OS waits. ------------------------------------------------------------ revno: 0.3.2065 committer: vdimov timestamp: Fri 2010-03-26 14:19:01 +0000 message: Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------ revno: 0.3.2064 committer: vdimov timestamp: Thu 2010-03-25 16:18:15 +0000 message: branches/zip: Wrap line at 78 column in ChangeLog. ------------------------------------------------------------ revno: 0.3.2063 committer: vdimov timestamp: Thu 2010-03-25 15:17:52 +0000 message: branches/zip: Wrap ChangeLog at 78th column ------------------------------------------------------------ revno: 0.3.2062 committer: vdimov timestamp: Thu 2010-03-25 15:06:56 +0000 message: branches/zip: Use Bug#N instead of Bug #N to be consistent with the rest of the fil. ------------------------------------------------------------ revno: 0.3.2061 committer: vdimov timestamp: Thu 2010-03-25 15:03:17 +0000 message: branches/zip: Fix ChangeLog - write only the bug title in bugs.mysql.com-related entires. ------------------------------------------------------------ revno: 0.3.2060 committer: vdimov timestamp: Thu 2010-03-25 14:39:44 +0000 message: branches/zip: Whitespace fixup to be consistent with the rest of the file. ------------------------------------------------------------ revno: 0.3.2059 committer: mmakela timestamp: Thu 2010-03-25 11:03:08 +0000 message: branches/zip: page_validate(): Check the buf[] bounds. ------------------------------------------------------------ revno: 0.3.2058 committer: mmakela timestamp: Wed 2010-03-24 12:05:53 +0000 message: branches/zip: dtype_new_store_for_order_and_null_size(): Add ut_ad() on mtype. ------------------------------------------------------------ revno: 0.3.2057 committer: vdimov timestamp: Tue 2010-03-23 17:31:02 +0000 message: branches/zip: Merge joerg@mysql.com-20100322150231-vdq0afbqtmbs6phy from BZR, Including univ.i before mysql/plugin.h is needed to avoid this compiler error: o This is how gcc puts it: o > > ccache /usr/local/gcc-4.3.2/bin/gcc -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -g -O3 -march=i686 -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c o > > In file included from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/my_pthread.h:628: error: expected ')' before '*' token o > > In file included from ../../include/my_pthread.h:732, o > > from ./include/univ.i:114, o > > from trx/trx0i_s.c:36: o > > ../../include/mysql/psi/mysql_thread.h:100: error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h:116: error: expected specifier-qualifier-list before 'pthread_rwlock_t' o > > ../../include/mysql/psi/mysql_thread.h: In function 'inline_mysql_rwlock_init': o > > ../../include/mysql/psi/mysql_thread.h:711: error: 'mysql_rwlock_t' has no member named 'm_psi' o > > ../../include/mysql/psi/mysql_thread.h:716: error: 'mysql_rwlock_t' has no member named 'm_rwlock' o > > .... ((continued)) o o Intel's icc gives slightly clearer messages: o > > icc -static-intel -static-libgcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I./include -I../../sql -I. -I../../zlib -O3 -g -unroll2 -ip -mp -restrict -no-ftz -no-prefetch -DUNIV_LINUX -MT libinnobase_a-trx0i_s.o -MD -MP -MF .deps/libinnobase_a-trx0i_s.Tpo -c -o libinnobase_a-trx0i_s.o `test -f 'trx/trx0i_s.c' || echo './'`trx/trx0i_s.c o > > ../../include/my_pthread.h(628): error: identifier "pthread_rwlock_t" is undefined o > > extern int rw_pr_init(rw_pr_lock_t *); o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(100): error: identifier "pthread_rwlock_t" is undefined o > > rw_lock_t m_rwlock; o > > ^ o > > o > > ../../include/mysql/psi/mysql_thread.h(116): error: identifier "pthread_rwlock_t" is undefined o > > rw_pr_lock_t m_prlock; o > > ^ ------------------------------------------------------------ revno: 0.3.2056 committer: jyang timestamp: Tue 2010-03-23 16:20:36 +0000 message: branches/zip: This is patch from Inaam that uses red-black tree to speed up insertions into the flush_list and thus the recovery process. The patch has been tested by Nokia. ------------------------------------------------------------ revno: 0.3.2055 committer: mmakela timestamp: Tue 2010-03-23 12:09:24 +0000 message: branches/zip: innodb_read_ahead_threshold: Add missing space to help string. ------------------------------------------------------------ revno: 0.3.2054 committer: mmakela timestamp: Tue 2010-03-23 12:07:53 +0000 message: branches/zip: innodb_change_buffering: Correct the documentation. ------------------------------------------------------------ revno: 0.3.2053 committer: marko timestamp: Mon 2010-03-22 11:35:29 +0000 message: branches/zip: mutex_own(), rw_lock_own(): Add attribute((warn_unused_result)). ------------------------------------------------------------ revno: 0.3.2052 committer: calvin timestamp: Thu 2010-03-18 22:32:23 +0000 message: branches/zip: Fix Bug #52102 InnoDB Plugin shows performance drop comparing to builtin InnoDB (Windows only). Disable Windows atomics by default. Approved by: Inaam ------------------------------------------------------------ revno: 0.3.2051 committer: marko timestamp: Thu 2010-03-18 07:48:18 +0000 message: branches/zip: buf_page_peek_if_too_old(): Use 32-bit arithmetics when comparing the age of access_time to buf_LRU_old_threshold_ms. This fixes a bug on 64-bit systems. ------------------------------------------------------------ revno: 0.3.2050 committer: calvin timestamp: Wed 2010-03-17 15:16:38 +0000 message: branches/zip: rename IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION in CMakeLists.txt. The rename was done as r5871, but CMakeLists.txt was forgotten. Also, add INNODB_RW_LOCKS_USE_ATOMICS to CMake. ------------------------------------------------------------ revno: 0.3.2049 committer: inaam timestamp: Thu 2010-03-11 21:15:17 +0000 message: branches/zip issue#463 Fixed compiler warning about uninitialized variable. Non-functional change. ------------------------------------------------------------ revno: 0.3.2048 committer: marko timestamp: Thu 2010-03-11 11:34:28 +0000 message: branches/zip: mtr_memo_contains(): Relax the assertion of r6800, allowing mtr->state == MTR_COMMITTING. ------------------------------------------------------------ revno: 0.3.2047 committer: marko timestamp: Thu 2010-03-11 10:02:57 +0000 message: branches/zip: Add ut_ad(mtr->state == MTR_ACTIVE) to various places. ------------------------------------------------------------ revno: 0.3.2046 committer: jyang timestamp: Thu 2010-03-11 07:59:42 +0000 message: branches/zip: Once change in bug #47621 merges into zip branch, zip only test innodb_bug44571 needs to be updated to reflect the column name change would be successful be done in InnoDB as well. ------------------------------------------------------------ revno: 0.3.2045 committer: marko timestamp: Thu 2010-03-11 07:53:01 +0000 message: branches/zip: Fix and clarify the latching of some buf_block_t members. buf_block_t::check_index_page_at_flush: Note that this field is not protected by any mutex. Make it a separate field, not a bitfield that could share the machine word with other fields. buf_block_t::lock_hash_val: Note that this field is protected by buf_block_t::lock (or during block creation, by buf_pool_mutex and buf_block_t::mutex). buf_block_get_lock_hash_val(): Assert that block->lock is held by the current thread. Issue #465, rb://267 approved by Inaam Rana ------------------------------------------------------------ revno: 0.3.2044 committer: marko timestamp: Wed 2010-03-10 12:02:19 +0000 message: branches/zip: Merge revisions 6669:6788 from branches/5.1: ------------------------------------------------------------------------ r6774 | calvin | 2010-03-03 23:56:10 +0200 (Wed, 03 Mar 2010) | 2 lines Changed paths: M /branches/5.1/trx/trx0sys.c branches/5.1: fix bug#51653: outdated reference to set-variable Non functional change. ------------------------------------------------------------------------ r6780 | vasil | 2010-03-08 19:13:20 +0200 (Mon, 08 Mar 2010) | 4 lines Changed paths: M /branches/5.1/plug.in branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r6783 | jyang | 2010-03-09 17:54:14 +0200 (Tue, 09 Mar 2010) | 9 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug47621.result A /branches/5.1/mysql-test/innodb_bug47621.test branches/5.1: Fix bug #47621 "MySQL and InnoDB data dictionaries will become out of sync when renaming columns". MySQL does not provide new column name information to storage engine to update the system table. To avoid column name mismatch, we shall just request a table copy for now. rb://246 approved by Marko. ------------------------------------------------------------------------ r6785 | vasil | 2010-03-10 09:04:38 +0200 (Wed, 10 Mar 2010) | 11 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: Add the missing --reap statements in innodb_bug38231.test. Probably MySQL enforced the presence of those recently and the test started failing like: main.innodb_bug38231 [ fail ] Test ended at 2010-03-10 08:48:32 CURRENT_TEST: main.innodb_bug38231 mysqltest: At line 49: Cannot run query on connection between send and reap ------------------------------------------------------------------------ r6788 | vasil | 2010-03-10 10:53:21 +0200 (Wed, 10 Mar 2010) | 8 lines Changed paths: M /branches/5.1/mysql-test/innodb_bug38231.test branches/5.1: In innodb_bug38231.test: replace the fragile sleep 0.2 that depends on timing with a more robust condition which waits for the TRUNCATE and LOCK commands to appear in information_schema.processlist. This could also break if there are other sessions executing the same SQL commands, but there are none during the execution of the mysql test. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2043 committer: marko timestamp: Wed 2010-03-10 11:56:41 +0000 message: branches/zip: Copy tests from branches/5.1 that were lost in some merge. ------------------------------------------------------------ revno: 0.3.2042 committer: marko timestamp: Wed 2010-03-10 11:39:06 +0000 message: branches/zip: Add ChangeLog entries for r6789, r6790. ------------------------------------------------------------ revno: 0.3.2041 committer: jyang timestamp: Wed 2010-03-10 11:09:41 +0000 message: branches/zip: Fix bug #51356: "many valgrind errors in error messages with concurrent ddl". Null terminate the name string returned from innobase_convert_identifier() call when reporting DB_DUPLICATE_KEY error in create_table_def(). rb://266 approved by Marko ------------------------------------------------------------ revno: 0.3.2040 committer: jyang timestamp: Wed 2010-03-10 09:18:18 +0000 message: branches/zip: If a unique index is on a column prefix, such unique index cannot be upgrade to primary index even if there is no primary index already defined. Also fix possible corruption when initialize "ref_length" value in case there is a mismatch between MySQL and InnoDB primary key. Fix bug #51378: "Init 'ref_length' to correct value, in case an out of bound MySQL primary_key". rb://262 approved by Marko. ------------------------------------------------------------ revno: 0.3.2039 committer: marko timestamp: Wed 2010-03-10 08:35:06 +0000 message: branches/zip: recv_parse_log_rec(): Remove a bogus assertion about page_no. TODO: We might also consider removing recv_max_parsed_page_no, because it does not make much sense with *.ibd files. recv_report_corrupt_log(), recv_scan_log_recs(): Abort when a corrupted log record has been found, unless innodb_force_recovery has been set. This fixes Issue #464. rb://265 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.2038 committer: vasil timestamp: Wed 2010-03-10 07:16:50 +0000 message: branches/zip: Fix typo in comment ------------------------------------------------------------ revno: 0.3.2037 committer: marko timestamp: Tue 2010-03-09 12:09:26 +0000 message: branches/zip: fil0fil.c: Update comments on table->flags as of r6252. ------------------------------------------------------------ revno: 0.3.2036 committer: marko timestamp: Tue 2010-03-09 07:41:08 +0000 message: branches/zip: Make SHOW ENGINE INNODB MUTEX display SUM(os_waits) for block mutexes and blocks. Designed by Michael and Marko. rb://188, Issue #358 ------------------------------------------------------------ revno: 0.3.2035 committer: marko timestamp: Mon 2010-03-08 12:35:42 +0000 message: branches/zip: Fix IMPORT TABLESPACE of compressed tables. Previously, a wrong parameter was passed to buf_flush_init_for_writing(). fil_reset_too_high_lsns(): Set up page_zip and use it if needed. rb://264, Issue #352 ------------------------------------------------------------ revno: 0.3.2034 committer: marko timestamp: Thu 2010-03-04 11:01:25 +0000 message: branches/zip: trx_undo_update_rec_get_update(): Silence a bogus GCC warning about a possibly uninitialized variable. ------------------------------------------------------------ revno: 0.3.2033 committer: marko timestamp: Wed 2010-03-03 13:31:54 +0000 message: branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning of possibly uninitialized variable format_in_hex. ------------------------------------------------------------ revno: 0.3.2032 committer: marko timestamp: Wed 2010-03-03 12:52:43 +0000 message: Document r6770. ------------------------------------------------------------ revno: 0.3.2031 committer: marko timestamp: Wed 2010-03-03 10:52:55 +0000 message: branches/zip: Disallow duplicate index name when creating an index. This should fix Mantis Issue #461. innodb.test, innodb.result, innodb-index.test, innodb-index.result: Adjust the test result and mention that the introduced restriction has been reported as MySQL Bug #51451. innobase_check_index_keys(): Add a parameter for the InnoDB table and check that no duplicate index name is added. Report errors by my_error() instead of sql_print_error(). rb://260 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.2030 committer: vasil timestamp: Tue 2010-03-02 16:20:48 +0000 message: branches/zip: Add a NOTE to the comment of btr_node_ptr_get_child_page_no() to prevent mysterious bugs. ------------------------------------------------------------ revno: 0.3.2029 committer: calvin timestamp: Mon 2010-03-01 16:16:10 +0000 message: branches/zip: fix bug#51587 Non-functional change. ------------------------------------------------------------ revno: 0.3.2028 committer: marko timestamp: Wed 2010-02-24 08:56:43 +0000 message: branches/zip: Allocate the merge sort buffers from a heap, not stack. The merge sort can use up to 48KiB of buffers when merging blocks. That can cause a stack overflow, especially on 64-bit systems when not building with inlined functions. This was reported as Issue #462. row_merge_dup_report(): Allocate buf and offsets from a heap. row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus sizeof arithmetics that happened to work, because sizeof(ulint)==sizeof(void*). row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap. row_merge_insert_index_tuples(): Allocate buf from graph_heap. rb://258 approved and tested by Sunny Bains ------------------------------------------------------------ revno: 0.3.2027 committer: marko timestamp: Mon 2010-02-22 06:57:23 +0000 message: branches/zip: row_fetch_store_uint4(): Remove unused function. This was added to trunk in r435. ------------------------------------------------------------ revno: 0.3.2026 committer: vasil timestamp: Sat 2010-02-20 16:45:41 +0000 message: Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------ revno: 0.3.2025 committer: sunny timestamp: Thu 2010-02-18 11:44:31 +0000 message: branches/zip: Don't print the entire lock bit set if the block was not found in the buffer pool. Only print the bits that are set and that information is in the lock and not in the block. See rb://256 approved by Marko. ------------------------------------------------------------ revno: 0.3.2024 committer: marko timestamp: Wed 2010-02-17 16:54:04 +0000 message: branches/zip: Remove UNIV_BASIC_LOG_DEBUG. This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341. Suggested by Heikki. ------------------------------------------------------------ revno: 0.3.2023 committer: marko timestamp: Wed 2010-02-17 16:50:20 +0000 message: branches/zip: fsp_init_file_page_low(): Declare the page uninitialized for Valgrind. ------------------------------------------------------------ revno: 0.3.2022 committer: marko timestamp: Wed 2010-02-17 16:49:21 +0000 message: branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid for the first page of each ibdata* file, not *.ibd files. Suggested by Heikki, in connection with the LSN warning noted in Issue #341. ------------------------------------------------------------ revno: 0.3.2021 committer: marko timestamp: Wed 2010-02-17 13:52:05 +0000 message: branches/zip: Merge revisions 6613:6669 from branches/5.1: ------------------------------------------------------------------------ r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines branches/5.1: Fix bug #50691, AIX implementation of readdir_r causes InnoDB errors. readdir_r() returns an non-NULL value in the case of reaching the end of a directory. It should not be treated as an error return. rb://238 approved by Marko ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2020 committer: marko timestamp: Wed 2010-02-17 09:48:34 +0000 message: branches/zip: lock_table_other_has_incompatible(): Return an incompatible lock or NULL instead of TRUE or FALSE. Approved by Sunny over IM. ------------------------------------------------------------ revno: 0.3.2019 committer: marko timestamp: Tue 2010-02-16 13:06:16 +0000 message: branches/zip: Fix a comment. ------------------------------------------------------------ revno: 0.3.2018 committer: marko timestamp: Tue 2010-02-16 12:53:20 +0000 message: branches/zip: log_reserve_and_write_fast(): Correct a race condition in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440. ------------------------------------------------------------ revno: 0.3.2017 committer: sunny timestamp: Tue 2010-02-16 08:14:21 +0000 message: branches/zip: Fix comment. Non functional change. ------------------------------------------------------------ revno: 0.3.2016 committer: sunny timestamp: Tue 2010-02-16 08:12:25 +0000 message: branches/zip: Update the comments and fix the whitespace issues. See rb://255 Approved by: Marko ------------------------------------------------------------ revno: 0.3.2015 committer: sunny timestamp: Tue 2010-02-16 08:12:17 +0000 message: branches/zip: Change the bit fields back to ulint. Bit fields were causing problems with concurrency on SMP systems because of word packing issues. The number of trx_t's in a system is not sufficient enough to require that we try and save a few bytes in the data structure. See rb://255 for details. ------------------------------------------------------------ revno: 0.3.2014 committer: marko timestamp: Tue 2010-02-16 08:05:36 +0000 message: branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex is held by the caller. ------------------------------------------------------------ revno: 0.3.2013 committer: inaam timestamp: Fri 2010-02-12 17:22:35 +0000 message: branches/zip ChangeLog entry for r6674. ------------------------------------------------------------ revno: 0.3.2012 committer: marko timestamp: Thu 2010-02-11 20:41:11 +0000 message: branches/zip: Remove bogus debug assertions introduced in r6660. ------------------------------------------------------------ revno: 0.3.2011 committer: inaam timestamp: Thu 2010-02-11 15:54:44 +0000 message: branches/zip bug# 49535 This is a backport of r4924. mem_heap_get_size() scans all allocated blocks to calculate the total size of the heap. This patch introduces a new, total_size, field in mem_block_info_struct. This field is valid only for base block (i.e.: the first block allocated for the heap) and is set to ULINT_UNDEFINED in other blocks. This considerably improves the performance of redo scan during recovery. rb://108 issue#216 Approved by: Heikki ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2010 committer: marko timestamp: Thu 2010-02-11 11:09:48 +0000 message: branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452) When rolling back an incomplete transaction in purge, tolerate missing BLOBs also in update undo, when undoing an INSERT by updating a delete-marked record, and the delete-marked record is no longer needed. Previously, we only tolerated missing BLOBs in insert undo. This merely fixes a debug assertion; the code performed correctly without UNIV_DEBUG. rb://249 approved by Sunny Bains. ------------------------------------------------------------ revno: 0.3.2009 committer: marko timestamp: Thu 2010-02-11 11:01:18 +0000 message: branches/zip: Introduce thr_is_recv(). ------------------------------------------------------------ revno: 0.3.2008 committer: marko timestamp: Thu 2010-02-11 09:21:11 +0000 message: branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec. row_undo_mod_remove_clust_low(): Augment the function comment. row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(), row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec(): Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC); ------------------------------------------------------------ revno: 0.3.2007 committer: marko timestamp: Wed 2010-02-10 11:11:04 +0000 message: branches/zip: trx_rseg_create(): Unused function, remove. ------------------------------------------------------------ revno: 0.3.2006 committer: marko timestamp: Wed 2010-02-10 09:07:05 +0000 message: branches/zip: Clean up after r6559. Now that btr_pcur_open_with_no_init() is a macro, do not mix preprocessor directives in the macro invocation, because it is implementation-defined whether that is going to work. ------------------------------------------------------------ revno: 0.3.2005 committer: marko timestamp: Wed 2010-02-10 08:40:55 +0000 message: branches/zip: Merge revisions 6538:6613 from branches/5.1: ------------------------------------------------------------------------ r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines Changed paths: M /branches/5.1/lock/lock0lock.c branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info incorrect when deadlock detection aborts". Print the correct lock owner when recursive function lock_deadlock_recursive() exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK. rb://217, approved by Marko. ------------------------------------------------------------------------ r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines Changed paths: M /branches/5.1/buf/buf0buf.c M /branches/5.1/buf/buf0rea.c M /branches/5.1/include/buf0rea.h branches/5.1: Fix Bug #38901 InnoDB logs error repeatedly when trying to load page into buffer pool In buf_page_get_gen() if we are unable to read a page (because of corruption or some other reason) we keep on retrying. This fills up error log with millions of entries in no time and we'd eventually run out of disk space. This patch limits the number of attempts that we make (currently set to 100) and after that we abort with a message. rb://241 Approved by: Heikki ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.2004 committer: marko timestamp: Wed 2010-02-10 07:19:52 +0000 message: branches/zip: Document r6614 in ChangeLog. ------------------------------------------------------------ revno: 0.3.2003 committer: inaam timestamp: Tue 2010-02-09 18:26:23 +0000 message: branches/plugin rb://242 Let the master thread sleep if the amount of work to be done is calibrated as taking less than a second. Approved by: Heikki ------------------------------------------------------------ revno: 0.3.2002 committer: marko timestamp: Tue 2010-02-09 12:32:39 +0000 message: branches/zip: recv_recovery_rollback_active(): Drop the temporary tables and indexes after enabling sync order checks. This should not make any difference. This could have been done in r6611. ------------------------------------------------------------ revno: 0.3.2001 committer: marko timestamp: Tue 2010-02-09 12:28:25 +0000 message: branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files innobase_start_or_create_for_mysql(): Roll back data dictionary transactions before scanning the *.ibd files. Then, data dictionary records can be loaded to the cache before opening the *.ibd files. recv_recovery_rollback_active(): Refactored from recv_recovery_from_checkpoint_finish(). rb://235, committing without review, because this is needed for TablespaceDictionary. ------------------------------------------------------------ revno: 0.3.2000 committer: marko timestamp: Tue 2010-02-09 11:53:59 +0000 message: branches/zip: When dropping temporary indexes and tables at startup, first load them to the data dictionary cache and use the normal routines for dropping tables or indexes. This should reduce the risk of bugs and also make the code compatible with the upcoming TablespaceDictionary implementation. DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME. row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing temporary indexes, and load the tables as needed. Invoke row_merge_drop_index() to drop the indexes. row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables, load them with dict_load_table() and drop them with row_drop_table_for_mysql(). rb://251, not yet reviewed ------------------------------------------------------------ revno: 0.3.1999 committer: marko timestamp: Tue 2010-02-09 11:45:40 +0000 message: branches/zip: dict_field_print_low(): Add const qualifier. ------------------------------------------------------------ revno: 0.3.1998 committer: marko timestamp: Tue 2010-02-09 09:02:37 +0000 message: branches/zip: ha_innobase::add_index(): Check for !innodb_table. ------------------------------------------------------------ revno: 0.3.1997 committer: marko timestamp: Mon 2010-02-08 11:53:02 +0000 message: branches/zip: btr_pcur_commit(): Unused function, remove. ------------------------------------------------------------ revno: 0.3.1996 committer: marko timestamp: Mon 2010-02-08 10:55:04 +0000 message: branches/zip: rec_get_nth_field_offs_old(): Replace if (!cond) ut_error; tests with ut_a(cond). ------------------------------------------------------------ revno: 0.3.1995 committer: marko timestamp: Mon 2010-02-08 08:06:39 +0000 message: branches/zip: row_merge_drop_index(): Remove redundant condition on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique, because SYS_FIELDS is not indexed by TABLE_ID. ------------------------------------------------------------ revno: 0.3.1994 committer: sunny timestamp: Thu 2010-02-04 14:11:23 +0000 message: branches/zip: Remove the additional check introduced in r6534 which tries to check if the joining transaction has any other transactions waiting on its locks. This optimization results in excessive deadlocks when running Sysbench with a large number of threads. The function seems to return FALSE positives. rb://250 ------------------------------------------------------------ revno: 0.3.1993 committer: marko timestamp: Thu 2010-02-04 11:21:18 +0000 message: branches/zip: Pass the file name and line number of the caller of the b-tree cursor functions to the buffer pool requests, in order to make the latch diagnostics more accurate. buf_page_optimistic_get_func(): Renamed to buf_page_optimistic_get(). btr_page_get_father_node_ptr(), btr_insert_on_non_leaf_level(), btr_pcur_open(), btr_pcur_open_with_no_init(), btr_pcur_open_on_user_rec(), btr_pcur_open_at_rnd_pos(), btr_pcur_restore_position(), btr_cur_open_at_index_side(), btr_cur_open_at_rnd_pos(): Rename the function to _func and add the parameters file, line. Define wrapper macros with __FILE__, __LINE__. btr_cur_search_to_nth_level(): Add the parameters file, line. ------------------------------------------------------------ revno: 0.3.1992 committer: marko timestamp: Wed 2010-02-03 13:01:39 +0000 message: branches/zip: buf_LRU_invalidate_tablespace(): Ensure that prev_bpage is not relocated when freeing a compressed block. This avoids the costly rescan of the LRU list. (Bug #35077, Issue #449) At most one buffer-fix will be active at a time, affecting two blocks: the buf_page_t and the compressed page frame. This should not block the memory defragmentation in buf0buddy.c too much. In fact, it may avoid unnecessary copying if also prev_bpage belongs to the tablespace that is being invalidated. rb://240 ------------------------------------------------------------ revno: 0.3.1991 committer: marko timestamp: Wed 2010-02-03 12:43:38 +0000 message: branches/zip: Clean up CHECK TABLE error handling. (Issue #220) ha_innobase::change_active_index(): Clean up code formatting. ha_innobase::check(): Incorporate the code from row_check_table_for_mysql(). Report errors to the client connection instead of writing them to the error log. row_check_table_for_mysql(): Remove. row_check_index_for_mysql(): Renamed from row_scan_and_check_index(). Let the caller initialize prebuilt, and assume that the index is usable. rb://178 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1990 committer: jyang timestamp: Wed 2010-02-03 09:05:24 +0000 message: branches/zip: Relax assertion on the number of index defined in InnoDB must be comparable with that of MySQL to tolerate possible dictionary inconsistency. Fix Mantis issue #455, "UNIV_DEBUG+ assert ha_innodb.cc:3152 ib_num_index >= mysql_num_index". rb://248 Approved by Marko. ------------------------------------------------------------ revno: 0.3.1989 committer: marko timestamp: Mon 2010-02-01 09:35:13 +0000 message: branches/zip: ChangeLog: Document the merge of 6471:6538 from branches/5.1. ------------------------------------------------------------ revno: 0.3.1988 committer: marko timestamp: Mon 2010-02-01 09:31:12 +0000 message: branches/zip: Merge revisions 6471:6538 from branches/5.1: ------------------------------------------------------------------------ r6488 | sunny | 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) | 2 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files. ------------------------------------------------------------------------ r6489 | sunny | 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) | 2 lines Changed paths: A /branches/5.1/mysql-test/innodb-autoinc-44030.result A /branches/5.1/mysql-test/innodb-autoinc-44030.test branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test into a separate test/result files. ------------------------------------------------------------------------ r6492 | sunny | 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) | 1 line Changed paths: M /branches/5.1/mysql-test/innodb-autoinc-44030.test branches/5.1: Add reference to bug#47621 in the comment. ------------------------------------------------------------------------ r6535 | sunny | 2010-01-30 00:08:40 +0200 (Sat, 30 Jan 2010) | 11 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Undo the change from r6424. We need to return DB_SUCCESS even if we were unable to initialize the tabe autoinc value. This is required for the open to succeed. The only condition we currently treat as a hard error is if the autoinc field instance passed in by MySQL is NULL. Previously if the table autoinc value was 0 and the next value was requested we had an assertion that would fail. Change that assertion and treat a value of 0 to mean that the autoinc system is unavailable. Generation of next value will now return failure. rb://237 ------------------------------------------------------------------------ r6536 | sunny | 2010-01-30 00:13:42 +0200 (Sat, 30 Jan 2010) | 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Check *first_value everytime against the column max value and set *first_value to next autoinc if it's > col max value. ie. not rely on what is passed in from MySQL. [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value rb://236 ------------------------------------------------------------------------ r6537 | sunny | 2010-01-30 00:35:00 +0200 (Sat, 30 Jan 2010) | 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Undo r6536. ------------------------------------------------------------------------ r6538 | sunny | 2010-01-30 00:43:06 +0200 (Sat, 30 Jan 2010) | 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Check *first_value every time against the column max value and set *first_value to next autoinc if it's > col max value. ie. not rely on what is passed in from MySQL. [49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value rb://236 ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1987 committer: sunny timestamp: Fri 2010-01-29 21:42:49 +0000 message: branches/zip: Two changes to fix the problem: 1. First scan the joining transaction's locks and check if no other transaction is waiting for a lock held by the joining transaction. If no other transaction is waiting then no deadlock an occur and we avoid doing an exhaustive search. 2. Change the direction of the lock traversal from backward to forward. Previously we traversed backward from the lock that has to wait, the function to that fetched the previous node was very inefficient resulting in O(n^2) access to the rec lock list. Fix Bug #49047 InnoDB deadlock detection is CPU intensive with many locks on a single row. rb://218 ------------------------------------------------------------ revno: 0.3.1986 committer: calvin timestamp: Fri 2010-01-29 21:31:59 +0000 message: branches/zip: remove duplicated copyright and license info. ------------------------------------------------------------ revno: 0.3.1985 committer: vasil timestamp: Fri 2010-01-29 12:39:48 +0000 message: branches/zip: Extend the comment about row_mysql_handle_errors(). Suggested by: Heikki ------------------------------------------------------------ revno: 0.3.1984 committer: jyang timestamp: Thu 2010-01-28 16:12:40 +0000 message: branches/zip: Add index translation table to map mysql index number to InnoDB index structure directly. Fix Bug #47622: "the new index is added before the existing ones in MySQL, but after one in SE". rb://215, approved by Marko ------------------------------------------------------------ revno: 0.3.1983 committer: marko timestamp: Thu 2010-01-28 14:23:15 +0000 message: branches/zip: buf_LRU_invalidate_tablespace(): Do not unnecessarily acquire the block_mutex for every block in the LRU list. Only acquire it when holding buf_pool_mutex is not sufficient. This should speed up the function and considerably reduce traffic on the memory bus and caches. I noticed this deficiency when working on Issue #157. This deficiency popped up again in Issue #449 (Bug #35077), which this fix does not fully address. rb://78 revision 1 approved by Heikki Tuuri. ------------------------------------------------------------ revno: 0.3.1982 committer: marko timestamp: Wed 2010-01-27 08:49:01 +0000 message: branches/zip: Drop temporary tables at startup. This addresses the third aspect of Bug #41609. row_mysql_drop_temp_tables(): New function, to drop all temporary tables. These can be distinguished by the least significant bit of MIX_LEN. However, we will skip ROW_FORMAT=REDUNDANT tables, because in the records for those tables, that bit may be garbage. recv_recovery_from_checkpoint_finish(): Invoke row_mysql_drop_temp_tables(). Normally, if the .frm files for the temporary tables exist at startup, MySQL will ask InnoDB to drop the temporary tables. However, if the files are deleted, for instance, by the boot scripts of the operating system, the tables would remain in the InnoDB data dictionary unless someone digs them up by innodb_table_monitor and creates .frm files for dropping the tables. rb://221 approved by Sunny Bains. ------------------------------------------------------------ revno: 0.3.1981 committer: marko timestamp: Thu 2010-01-21 09:22:52 +0000 message: branches/zip: buf_page_get_gen(): Obey recv_no_ibuf_operations and do not call ibuf_merge_or_delete_for_page() in crash recovery, before the redo log has been applied. This could cure some hard-to-repeat, hard-to-explain bugs related to secondary indexes. A possible recipe to repeat the bug: 1. update a secondary index leaf page on a compressed table 2. evict the page from the buffer pool while it is still dirty 3. ibuf_insert() something for the page 4. crash 5. crash recovery; ibuf merge would be done too early, before applying redo log to the sec index page or the ibuf pages ------------------------------------------------------------ revno: 0.3.1980 committer: calvin timestamp: Fri 2010-01-15 23:58:16 +0000 message: branches/zip: fix bug#49396: innodb.innodb-index test fails in embedded mode This is 2nd part of the fix for bug#49396. The 1st part is innodb.test. Tested in both embedded mode and normal server mode. ------------------------------------------------------------ revno: 0.3.1979 committer: calvin timestamp: Fri 2010-01-15 23:53:47 +0000 message: branches/zip: Merge revisions 6425:6471 from branches/5.1 to pick up the first part fix of bug49396. ------------------------------------------------------------------------ r6471 | calvin | 2010-01-15 17:43:27 -0600 (Fri, 15 Jan 2010) | 4 lines branches/5.1: fix bug#49396: main.innodb test fails in embedded mode Change replace_result by using $MYSQLD_DATADIR. Tested in both embedded mode and normal server mode. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1978 committer: inaam timestamp: Thu 2010-01-14 18:46:00 +0000 message: branches/zip rb://226 log_sys->written_to_all_lsn does not accurately represent the LSN upto which write and flush has taken place. Under a race condition it can fall behind log_sys->flushed_to_disk_lsn which is accurate. Besides written_to_all_lsn is redundant as currently InnoDB supports only one log group. Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1977 committer: marko timestamp: Thu 2010-01-14 13:43:37 +0000 message: branches/zip: page_copy_rec_list_end(), page_copy_rec_list_start(): Update PAGE_MAX_TRX_ID before attempting to compress the page. This fixes Issue #382 (a debug assertion failure in page_zip_reorganize()) and reduces the generated redo log. There was no bug or crash in non-debug builds. ------------------------------------------------------------ revno: 0.3.1976 committer: marko timestamp: Wed 2010-01-13 20:38:53 +0000 message: branches/zip: lock_rec_validate_page(): Only validate the record queues when the thread is not holding a space->latch. When UNIV_DEBUG is defined while UNIV_SYNC_DEBUG is not, latching order violations will still occur and deadlocks will be possible. sync_thread_levels_nonempty_gen(): Renamed from sync_thread_levels_empty_gen(). Return the violating latch or NULL instead of FALSE or TRUE, except that there will be a ut_error before the non-NULL return. sync_thread_levels_empty_gen(): A macro that negates the return value of sync_thread_levels_nonempty_gen(). sync_thread_levels_contains(): New function, based on sync_thread_levels_nonempty_gen(). This should fix Issue #441. ------------------------------------------------------------ revno: 0.3.1975 committer: marko timestamp: Wed 2010-01-13 15:43:44 +0000 message: branches/zip: row_sel_get_clust_rec_for_mysql(): On the READ UNCOMMITTED isolation level, do not attempt to access a clustered index record that has been marked for deletion. This fixes Issue #433. Approved by Heikki over the IM. ------------------------------------------------------------ revno: 0.3.1974 committer: marko timestamp: Wed 2010-01-13 15:20:10 +0000 message: branches/zip: Treat mem_hash_mutex specially in mutex_free(), and explicitly free mem_hash_mutex in mem_close(). This fixes the breakage of UNIV_MEM_DEBUG that was filed as Issue #434. ------------------------------------------------------------ revno: 0.3.1973 committer: marko timestamp: Wed 2010-01-13 15:15:29 +0000 message: branches/zip: buf_pool_drop_hash_index(): Check block->page.state before checking block->is_hashed, because the latter may be uninitialized right after server startup. ------------------------------------------------------------ revno: 0.3.1972 committer: marko timestamp: Wed 2010-01-13 11:19:00 +0000 message: branches/zip: dict_sys_tables_get_flags(), dict_create_sys_*_tuple(): Add some const qualifiers and comments. ------------------------------------------------------------ revno: 0.3.1971 committer: marko timestamp: Tue 2010-01-12 13:36:14 +0000 message: branches/zip: row_sel_sec_rec_is_for_clust_rec(): Document the return value more accurately. ------------------------------------------------------------ revno: 0.3.1970 committer: marko timestamp: Tue 2010-01-12 11:47:11 +0000 message: branches/zip: Merge revisions 6350:6424 from branches/5.1: ------------------------------------------------------------------------ r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.1: Fix bug #49238: Creating/Dropping a temporary table while at 1023 transactions will cause assert. Handle possible DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in row_drop_table_for_mysql(). rb://220, approved by Marko ------------------------------------------------------------------------ r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/handler/ha_innodb.h branches/5.1: Non-functional change: Make innobase_get_int_col_max_value() a static function. It does not access any fields of class ha_innobase. ------------------------------------------------------------------------ r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/handler/ha_innodb.h branches/5.1: In innobase_initialize_autoinc(), do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4, so that writes are disabled. (Bug #46193) innobase_get_int_col_max_value(): Move the function definition before ha_innobase::innobase_initialize_autoinc(), because that function now calls this function. ha_innobase::innobase_initialize_autoinc(): Change the return type to void. Do not attempt to read the maximum auto-increment value from the table if innodb_force_recovery is set to at least 4. Issue ER_AUTOINC_READ_FAILED to the client when the auto-increment value cannot be read. rb://144 by Sunny, revised by Marko ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1969 committer: marko timestamp: Mon 2009-12-28 13:39:19 +0000 message: branches/zip: dict_index_add_to_cache(): Always free the index object, also when returning DB_CORRUPTION. ------------------------------------------------------------ revno: 0.3.1968 committer: marko timestamp: Sat 2009-12-26 19:06:31 +0000 message: branches/zip: ibuf_bitmap_get_map_page(): Define a wrapper macro that passes __FILE__, __LINE__ of the caller to buf_page_get_gen(). This will ease the diagnosis of the likes of Issue #135. ------------------------------------------------------------ revno: 0.3.1967 committer: marko timestamp: Tue 2009-12-22 10:33:01 +0000 message: branches/zip: Merge revisions 6206:6350 from branches/5.1, except r6347, r6349, r6350 which were committed separately to both branches, and r6310, which was backported from zip to 5.1. ------------------------------------------------------------------------ r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Non-functional change, fix formatting. ------------------------------------------------------------------------ r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result branches/5.1: Fix autoinc failing test results. (this should be skipped when merging 5.1 into zip) ------------------------------------------------------------------------ r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test M /branches/5.1/row/row0sel.c branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine. We use the appropriate function to read the column value for non-integer autoinc column types, namely float and double. rb://208. Approved by Marko. ------------------------------------------------------------------------ r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines Changed paths: M /branches/5.1/row/row0sel.c branches/5.1: This is an interim fix, fix white space errors. ------------------------------------------------------------------------ r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines Changed paths: M /branches/5.1/include/mach0data.h M /branches/5.1/include/mach0data.ic M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test M /branches/5.1/row/row0sel.c branches/5.1: This is an interim fix, fix tests and make read float/double arg const. ------------------------------------------------------------------------ r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines Changed paths: M /branches/5.1/row/row0sel.c branches/5.1: This is an interim fix, fix whitepsace issues. ------------------------------------------------------------------------ r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values. This bug is similiar to the negative autoinc filter patch from earlier, with the additional handling of filtering out the negative column values set explicitly by the user. rb://184 Approved by Heikki. ------------------------------------------------------------------------ r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines Changed paths: M /branches/5.1/export.sh branches/5.1: Minor changes to support plugin snapshots. ------------------------------------------------------------------------ r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows because of different case mode There is no change to the InnoDB code, only to fix test case by changing "T1" to "t1". ------------------------------------------------------------------------ r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/lock0lock.h M /branches/5.1/include/srv0srv.h M /branches/5.1/lock/lock0lock.c M /branches/5.1/log/log0log.c M /branches/5.1/srv/srv0srv.c M /branches/5.1/srv/srv0start.c branches/5.1: Fix bug #47814 - Diagnostics are frequently not printed after a long lock wait in InnoDB. Separate out the lock wait timeout check thread from monitor information printing thread. rb://200 Approved by Marko. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1966 committer: marko timestamp: Tue 2009-12-22 09:11:18 +0000 message: branches/zip: Remove an obsolete declaration of LOCK_thread_count. ------------------------------------------------------------ revno: 0.3.1965 committer: marko timestamp: Tue 2009-12-22 09:04:34 +0000 message: branches/zip: Merge a change from MySQL: ------------------------------------------------------------ revno: 3236 committer: Satya B branch nick: mysql-5.1-bugteam timestamp: Tue 2009-12-01 17:48:57 +0530 message: merge to mysql-5.1-bugteam ------------------------------------------------------------ revno: 3234.1.1 committer: Gleb Shchepa branch nick: mysql-5.1-bugteam timestamp: Tue 2009-12-01 14:38:40 +0400 message: Bug #38883 (reopened): thd_security_context is not thread safe, crashes? manual merge 5.0-->5.1, updating InnoDB plugin. ------------------------------------------------------------ revno: 1810.3968.13 committer: Gleb Shchepa branch nick: mysql-5.0-bugteam timestamp: Tue 2009-12-01 14:24:44 +0400 message: Bug #38883 (reopened): thd_security_context is not thread safe, crashes? The bug 38816 changed the lock that protects THD::query from LOCK_thread_count to LOCK_thd_data, but didn't update the associated InnoDB functions. 1. The innobase_mysql_prepare_print_arbitrary_thd and the innobase_mysql_end_print_arbitrary_thd InnoDB functions have been removed, since now we have a per-thread mutex: now we don't need to wrap several inter-thread access tries to THD::query with a single global LOCK_thread_count lock, so we can simplify the code. 2. The innobase_mysql_print_thd function has been modified to lock LOCK_thd_data in direct way. ------------------------------------------------------------ revno: 0.3.1964 committer: marko timestamp: Mon 2009-12-21 10:03:25 +0000 message: branches/zip: recv_recovery_from_checkpoint_finish(): Revert a change that was accidentally committed in r6345. ------------------------------------------------------------ revno: 0.3.1963 committer: marko timestamp: Mon 2009-12-21 08:46:14 +0000 message: branches/zip: recv_scan_log_recs(): Non-functional change: Replace a debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE). This change is only for readability, for Issue #428. Another assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE already ensured together with the old ut_ad(len > 0) that actually len must be at least OS_FILE_LOG_BLOCK_SIZE. ------------------------------------------------------------ revno: 0.3.1962 committer: marko timestamp: Wed 2009-12-16 14:16:33 +0000 message: branches/zip: row_merge_drop_temp_indexes(): Revert a hack to transaction isolation level that was made unnecessary by r5826 (Issue #337). When this function is called, any active data dictionary transaction should have been rolled back. ------------------------------------------------------------ revno: 0.3.1961 committer: marko timestamp: Wed 2009-12-16 08:10:36 +0000 message: branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded program and does not contain mutexes. This change allows InnoDB Hot Backup to be compiled with UNIV_DEBUG. Suggested by Michael Izioumtchenko. ------------------------------------------------------------ revno: 0.3.1960 committer: marko timestamp: Tue 2009-12-15 12:05:50 +0000 message: branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness. Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning. Reported by Sunny Bains. ------------------------------------------------------------ revno: 0.3.1959 committer: marko timestamp: Mon 2009-12-14 11:03:57 +0000 message: branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing const qualifier. ------------------------------------------------------------ revno: 0.3.1958 committer: marko timestamp: Wed 2009-12-09 07:51:00 +0000 message: branches/zip: row_upd_copy_columns(): Remove redundant code that was accidentally added in r1591, which introduced dfield_t::ext in order to make the merge sort of fast index creation support externally stored columns. Initially, I tried to allocate the bit for dfield_t::ext from dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL to something that would fit in it. Then I decided that it would be too risky. The redundant check was part of the mapping. The condition may have been dfield_is_null() initially. This is similar to the redundant code in row_sel_fetch_columns() that was noticed by Sergey Petrunya on the MySQL internals list and removed in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL assignments remaining after this change. ------------------------------------------------------------ revno: 0.3.1957 committer: marko timestamp: Wed 2009-12-09 07:24:50 +0000 message: branches/zip: row_sel_fetch_columns(): Remove redundant code that was accidentally added in r1591, which introduced dfield_t::ext in order to make the merge sort of fast index creation support externally stored columns, Initially, I tried to allocate the bit for dfield_t::ext from dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL to something that would fit in it. Then I decided that it would be too risky. The redundant check was part of the mapping. The condition may have been dfield_is_null() initially. This redundant code was noticed by Sergey Petrunya on the MySQL internals list. ------------------------------------------------------------ revno: 0.3.1956 committer: marko timestamp: Tue 2009-12-08 09:13:36 +0000 message: branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers. ------------------------------------------------------------ revno: 0.3.1955 committer: pekka timestamp: Thu 2009-12-03 16:32:47 +0000 message: branches/zip: Minor changes which allow build with UNIV_HOTBACKUP defined to succeed: include/trx0sys.h: Allow Hot Backup build to see some TRX_SYS_DOUBLEWRITE_... macros. trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build. log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build. This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------ revno: 0.3.1954 committer: marko timestamp: Thu 2009-12-03 12:47:12 +0000 message: branches/zip: dict_table_check_for_dup_indexes(): Assert that the data dictionary mutex is being held while table->indexes is accessed. This is already the case. Currently, only dict_table_get_next_index() and dict_table_get_first_index() are being invoked without holding dict_sys->mutex. ------------------------------------------------------------ revno: 0.3.1953 committer: marko timestamp: Wed 2009-12-02 09:46:05 +0000 message: branches/zip: Revert changes that were accidentally committed in r6271. ------------------------------------------------------------ revno: 0.3.1952 committer: marko timestamp: Wed 2009-12-02 09:43:49 +0000 message: branches/zip: ChangeLog: Document that since r6270, the zlib version number will be displayed at start-up. ------------------------------------------------------------ revno: 0.3.1951 committer: marko timestamp: Wed 2009-12-02 09:36:47 +0000 message: branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version. ------------------------------------------------------------ revno: 0.3.1950 committer: marko timestamp: Wed 2009-12-02 09:35:22 +0000 message: branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will. ------------------------------------------------------------ revno: 0.3.1949 committer: vasil timestamp: Tue 2009-12-01 14:19:44 +0000 message: branches/zip: Add ChangeLog entry for the release of 1.0.6. ------------------------------------------------------------ revno: 0.3.1948 committer: vasil timestamp: Tue 2009-12-01 12:49:05 +0000 message: branches/zip: Increment version number from 1.0.6 to 1.0.7 1.0.6 has been released ------------------------------------------------------------ revno: 0.3.1947 committer: marko timestamp: Mon 2009-11-30 10:50:11 +0000 message: branches/zip: Suppress errors about non-found temporary tables. Write the is_temp flag to SYS_TABLES.MIX_LEN. dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY. Unlike other flags, this will not be written to the tablespace flags or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN. dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces. dict_check_tablespaces_and_store_max_id(), dict_load_table(): Suppress errors about temporary tables not being found. dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag to SYS_TABLES.MIX_LEN. fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions about space->flags. row_drop_table_for_mysql(): Do not complain about non-found temporary tables. rb://160 approved by Heikki Tuuri. This addresses the second part of Bug #41609 Crash recovery does not work for InnoDB temporary tables. ------------------------------------------------------------ revno: 0.3.1946 committer: marko timestamp: Mon 2009-11-30 10:19:50 +0000 message: branches/zip: ChangeLog: Document r4922 that was forgotten. ------------------------------------------------------------ revno: 0.3.1945 committer: vasil timestamp: Fri 2009-11-20 21:39:48 +0000 message: branches/zip: Whitespace fixup. ------------------------------------------------------------ revno: 0.3.1944 committer: vasil timestamp: Fri 2009-11-20 08:49:24 +0000 message: branches/zip: Add ChangeLog entry for c6207. ------------------------------------------------------------ revno: 0.3.1943 committer: vasil timestamp: Fri 2009-11-20 08:19:14 +0000 message: branches/zip: Merge r6198:6206 from branches/5.1: (r6203 was skipped as it is already in branches/zip) ------------------------------------------------------------------------ r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines Changed paths: M /branches/5.1/btr/btr0btr.c branches/5.1: White space fixup - indent under the opening ( ------------------------------------------------------------------------ r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines Changed paths: M /branches/5.1/btr/btr0btr.c branches/5.1: Use btr_free_root() instead of fseg_free() for the fix of bug #48469, because fseg_free() is not defined in the zip branch. And we could save one mini-trasaction started by fseg_free(). Approved by Marko. ------------------------------------------------------------------------ r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Add a special case to handle the Duplicated Key error and return DB_ERROR instead. This is to avoid a possible SIGSEGV by mysql error handling re-entering the storage layer for dup key info without proper table handle. This is to prevent a server crash when error situation in bug #45961 "DDL on partitioned innodb tables leaves data dictionary in an inconsistent state" happens. rb://157 approved by Sunny Bains. ------------------------------------------------------------------------ r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix a minor code formating issue for the parenthesis iplacement of the if condition in rename_table(). ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1942 committer: jyang timestamp: Thu 2009-11-19 13:01:00 +0000 message: branches/zip: Function fseg_free() is no longer defined in branches/zip. To port fix for bug #48469 to zip, we can use btr_free_root() which frees the page, and also does not require mini-transaction. Approved by Marko. ------------------------------------------------------------ revno: 0.3.1941 committer: marko timestamp: Thu 2009-11-19 12:09:11 +0000 message: branches/zip: ha_innobase::add_index(): Clarify the comment on orphaned tables when creating a primary key. ------------------------------------------------------------ revno: 0.3.1940 committer: vasil timestamp: Thu 2009-11-19 10:10:12 +0000 message: branches/zip: Merge r6159:6198 from branches/5.1: ------------------------------------------------------------------------ r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines Changed paths: M /branches/5.1/btr/btr0btr.c branches/5.1: Fix bug #48469 "when innodb tablespace is configured too small, crash and corruption!". Function btr_create() did not check the return status of fseg_create(), and continue the index creation even there is no sufficient space. rb://205 Approved by Marko ------------------------------------------------------------------------ r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines Changed paths: M /branches/5.1/data/data0type.c branches/5.1: Fix bug #48526 "Data type for float and double is incorrectly reported in InnoDB table monitor". Certain datatypes are not printed correctly in dtype_print(). rb://204 Approved by Marko. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1939 committer: vasil timestamp: Thu 2009-11-19 07:44:31 +0000 message: branches/zip: Add ChangeLog entry for r6197. ------------------------------------------------------------ revno: 0.3.1938 committer: calvin timestamp: Thu 2009-11-19 07:32:55 +0000 message: branches/zip: merge the fix of bug#48317 (CMake file) Due to MySQL changes to the CMake, it is no longer able to build InnoDB plugin as a static library on Windows. The fix is proposed by Vlad of MySQL. ------------------------------------------------------------ revno: 0.3.1937 committer: vasil timestamp: Thu 2009-11-19 07:24:45 +0000 message: branches/zip: Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released by MySQL and we will soon release 1.0.6. ------------------------------------------------------------ revno: 0.3.1936 committer: marko timestamp: Wed 2009-11-18 09:36:18 +0000 message: branches/zip: ha_innobase::add_index(): When creating the primary key and the table is being locked by another transaction, do not attempt to drop the table. (Bug #48782) Approved by Sunny Bains over IM ------------------------------------------------------------ revno: 0.3.1935 committer: vasil timestamp: Tue 2009-11-17 14:48:14 +0000 message: branches/zip: Add ChangeLog entry for r6185. ------------------------------------------------------------ revno: 0.3.1934 committer: marko timestamp: Tue 2009-11-17 14:44:20 +0000 message: branches/zip: Report duplicate table names to the client connection, not to the error log. This change will allow innodb-index.test to be re-enabled. It was previously disabled, because mysql-test-run does not like output in the error log. row_create_table_for_mysql(): Do not output anything to the error log when reporting DB_DUPLICATE_KEY. Let the caller report the error. Add a TODO comment that the dict_table_t object is apparently not freed when an error occurs. create_table_def(): Convert InnoDB table names to the character set of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME) for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR) when row_create_table_for_mysql() returns DB_DUPLICATE_KEY. rb://206 ------------------------------------------------------------ revno: 0.3.1933 committer: marko timestamp: Tue 2009-11-17 11:52:01 +0000 message: branches/zip: innodb-index.test: Restore innodb_file_format_check. ------------------------------------------------------------ revno: 0.3.1932 committer: marko timestamp: Tue 2009-11-17 11:51:16 +0000 message: branches/zip: Prepend loose_ to plugin-only mysql-test options. ------------------------------------------------------------ revno: 0.3.1931 committer: marko timestamp: Tue 2009-11-17 11:49:15 +0000 message: branches/zip: Set svn:eol-style on mysql-test files. ------------------------------------------------------------ revno: 0.3.1930 committer: vasil timestamp: Tue 2009-11-17 10:21:41 +0000 message: branches/zip: At the end of innodb-index.test: restore the environment as it was before the test was started to silence this warning: MTR's internal check of the test case 'main.innodb-index' failed. This means that the test case does not preserve the state that existed before the test case was executed. Most likely the test case did not do a proper clean-up. This is the diff of the states of the servers before and after the test case was executed: mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'. mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'. mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ... mysqltest: ... Connected. mysqltest: Start processing test commands from './include/check-testcase.test' ... mysqltest: ... Done processing test commands. --- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300 +++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300 @@ -84,7 +84,7 @@ INNODB_DOUBLEWRITE ON INNODB_FAST_SHUTDOWN 1 INNODB_FILE_FORMAT Antelope -INNODB_FILE_FORMAT_CHECK Antelope +INNODB_FILE_FORMAT_CHECK Barracuda INNODB_FILE_PER_TABLE OFF INNODB_FLUSH_LOG_AT_TRX_COMMIT 1 INNODB_FLUSH_METHOD mysqltest: Result content mismatch not ok ------------------------------------------------------------ revno: 0.3.1929 committer: marko timestamp: Tue 2009-11-17 08:19:34 +0000 message: branches/zip: ha_innobase::change_active_index(): When the history is missing, report it to the client, not to the error log. ------------------------------------------------------------ revno: 0.3.1928 committer: calvin timestamp: Mon 2009-11-16 18:20:38 +0000 message: branches/zip: add an entry to ChangeLog for r6065 ------------------------------------------------------------ revno: 0.3.1927 committer: vasil timestamp: Mon 2009-11-16 18:07:39 +0000 message: branches/zip: Wrap line at 78th char in the ChangeLog ------------------------------------------------------------ revno: 0.3.1926 committer: marko timestamp: Thu 2009-11-12 13:49:08 +0000 message: branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354) rb://183 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.1925 committer: calvin timestamp: Thu 2009-11-12 12:40:43 +0000 message: branches/zip: add test case for bug#46676 This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37. But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5). Add test case to catch future regression. ------------------------------------------------------------ revno: 0.3.1924 committer: calvin timestamp: Wed 2009-11-11 15:53:20 +0000 message: branches/zip: Exclude thd_binlog_filter_ok() when building with older version of MySQL. thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the plugin can be built with MySQL prior to 5.1.41. Approved by Heikki (on IM). ------------------------------------------------------------ revno: 0.3.1923 committer: vasil timestamp: Wed 2009-11-11 14:00:12 +0000 message: branches/zip: Add ChangeLog for r6157. ------------------------------------------------------------ revno: 0.3.1922 committer: vasil timestamp: Wed 2009-11-11 13:36:16 +0000 message: branches/zip: Add changelog entry for r6160. ------------------------------------------------------------ revno: 0.3.1921 committer: vasil timestamp: Wed 2009-11-11 13:33:49 +0000 message: branches/zip: Merge r6152:6159 from branches/5.1: (r6158 was skipped as an equivallent change has already been merged from MySQL) ------------------------------------------------------------------------ r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines Changed paths: M /branches/5.1/include/os0file.h M /branches/5.1/os/os0file.c branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995' after several selects on a large DB During stress environment, Windows AIO may fail with error code ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather crashes. The cause of the error is unknown, but likely due to faulty hardware or driver. This patch introduces a new error code OS_FILE_OPERATION_ABORTED, which maps to Windows ERROR_OPERATION_ABORTED (995). When the error is detected during AIO, the InnoDB will issue a synchronous retry (read/write). This patch has been extensively tested by MySQL support. Approved by: Marko rb://196 ------------------------------------------------------------------------ r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/handler/ha_innodb.h branches/5.1: Merge a change from MySQL: (this has been reviewed by Calvin and Marko, and Calvin says Luis has incorporated Marko's suggestions) ------------------------------------------------------------ revno: 3092.5.1 committer: Luis Soares branch nick: mysql-5.1-bugteam timestamp: Thu 2009-09-24 15:52:52 +0100 message: BUG#42829: binlogging enabled for all schemas regardless of binlog-db-db / binlog-ignore-db InnoDB will return an error if statement based replication is used along with transaction isolation level READ-COMMITTED (or weaker), even if the statement in question is filtered out according to the binlog-do-db rules set. In this case, an error should not be printed. This patch addresses this issue by extending the existing check in external_lock to take into account the filter rules before deciding to print an error. Furthermore, it also changes decide_logging_format to take into consideration whether the statement is filtered out from binlog before decision is made. added: mysql-test/suite/binlog/r/binlog_stm_do_db.result mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt mysql-test/suite/binlog/t/binlog_stm_do_db.test modified: sql/sql_base.cc sql/sql_class.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.h ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1920 committer: vasil timestamp: Wed 2009-11-11 13:13:01 +0000 message: branches/zip: Merge a change from MySQL: (this has been reviewed by Calvin and Marko, and Calvin says Luis has incorporated Marko's suggestions) ------------------------------------------------------------ revno: 3092.5.1 committer: Luis Soares branch nick: mysql-5.1-bugteam timestamp: Thu 2009-09-24 15:52:52 +0100 message: BUG#42829: binlogging enabled for all schemas regardless of binlog-db-db / binlog-ignore-db InnoDB will return an error if statement based replication is used along with transaction isolation level READ-COMMITTED (or weaker), even if the statement in question is filtered out according to the binlog-do-db rules set. In this case, an error should not be printed. This patch addresses this issue by extending the existing check in external_lock to take into account the filter rules before deciding to print an error. Furthermore, it also changes decide_logging_format to take into consideration whether the statement is filtered out from binlog before decision is made. added: mysql-test/suite/binlog/r/binlog_stm_do_db.result mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt mysql-test/suite/binlog/t/binlog_stm_do_db.test modified: sql/sql_base.cc sql/sql_class.cc storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/ha_innodb.h ------------------------------------------------------------ revno: 0.3.1919 committer: jyang timestamp: Wed 2009-11-11 12:27:09 +0000 message: branches/zip: Fix an issue that a local variable defined in innodb_file_format_check_validate() is being referenced across function in innodb_file_format_check_update(). In addition, fix "set global innodb_file_format_check = DEFAULT" call. Bug #47167: "set global innodb_file_format_check" cannot set value by User-Defined Variable." rb://169 approved by Sunny Bains and Marko. ------------------------------------------------------------ revno: 0.3.1918 committer: vasil timestamp: Tue 2009-11-10 13:33:22 +0000 message: branches/zip: Merge r6125:6152 from branches/5.1: (everything except the last white-space change was skipped as it is already in branches/zip) ------------------------------------------------------------------------ r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines Changed paths: M /branches/5.1/Makefile.am M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Backport c6121 from branches/zip: ------------------------------------------------------------------------ r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines Changed paths: M /branches/zip/mysql-test/innodb-autoinc.result branches/zip: This test has been problematic for sometime now. The underlying bug is that the data dictionaries get out of sync. In the AUTOINC code we try and apply salve to the symptoms. In the past MySQL made some unrelated change and the dictionaries stopped getting out of sync and this test started to fail. Now, it seems they have reverted that changed and the test is passing again. I suspect this is not he last time that this test will change. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Revert a change to Makefile.am that sneaked unnoticed in c6127. ------------------------------------------------------------------------ r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/ha_prototypes.h M /branches/5.1/ut/ut0ut.c branches/5.1: Port r6134 from branches/zip: ------------------------------------------------------------------------ r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines branches/zip: innobase_convert_identifier(): Convert table names with explain_filename() to address Bug #32430: 'show innodb status' causes errors Invalid (old?) table or database name in logs. rb://134 approved by Sunny Bains ------------------------------------------------------------------------ innobase_print_identifier(): Replace with innobase_convert_name(). innobase_convert_identifier(): New function, called by innobase_convert_name(). ------------------------------------------------------------------------ r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines Changed paths: M /branches/5.1/CMakeLists.txt branches/5.1: Followup to r5700: Adjust the changes so they are the same as in the BZR repository. ------------------------------------------------------------------------ r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a part of r2911.5.5 from MySQL: (the other part of this was merged in c5700) ------------------------------------------------------------ revno: 2911.5.5 committer: Vladislav Vaintroub branch nick: 5.1-innodb_plugin timestamp: Wed 2009-06-10 10:59:49 +0200 message: Backport WL#3653 to 5.1 to enable bundled innodb plugin. Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld. removed: storage/innodb_plugin/handler/handler0vars.h storage/innodb_plugin/handler/win_delay_loader.cc added: storage/mysql_storage_engine.cmake win/create_def_file.js modified: CMakeLists.txt include/m_ctype.h include/my_global.h include/my_sys.h include/mysql/plugin.h libmysqld/CMakeLists.txt mysql-test/mysql-test-run.pl mysql-test/t/plugin.test mysql-test/t/plugin_load-master.opt mysys/charset.c sql/CMakeLists.txt sql/handler.h sql/mysql_priv.h sql/mysqld.cc sql/sql_class.cc sql/sql_class.h sql/sql_list.h sql/sql_profile.h storage/Makefile.am storage/archive/CMakeLists.txt storage/blackhole/CMakeLists.txt storage/csv/CMakeLists.txt storage/example/CMakeLists.txt storage/federated/CMakeLists.txt storage/heap/CMakeLists.txt storage/innobase/CMakeLists.txt storage/innobase/handler/ha_innodb.cc storage/innodb_plugin/CMakeLists.txt storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/handler0alter.cc storage/innodb_plugin/handler/i_s.cc storage/innodb_plugin/plug.in storage/myisam/CMakeLists.txt storage/myisammrg/CMakeLists.txt win/Makefile.am win/configure.js ------------------------------------------------------------------------ r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: White space fixup. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1917 committer: marko timestamp: Wed 2009-11-04 13:24:28 +0000 message: branches/zip: dict_index_too_big_for_undo(): Correct a typo. ------------------------------------------------------------ revno: 0.3.1916 committer: marko timestamp: Wed 2009-11-04 07:57:29 +0000 message: branches/zip: innobase_convert_identifier(): Convert table names with explain_filename() to address Bug #32430: 'show innodb status' causes errors Invalid (old?) table or database name in logs. rb://134 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1915 committer: marko timestamp: Mon 2009-11-02 09:42:56 +0000 message: branches/zip: Free all resources at shutdown. Set pointers to NULL, so that Valgrind will not complain about freed data structures that are reachable via pointers. This addresses Bug #45992 and Bug #46656. This patch is mostly based on changes copied from branches/embedded-1.0, mainly c5432, c3439, c3134, c2994, c2978, but also some other code was copied. Some added cleanup code is specific to MySQL/InnoDB. rb://199 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1914 committer: vasil timestamp: Fri 2009-10-30 08:36:07 +0000 message: branches/zip: Merge r6112:6125 from branches/5.1: (skipping r6122 and r6123, Jimmy says these are already present and need not be merged): ------------------------------------------------------------------------ r6122 | jyang | 2009-10-30 05:18:38 +0200 (Fri, 30 Oct 2009) | 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug44369.result M /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/mysql-test/innodb_bug46000.result M /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Chnage WARN_LEVEL_ERROR to WARN_LEVEL_WARN for push_warning_printf() call in innodb. Fix Bug#47233: Innodb calls push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR) rb://170 approved by Marko. ------------------------------------------------------------------------ r6123 | jyang | 2009-10-30 05:43:06 +0200 (Fri, 30 Oct 2009) | 8 lines Changed paths: M /branches/5.1/os/os0proc.c branches/5.1: In os_mem_alloc_large(), if we fail to attach the shared memory, reset memory pointer ptr to NULL, and allocate memory from conventional pool. This is a port from branches/zip. Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect rb://198 Approved by: Marko ------------------------------------------------------------------------ r6125 | vasil | 2009-10-30 10:31:23 +0200 (Fri, 30 Oct 2009) | 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: White-space fixup. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1913 committer: jyang timestamp: Fri 2009-10-30 08:02:31 +0000 message: branches/zip: Correct the bug number for -r6109 change from # 48273 to #48237 ------------------------------------------------------------ revno: 0.3.1912 committer: sunny timestamp: Thu 2009-10-29 23:42:11 +0000 message: branches/zip: This test has been problematic for sometime now. The underlying bug is that the data dictionaries get out of sync. In the AUTOINC code we try and apply salve to the symptoms. In the past MySQL made some unrelated change and the dictionaries stopped getting out of sync and this test started to fail. Now, it seems they have reverted that changed and the test is passing again. I suspect this is not he last time that this test will change. ------------------------------------------------------------ revno: 0.3.1911 committer: vasil timestamp: Thu 2009-10-29 16:43:51 +0000 message: branches/zip: * Add ChangeLog entries for latest changes * Obey alphabetical order in the list of the files * White-space fixup ------------------------------------------------------------ revno: 0.3.1910 committer: vasil timestamp: Thu 2009-10-29 16:15:50 +0000 message: branches/zip: Merge r5912:6112 from branches/5.1: (after this merge the innodb-autoinc test starts to fail, but I commit anyway because it would be easier to investigate the failure this way) ------------------------------------------------------------------------ r5952 | calvin | 2009-09-22 19:45:07 +0300 (Tue, 22 Sep 2009) | 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#42383: Can't create table 'test.bug39438' For embedded server, MySQL may pass in full path, which is currently disallowed. It is needed to relax the condition by accepting full paths in the embedded case. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r6032 | vasil | 2009-10-01 15:55:49 +0300 (Thu, 01 Oct 2009) | 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix Bug#38996 Race condition in ANALYZE TABLE by serializing ANALYZE TABLE inside InnoDB. Approved by: Heikki (rb://175) ------------------------------------------------------------------------ r6045 | jyang | 2009-10-08 02:27:08 +0300 (Thu, 08 Oct 2009) | 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug47777.result A /branches/5.1/mysql-test/innodb_bug47777.test branches/5.1: Fix bug #47777. Treat the Geometry data same as Binary BLOB in ha_innobase::store_key_val_for_row(), since the Geometry data is stored as Binary BLOB in Innodb. Review: rb://180 approved by Marko Makela. ------------------------------------------------------------------------ r6051 | sunny | 2009-10-12 07:05:00 +0300 (Mon, 12 Oct 2009) | 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Ignore negative values supplied by the user when calculating the next value to store in dict_table_t. Setting autoincrement columns top negative values is undefined behavior and this change should bring the behavior of InnoDB closer to what users expect. Added several tests to check. rb://162 ------------------------------------------------------------------------ r6052 | sunny | 2009-10-12 07:09:56 +0300 (Mon, 12 Oct 2009) | 4 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Reset the statement level autoinc counter on ROLLBACK. Fix the test results too. rb://164 ------------------------------------------------------------------------ r6053 | sunny | 2009-10-12 07:37:49 +0300 (Mon, 12 Oct 2009) | 6 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Copy the maximum AUTOINC value from the old table to the new table when MySQL does a CREATE INDEX ON T. This is required because MySQL does a table copy, rename and drops the old table. Fix Bug#47125: auto_increment start value is ignored if an index is created and engine=innodb rb://168 ------------------------------------------------------------------------ r6076 | vasil | 2009-10-14 19:30:12 +0300 (Wed, 14 Oct 2009) | 4 lines Changed paths: M /branches/5.1/row/row0mysql.c branches/5.1: Fix typo. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1909 committer: calvin timestamp: Thu 2009-10-29 14:21:15 +0000 message: branches/zip: consideration for icc compilers Proposed by MySQL, and approved by Marko. ------------------------------------------------------------ revno: 0.3.1908 committer: marko timestamp: Thu 2009-10-29 11:04:11 +0000 message: branches/zip: Fix corruption of buf_pool->LRU_old and improve debug assertions. This was reported as Issue #381. buf_page_set_old(): Assert that blocks may only be set old if buf_pool->LRU_old is initialized and buf_pool->LRU_old_len is nonzero. Assert that buf_pool->LRU_old points to the block at the old/new boundary. buf_LRU_old_adjust_len(): Invoke buf_page_set_old() after adjusting buf_pool->LRU_old and buf_pool->LRU_old_len, in order not to violate the added assertions. buf_LRU_old_init(): Replace buf_page_set_old() with a direct assignment to bpage->old, because these loops that initialize all the blocks would temporarily violate the assertions about buf_pool->LRU_old. buf_LRU_remove_block(): When setting buf_pool->LRU_old = NULL, also clear all bpage->old flags and set buf_pool->LRU_old_len = 0. buf_LRU_add_block_to_end_low(), buf_LRU_add_block_low(): Move the buf_page_set_old() call later in order not to violate the debug assertions. If buf_pool->LRU_old is NULL, set old=FALSE. buf_LRU_free_block(): Replace the UNIV_LRU_DEBUG assertion with a dummy buf_page_set_old() call that performs more thorough checks. buf_LRU_validate(): Do not tolerate garbage in buf_pool->LRU_old_len even if buf_pool->LRU_old is NULL. Check that bpage->old is monotonic. buf_relocate(): Make the UNIV_LRU_DEBUG checks stricter. buf0buf.h: Revise the documentation of buf_page_t::old and buf_pool_t::LRU_old_len. ------------------------------------------------------------ revno: 0.3.1907 committer: marko timestamp: Thu 2009-10-29 10:44:57 +0000 message: branches/zip: Makefile.am (INCLUDES): Merge a change from MySQL: Use $(srcdir)/include instead of $(top_srcdir)/storage/innobase/include. ------------------------------------------------------------ revno: 0.3.1906 committer: jyang timestamp: Thu 2009-10-29 08:37:32 +0000 message: branches/zip: In os_mem_alloc_large(), if we fail to attach the shared memory, reset memory pointer ptr to NULL, and allocate memory from conventional pool. Bug #48237 Error handling in os_mem_alloc_large appears to be incorrect rb://198 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1905 committer: calvin timestamp: Thu 2009-10-29 05:58:04 +0000 message: branches/zip: close file handle when building with UNIV_HOTBACKUP The change does not affect regular InnoDB engine. Confirmed by Marko. ------------------------------------------------------------ revno: 0.3.1904 committer: marko timestamp: Wed 2009-10-28 14:10:34 +0000 message: branches/zip: buf_page_set_old(): Improve UNIV_LRU_DEBUG diagnostics in order to catch the buf_pool->LRU_old corruption reported in Issue #381. buf_LRU_old_init(): Set the property from the tail towards the front of the buf_pool->LRU list, in order not to trip the debug check. ------------------------------------------------------------ revno: 0.3.1903 committer: calvin timestamp: Tue 2009-10-27 22:05:52 +0000 message: branches/zip: backport r3848 from 6.0 branch ---- branches/6.0: innobase_start_or_create_for_mysql(): Make the 10 MB minimum tablespace limit independent of UNIV_PAGE_SIZE. (Bug #41490) ------------------------------------------------------------ revno: 0.3.1902 committer: marko timestamp: Mon 2009-10-26 13:46:18 +0000 message: branches/zip: row_ins_alloc_sys_fields(): Zero out the system columns DB_TRX_ID, DB_ROLL_PTR and DB_ROW_ID, in order to avoid harmless Valgrind warnings about uninitialized data. (The warnings were harmless, because the fields would be initialized at a later stage.) ------------------------------------------------------------ revno: 0.3.1901 committer: marko timestamp: Mon 2009-10-26 07:32:23 +0000 message: branches/zip: row_prebuilt_struct::prebuilts: Unused field, remove. ------------------------------------------------------------ revno: 0.3.1900 committer: jyang timestamp: Fri 2009-10-23 07:45:50 +0000 message: branches/zip: Update test result with the WARN_LEVEL_ERROR to WARN_LEVEL_WARN change. This is the same result as submitted in rb://172 review, which approved by Sunny Bains and Marko. ------------------------------------------------------------ revno: 0.3.1899 committer: jyang timestamp: Thu 2009-10-22 02:51:07 +0000 message: branches/zip: As a request from mysql, WARN_LEVEL_ERROR cannot be used for push_warning_* call any more. Switch to WARN_LEVEL_WARN. Bug #47233. rb://172 approved by Sunny Bains and Marko. ------------------------------------------------------------ revno: 0.3.1898 committer: jyang timestamp: Thu 2009-10-22 01:58:39 +0000 message: branches/zip: Port bug #46000 related changes from 5.1 to zip branch. Due to different code path for creating index in zip branch comparing to 5.1), the index reserved name check function is extended to be used in ha_innobase::add_index(). rb://190 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1897 committer: vasil timestamp: Mon 2009-10-19 12:06:09 +0000 message: branches/zip: Add ChangeLog entry for r6095. ------------------------------------------------------------ revno: 0.3.1896 committer: vasil timestamp: Mon 2009-10-19 12:04:59 +0000 message: branches/zip: Fix Bug#47808 innodb_information_schema.test fails when run under valgrind by using the wait_until_rows_count macro that loops until the number of rows becomes 14 instead of sleep 0.1, which is obviously very fragile. ------------------------------------------------------------ revno: 0.3.1895 committer: vasil timestamp: Thu 2009-10-15 04:21:17 +0000 message: branches/zip: Add ChangeLog entry for r6080. ------------------------------------------------------------ revno: 0.3.1894 committer: sunny timestamp: Wed 2009-10-14 21:29:01 +0000 message: branches/zip: Change page_mem_alloc_free() to inline. Fix Bug #47058 - Failure to compile innodb_plugin on solaris 10u7 + spro cc/CC 5.10 ------------------------------------------------------------ revno: 0.3.1893 committer: inaam timestamp: Tue 2009-10-13 16:43:13 +0000 message: branches/zip rb://182 Call fsync() on datafiles after a batch of pages is written to disk even when skip_innodb_doublewrite is set. Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1892 committer: calvin timestamp: Tue 2009-10-13 14:23:35 +0000 message: branches/zip: non-functional changes Changes from MySQL to fix build issue. ------------------------------------------------------------ revno: 0.3.1891 committer: vasil timestamp: Fri 2009-10-09 15:05:26 +0000 message: branches/zip: Fix compilation warning in Hot Backup: innodb/fil/fil0fil.c: In function 'fil_load_single_table_tablespace': innodb/fil/fil0fil.c:3253: warning: format '%lld' expects type 'long long int', but argument 6 has type 'ib_int64_t' ------------------------------------------------------------ revno: 0.3.1890 committer: vasil timestamp: Fri 2009-10-09 04:42:55 +0000 message: branches/zip: When scanning a directory readdir() is called and stat() after it, if a file is deleted between the two calls stat will fail and the whole precedure will fail. Change this behavior to continue with the next entry if stat() fails because of nonexistent file. This is transparent change as it will make it look as if the file was deleted before the readdir() call. This change is needed in order to fix https://svn.innodb.com/mantis/view.php?id=174 in which we need to abort if os_file_readdir_next_file() encounters "real" errors. Approved by: Marko, Pekka (rb://177) ------------------------------------------------------------ revno: 0.3.1889 committer: pekka timestamp: Thu 2009-10-08 08:24:56 +0000 message: branches/zip: Revert r6044 which added os_file_is_same() function (issue#186). This functionality is moved to Hot Backup source tree. ------------------------------------------------------------ revno: 0.3.1888 committer: pekka timestamp: Tue 2009-10-06 13:44:54 +0000 message: branches/zip: Add os_file_is_same() function for Hot Backup (inside ifdef UNIV_HOTBACKUP). This is part of the fix for Issue #186. Note! The Windows implementation is incomplete. ------------------------------------------------------------ revno: 0.3.1887 committer: inaam timestamp: Mon 2009-10-05 13:45:35 +0000 message: branches/zip rb://176 Do not invalidate buffer pool while an LRU batch is active. Added code to buf_pool_invalidate() to wait for the running batches to finish. This patch also resets the state of buf_pool struct at invalidation. This addresses the concern where buf_pool->freed_page_clock becomes non-zero because we read in a system tablespace page for file format info at startup. Approved by: Marko ------------------------------------------------------------ revno: 0.3.1886 committer: calvin timestamp: Thu 2009-10-01 19:19:46 +0000 message: branches/zip: fix a typo in error message Reported as bug#47763. ------------------------------------------------------------ revno: 0.3.1885 committer: marko timestamp: Thu 2009-10-01 10:24:33 +0000 message: branches/zip: Clean up after a crash during DROP INDEX. When InnoDB crashes while dropping an index, ensure that the index will be completely dropped during crash recovery. row_merge_drop_index(): Before dropping an index, rename the index to start with TEMP_INDEX_PREFIX_STR and commit the change, so that row_merge_drop_temp_indexes() will drop the index after crash recovery if the server crashes while dropping the index. fseg_inode_try_get(): New function, forked from fseg_inode_get(). Return NULL if the file segment index node is free. fseg_inode_get(): Assert that the file segment index node is not free. fseg_free_step(): If the file segment index node is already free, print a diagnostic message and return TRUE. fsp_free_seg_inode(): Write a nonzero number to FSEG_MAGIC_N, so that allocated-and-freed file segment index nodes can be better distinguished from uninitialized ones. This is rb://174, addressing Issue #348. Tested by restarting mysqld upon the completion of the added log_write_up_to() invocation below, during DROP INDEX. The index was dropped after crash recovery, and re-issuing the DROP INDEX did not crash the server. Index: btr/btr0btr.c =================================================================== --- btr/btr0btr.c (revision 6026) +++ btr/btr0btr.c (working copy) @@ -42,6 +42,7 @@ Created 6/2/1994 Heikki Tuuri #include "ibuf0ibuf.h" #include "trx0trx.h" +#include "log0log.h" /* Latching strategy of the InnoDB B-tree -------------------------------------- @@ -873,6 +874,8 @@ leaf_loop: goto leaf_loop; } + + log_write_up_to(mtr.end_lsn, LOG_WAIT_ALL_GROUPS, TRUE); top_loop: mtr_start(&mtr); ------------------------------------------------------------ revno: 0.3.1884 committer: calvin timestamp: Wed 2009-09-30 19:32:02 +0000 message: branches/zip: non-functional changes Fix typo. ------------------------------------------------------------ revno: 0.3.1883 committer: marko timestamp: Wed 2009-09-30 12:55:23 +0000 message: branches/zip: recv_no_log_write: New debug flag for tracking down Mantis Issue #347. No modifications should be made to the database while recv_apply_hashed_log_recs() is about to complete. ------------------------------------------------------------ revno: 0.3.1882 committer: marko timestamp: Wed 2009-09-30 06:18:24 +0000 message: branches/zip: Add some debug assertions for checking FSEG_MAGIC_N. ------------------------------------------------------------ revno: 0.3.1881 committer: vasil timestamp: Tue 2009-09-29 12:19:59 +0000 message: branches/zip: Fix the year, should be 2009. Pointed by: Calvin ------------------------------------------------------------ revno: 0.3.1880 committer: vasil timestamp: Tue 2009-09-29 09:15:25 +0000 message: branches/zip: Add ChangeLog entry for the release of 1.0.4. ------------------------------------------------------------ revno: 0.3.1879 committer: vasil timestamp: Tue 2009-09-29 07:09:52 +0000 message: branches/zip: ChangeLog: wrap around 78th column, not earlier. ------------------------------------------------------------ revno: 0.3.1878 committer: marko timestamp: Mon 2009-09-28 12:03:58 +0000 message: branches/zip: Remove an assertion failure when the InnoDB data dictionary is inconsistent with the MySQL .frm file. ha_innobase::index_read(): When the index cannot be found, return an error. ha_innobase::change_active_index(): When prebuilt->index == NULL, set also prebuilt->index_usable = FALSE. This is not needed for correctness, because prebuilt->index_usable is only checked by row_search_for_mysql(), which requires prebuilt->index != NULL. This addresses Issue #349. Approved by Heikki Tuuri over IM. ------------------------------------------------------------ revno: 0.3.1877 committer: marko timestamp: Mon 2009-09-28 11:46:02 +0000 message: branches/zip: Address Issue #350 in comments. lock_rec_queue_validate(), lock_rec_queue_validate(): Note that this debug code may violate the latching order and cause deadlocks. ------------------------------------------------------------ revno: 0.3.1876 committer: marko timestamp: Mon 2009-09-28 07:52:25 +0000 message: branches/zip: Do not write to PAGE_INDEX_ID after page creation, not even when restoring an uncompressed page after a compression failure. btr_page_reorganize_low(): On compression failure, do not restore those page header fields that should not be affected by the reorganization. Instead, compare the fields. page_zip_decompress(): Add the parameter ibool all, for copying all page header fields. Pass the parameter all=TRUE on block read completion, redo log application, and page_zip_validate(); pass all=FALSE in all other cases. page_zip_reorganize(): Do not restore the uncompressed page on failure. It will be restored (to pre-modification state) by the caller anyway. rb://167, Issue #346 ------------------------------------------------------------ revno: 0.3.1875 committer: marko timestamp: Mon 2009-09-28 07:33:59 +0000 message: branches/zip: Try to prevent the reuse of tablespace identifiers after InnoDB has crashed during table creation. Also, refuse to start if files with duplicate tablespace identifiers are encountered. fil_node_create(): Update fil_system->max_assigned_id. This should prevent the reuse of a space->id when InnoDB does a full crash recovery and invokes fil_load_single_table_tablespaces(). Normally, fil_system->max_assigned_id is initialized from SELECT MAX(ID) FROM SYS_TABLES. fil_open_single_table_tablespace(): Return FALSE when fil_space_create() fails. fil_load_single_table_tablespace(): Exit if fil_space_create() fails and innodb_force_recovery=0. rb://173 approved by Heikki Tuuri. This addresses Issue #335. ------------------------------------------------------------ revno: 0.3.1874 committer: vasil timestamp: Mon 2009-09-28 06:10:29 +0000 message: branches/zip: Add ChangeLog entry for c5988. ------------------------------------------------------------ revno: 0.3.1873 committer: calvin timestamp: Fri 2009-09-25 18:14:43 +0000 message: branches/zip: fix bug#47055 unconditional exit(1) on ERROR_WORKING_SET_QUOTA 1453 (0x5AD) for InnoDB backend When error ERROR_WORKING_SET_QUOTA or ERROR_NO_SYSTEM_RESOURCES occurs, yields for 100ms and retries the operation. Approved by: Heikki (on IM) ------------------------------------------------------------ revno: 0.3.1872 committer: marko timestamp: Thu 2009-09-24 09:16:10 +0000 message: branches/zip: ha_innodb.cc: Define MYSQL_PLUGIN_IMPORT when necessary. This preprocessor symbol has been recently introduced in MySQL 5.1. The InnoDB Plugin should remain source compatible with MySQL 5.1.24 and later. ------------------------------------------------------------ revno: 0.3.1871 committer: marko timestamp: Thu 2009-09-24 06:47:56 +0000 message: branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined. ------------------------------------------------------------ revno: 0.3.1870 committer: marko timestamp: Wed 2009-09-23 18:53:21 +0000 message: branches/zip: recv_add_to_hash_table(): Simplify obfuscated pointer arithmetics. ------------------------------------------------------------ revno: 0.3.1869 committer: marko timestamp: Wed 2009-09-23 18:44:52 +0000 message: branches/zip: fil_node_open_file(): In InnoDB Hot Backup, determine the page size of single-file tablespaces before computing the file node size. Otherwise, the space->size of compressed tablespaces would be computed with UNIV_PAGE_SIZE instead of key_block_size. This should fix Issue #313. ------------------------------------------------------------ revno: 0.3.1868 committer: marko timestamp: Wed 2009-09-23 12:03:51 +0000 message: branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup when the pwrite system call is not available. ------------------------------------------------------------ revno: 0.3.1867 committer: calvin timestamp: Tue 2009-09-22 22:30:10 +0000 message: branches/zip: remove handler0vars.h from Makefile.am Left over from r5950. ------------------------------------------------------------ revno: 0.3.1866 committer: calvin timestamp: Tue 2009-09-22 14:17:01 +0000 message: branches/zip: adjust CMake file to work with old versions of MySQL Tested with MySQL 5.1.38 and 5.1.30. ------------------------------------------------------------ revno: 0.3.1865 committer: calvin timestamp: Tue 2009-09-22 05:42:46 +0000 message: branches/zip: adjust Windows loading method for 5.1.38 Starting at 5.1.38, MySQL server exports symbols needed for dynamic plugin on Windows. There is no need for Windows specific loading. Also, the CMake files are simplified in 5.1.38. When WITH_INNOBASE_STORAGE_ENGINE is specified during configuration (win\configure.js), InnoDB is built as a static library. Otherwise, a dynamic InnoDB will be built (ha_innodb.dll). CMakeLists.txt requires minor changes in order to work with MySQL prior to 5.1.38. The changes will be in a separate patch. This patch addresses Mantis issue#286. ------------------------------------------------------------ revno: 0.3.1864 committer: calvin timestamp: Mon 2009-09-21 13:53:22 +0000 message: branches/zip: fix a type in r5935 Should be innodb_open_files, spotted by Michael. ------------------------------------------------------------ revno: 0.3.1863 committer: vasil timestamp: Mon 2009-09-21 04:26:04 +0000 message: branches/zip: Add ChangeLog entries for c5938. ------------------------------------------------------------ revno: 0.3.1862 committer: calvin timestamp: Sat 2009-09-19 06:14:25 +0000 message: branches/zip: Merge revisions 2584:2956 from branches/6.0, except c2932. Bug#37232 and bug#31183 were fixed in the 6.0 branch only. They should be fixed in the plugin too, specially MySQL 6.0 is discontinued at this point. ------------------------------------------------------------------------ r2604 | inaam | 2008-08-21 09:37:06 -0500 (Thu, 21 Aug 2008) | 8 lines branches/6.0 bug#37232 Relax locking behaviour for REPLACE INTO t SELECT ... FROM t1. Now SELECT on t1 is performed as a consistent read when the isolation level is set to READ COMMITTED. Reviewed by: Heikki ------------------------------------------------------------------------ r2605 | inaam | 2008-08-21 09:59:33 -0500 (Thu, 21 Aug 2008) | 7 lines branches/6.0 Added a comment to clarify why distinct calls to read MySQL binary log file name and log position do not entail any race condition. Suggested by: Heikki ------------------------------------------------------------------------ r2956 | inaam | 2008-11-04 04:47:30 -0600 (Tue, 04 Nov 2008) | 11 lines branches/6.0 bug#31183 If the system tablespace runs out of space because 'autoextend' is not specified with innodb_data_file_path there was no error message printed to the error log. The client would get 'table full' error. This patch prints an appropriate error message to the error log. rb://43 Approved by: Marko ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1861 committer: calvin timestamp: Fri 2009-09-18 20:08:02 +0000 message: branches/zip: fix bug#44338; minor non-functional changes Bug#44338 innodb has message about non-existing option innodb_max_files_open. Change the option to innodb_open_files. The fix was committed into 6.0 branch. ------------------------------------------------------------ revno: 0.3.1860 committer: vasil timestamp: Fri 2009-09-18 16:06:46 +0000 message: branches/zip: Fix typo. ------------------------------------------------------------ revno: 0.3.1859 committer: vasil timestamp: Fri 2009-09-18 03:59:30 +0000 message: branches/zip: White space and formatting cleanup in the ChangeLog ------------------------------------------------------------ revno: 0.3.1858 committer: marko timestamp: Thu 2009-09-17 05:32:08 +0000 message: branches/zip: innodb-zip.test: Make the test work with zlib 1.2.3.3. Apparently, the definition of compressBound() has slightly changed. This has been filed as Mantis Issue #345. ------------------------------------------------------------ revno: 0.3.1857 committer: vasil timestamp: Wed 2009-09-16 17:47:22 +0000 message: branches/zip: Add ChangeLog entries for r5916. ------------------------------------------------------------ revno: 0.3.1856 committer: vasil timestamp: Wed 2009-09-16 17:37:13 +0000 message: branches/zip: Whitespace cleanup in the ChangeLog. ------------------------------------------------------------ revno: 0.3.1855 committer: marko timestamp: Wed 2009-09-16 08:56:23 +0000 message: branches/zip: innobase_get_cset_width(): Cache the value of current_thd. ------------------------------------------------------------ revno: 0.3.1854 committer: marko timestamp: Wed 2009-09-16 08:54:43 +0000 message: branches/zip: Merge revisions 5622:5912 from branches/5.1, except r5700 (changes to CMakeLists.txt) ------------------------------------------------------------------------ r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2988 committer: Satya B branch nick: mysql-5.1-bugteam timestamp: Wed 2009-07-01 11:06:05 +0530 message: Fix build failure after applying Innodb snapshot 5.1-ss5282 After applying Innodb snapshot 5.1-ss5282, build was broken because of missing header file. Adding the header file to Makefile.am after informing the innodb developers. modified: storage/innobase/Makefile.am ------------------------------------------------------------------------ r5740 | jyang | 2009-09-03 06:33:47 +0300 (Thu, 03 Sep 2009) | 5 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/db0err.h A /branches/5.1/mysql-test/innodb_bug46000.result A /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Disallow creating index with the name of "GEN_CLUST_INDEX" which is reserved for the default system primary index. (Bug #46000) rb://149 approved by Sunny Bains. ------------------------------------------------------------------------ r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug44369.result A /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: Block creating table with column name conflicting with Innodb reserved key words. (Bug #44369) rb://151 approved by Sunny Bains. ------------------------------------------------------------------------ r5757 | jyang | 2009-09-04 04:26:13 +0300 (Fri, 04 Sep 2009) | 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/db0err.h D /branches/5.1/mysql-test/innodb_bug46000.result D /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Revert change in 5740. Making the fix in a subsequent check in. ------------------------------------------------------------------------ r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc D /branches/5.1/mysql-test/innodb_bug44369.result D /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: This is to revert change 5741. A return status for create_table_def() needs to be fixed. ------------------------------------------------------------------------ r5797 | calvin | 2009-09-09 18:26:29 +0300 (Wed, 09 Sep 2009) | 3 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: merge change from 5.1.38 HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38. ------------------------------------------------------------------------ r5799 | calvin | 2009-09-09 20:47:31 +0300 (Wed, 09 Sep 2009) | 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: fix bug#46256 Allow tables to be dropped even if the collation is not found, but issue a warning. Could not find an easy way to add mysql-test since it requires changes to charsets and restarting the server. Tests were executed manually. Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5805 | vasil | 2009-09-10 08:41:48 +0300 (Thu, 10 Sep 2009) | 7 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Fix a compilation warning caused by c5799: handler/ha_innodb.cc: In function 'void innobase_get_cset_width(ulint, ulint*, ulint*)': handler/ha_innodb.cc:830: warning: format '%d' expects type 'int', but argument 2 has type 'ulint' ------------------------------------------------------------------------ r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines Changed paths: M /branches/5.1/dict/dict0dict.c M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug44369.result A /branches/5.1/mysql-test/innodb_bug44369.test M /branches/5.1/row/row0mysql.c branches/5.1: Block creating table with column name conflicting with Innodb reserved key words. (Bug #44369) rb://151 approved by Sunny Bains. ------------------------------------------------------------------------ r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug46000.result A /branches/5.1/mysql-test/innodb_bug46000.test branches/5.1: Disallow creating index with the name of "GEN_CLUST_INDEX" which is reserved for the default system primary index. (Bug #46000) rb://149 approved by Marko Makela. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1853 committer: marko timestamp: Wed 2009-09-16 07:07:21 +0000 message: branches/zip: Introduce UNIV_LOG_LSN_DEBUG and MLOG_LSN for redo log diagnostics. This was written in order to better track down Issue #313 in InnoDB Hot Backup. MLOG_LSN: A new redo log entry type, for recording the current log sequence number (LSN). This will be checked in an assertion in recv_parse_log_rec(). rb://161, discussed with Sunny and Vasil. ------------------------------------------------------------ revno: 0.3.1852 committer: marko timestamp: Tue 2009-09-15 10:26:01 +0000 message: branches/zip: ut0ut.h: Do not #include "os0sync.h" #ifdef UNIV_HOTBACKUP. Since r5872, the InnoDB Hot Backup build was broken. Fix it by not defining any thread synchronization primitives in ut0ut.h. InnoDB Hot Backup is a single-threaded program. ------------------------------------------------------------ revno: 0.3.1851 committer: marko timestamp: Tue 2009-09-15 09:18:50 +0000 message: branches/zip: Add */.dirstamp to svn:ignore, for https://svn.innodb.com/svn/hotbackup/branches/3.5 ------------------------------------------------------------ revno: 0.3.1850 committer: marko timestamp: Tue 2009-09-15 07:29:00 +0000 message: branches/zip: Avoid bogus messages about latching order violations when UNIV_SYNC_DEBUG is defined. sync_thread_levels_g(): Add the parameter "warn". Do not print anything unless it is set. sync_thread_add_level(): Pass warn=TRUE to sync_thread_levels_g() when the check is within an assertion; FALSE if it is not. ------------------------------------------------------------ revno: 0.3.1849 committer: inaam timestamp: Mon 2009-09-14 14:20:48 +0000 message: branches/zip rb://159 In case of pages that are not made young the counter is incremented only when the page in question is 'old'. In case of pages that are made young the counter is incremented in case of all pages. For apple to apple comparison this patch changes the 'young-making' counter to consider only 'old' blocks. Approved by: Marko ------------------------------------------------------------ revno: 0.3.1848 committer: vasil timestamp: Mon 2009-09-14 08:17:18 +0000 message: branches/zip: Add missing return statement in the test program that could have caused a warning. ------------------------------------------------------------ revno: 0.3.1847 committer: vasil timestamp: Mon 2009-09-14 07:38:45 +0000 message: branches/zip: Back-merge c5880 and c5881 from branches/embedded-1.0: ------------------------------------------------------------------------ r5880 | vasil | 2009-09-12 17:28:44 +0300 (Sat, 12 Sep 2009) | 18 lines Changed paths: M /branches/embedded-1.0/configure.in M /branches/embedded-1.0/include/os0sync.h M /branches/embedded-1.0/srv/srv0start.c branches/embedded-1.0: Clean up and simplify the code that surrounds the atomic ops: * Simplify the code that prints what atomics are used: Instead of repeating the same conditions on which each atomics are used use just one printf that prints a variable defined by the code which chooses what atomics to use. * In os0sync.h pick up each atomic variant only if it has been selected by autoconf (based on IB_ATOMIC_MODE_* macros). Define the startup message to be printed. * In configure.in: check what user has chosen and if he has chosen something that is not available, emit an error. If nothing has been chosen explicitly by the user, auto select an option according to the described logic in configure.in. ------------------------------------------------------------------------ r5881 | vasil | 2009-09-12 20:08:27 +0300 (Sat, 12 Sep 2009) | 4 lines Changed paths: M /branches/embedded-1.0/configure.in branches/embedded-1.0: Fix syntax error in test program. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1846 committer: vasil timestamp: Sat 2009-09-12 11:11:25 +0000 message: branches/zip: Remove unnecessary macro. ------------------------------------------------------------ revno: 0.3.1845 committer: vasil timestamp: Sat 2009-09-12 08:35:17 +0000 message: branches/zip: Explicitly include os0sync.h to the places where HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS are used to avoid potential problems. ------------------------------------------------------------ revno: 0.3.1844 committer: vasil timestamp: Sat 2009-09-12 08:25:44 +0000 message: branches/zip: Rename HAVE_SOLARIS_ATOMICS to HAVE_IB_SOLARIS_ATOMICS and IB_HAVE_PAUSE_INSTRUCTION to HAVE_IB_PAUSE_INSTRUCTION so they all follow the same HAVE_IB_* convention. ------------------------------------------------------------ revno: 0.3.1843 committer: vasil timestamp: Sat 2009-09-12 08:13:44 +0000 message: branches/zip: Define HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS in os0sync.h instead of in univ.i. The code expects os_*() macros to be present if HAVE_ATOMIC_BUILTINS and INNODB_RW_LOCKS_USE_ATOMICS are defined. So define them next to defining the os_*() macros. ------------------------------------------------------------ revno: 0.3.1842 committer: vasil timestamp: Sat 2009-09-12 07:33:11 +0000 message: branches/zip: Include ut0auxconf.h only if none of the macros it would define is defined. The check when to include this header was outdated from the time when there was only one macro involved. Move the atomics checks that are in univ.i outside of #if windows ... #else ... #endif This simplifies the code and removes some duplicates like defining HAVE_ATOMIC_BUILTINS if HAVE_WINDOWS_ATOMICS is defined in both branches. Do not define the same macro HAVE_ATOMIC_PTHREAD_T for different events. Instead define HAVE_IB_ATOMIC_PTHREAD_T_GCC and HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS. ------------------------------------------------------------ revno: 0.3.1841 committer: vasil timestamp: Sat 2009-09-12 07:01:17 +0000 message: branches/zip: Move the check whether to include ut0auxconf.h before everything because we are now even checking for GCC atomics, we relied on MySQL to define this macro before. ------------------------------------------------------------ revno: 0.3.1840 committer: vasil timestamp: Sat 2009-09-12 06:43:45 +0000 message: branches/zip: Update comment to reflect reality. ------------------------------------------------------------ revno: 0.3.1839 committer: vasil timestamp: Sat 2009-09-12 06:30:08 +0000 message: branches/zip: Add the check for GCC atomics to ut0auxconf* (copied from plug.in) because we no longer rely on MySQL's HAVE_GCC_ATOMIC_BUILTINS. ------------------------------------------------------------ revno: 0.3.1838 committer: vasil timestamp: Sat 2009-09-12 06:26:03 +0000 message: branches/zip: Simplify the compile time checks by splittig them into 5 independent checks: * Whether GCC atomics are available * Whether pthread_t can be used by GCC atomics * Whether Solaris libc atomics are available * Whether pthread_t can be used by Solaris libs atomics * Checking the size of pthread_t ------------------------------------------------------------ revno: 0.3.1837 committer: vasil timestamp: Sat 2009-09-12 06:22:55 +0000 message: branches/zip: Include string.h which is needed for memset(). ------------------------------------------------------------ revno: 0.3.1836 committer: vasil timestamp: Sat 2009-09-12 06:07:08 +0000 message: branches/zip: Check that pthread_t can indeed be passed to Solaris atomic functions, instead of assuming that it can be passed if 0 can be assigned to it. It could be that: * 0 can be assigned, but pthread_t cannot be passed and * 0 cannot be assigned but pthread_t can be passed Better to check what we are interested in, not something else and make assumptions. ------------------------------------------------------------ revno: 0.3.1835 committer: vasil timestamp: Fri 2009-09-11 16:46:47 +0000 message: branches/zip: Fix the indentation of the closing bracket. ------------------------------------------------------------ revno: 0.3.1834 committer: marko timestamp: Thu 2009-09-10 10:29:46 +0000 message: branches/zip: Roll back recovered dictionary transactions before dropping incomplete indexes (Issue #337). trx_rollback_or_clean_recovered(ibool all): New function, split from trx_rollback_or_clean_all_recovered(). all==FALSE will only roll back dictionary transactions. recv_recovery_from_checkpoint_finish(): Call trx_rollback_or_clean_recovered(FALSE) before row_merge_drop_temp_indexes(). rb://158 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1833 committer: marko timestamp: Thu 2009-09-10 09:47:09 +0000 message: branches/zip: Reduce mutex contention that was introduced when addressing Bug #45015 (Issue #316), in r5703. buf_page_set_accessed_make_young(): New auxiliary function, called by buf_page_get_zip(), buf_page_get_gen(), buf_page_optimistic_get_func(). Call ut_time_ms() outside of buf_pool_mutex. Use cached access_time. buf_page_set_accessed(): Add the parameter time_ms, so that ut_time_ms() need not be called while holding buf_pool_mutex. buf_page_optimistic_get_func(), buf_page_get_known_nowait(): Read buf_page_t::access_time without holding buf_pool_mutex. This should be OK, because the field is only used for heuristic purposes. buf_page_peek_if_too_old(): If buf_pool->freed_page_clock == 0, return FALSE, so that we will not waste time moving blocks in the LRU list in the warm-up phase or when the workload fits in the buffer pool. rb://156 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1832 committer: marko timestamp: Thu 2009-09-10 09:10:20 +0000 message: branches/zip: buf_page_release(): De-stutter the function comment. ------------------------------------------------------------ revno: 0.3.1831 committer: marko timestamp: Thu 2009-09-10 04:29:31 +0000 message: branches/zip: trx_cleanup_at_db_startup(): Fix a typo in comment. ------------------------------------------------------------ revno: 0.3.1830 committer: calvin timestamp: Wed 2009-09-09 14:28:10 +0000 message: branches/zip: HA_ERR_TOO_MANY_CONCURRENT_TRXS is added in 5.1.38. But the plugin should still work with previous versions of MySQL. ------------------------------------------------------------ revno: 0.3.1829 committer: vasil timestamp: Wed 2009-09-09 12:35:58 +0000 message: branches/zip: Fix a bug in manipulating the variable innodb_old_blocks_pct: for any value assigned it got that value -1, except for 75. When assigned 75, it got 75. mysql> set global innodb_old_blocks_pct=15; Query OK, 0 rows affected (0.00 sec) mysql> show variables like 'innodb_old_blocks_pct'; +-----------------------+-------+ | Variable_name | Value | +-----------------------+-------+ | innodb_old_blocks_pct | 14 | +-----------------------+-------+ 1 row in set (0.00 sec) mysql> set global innodb_old_blocks_pct=75; Query OK, 0 rows affected (0.00 sec) mysql> show variables like 'innodb_old_blocks_pct'; +-----------------------+-------+ | Variable_name | Value | +-----------------------+-------+ | innodb_old_blocks_pct | 75 | +-----------------------+-------+ After the fix it gets exactly what was assigned. Approved by: Marko (via IM) ------------------------------------------------------------ revno: 0.3.1828 committer: marko timestamp: Wed 2009-09-09 06:25:00 +0000 message: branches/zip: buf_page_is_accessed(): Correct the function comment. ------------------------------------------------------------ revno: 0.3.1827 committer: marko timestamp: Wed 2009-09-09 06:00:59 +0000 message: branches/zip: buf_page_peek_if_too_old(): Silence a compiler warning that was introduced in r5779 on 32-bit systems. ------------------------------------------------------------ revno: 0.3.1826 committer: marko timestamp: Wed 2009-09-09 05:50:50 +0000 message: branches/zip: ut_time_ms(): Return ulint, not uint. ------------------------------------------------------------ revno: 0.3.1825 committer: marko timestamp: Wed 2009-09-09 05:17:19 +0000 message: branches/zip: buf_page_peek_if_too_old(): Make the bitmasking work when buf_pool->freed_page_clock is wider than 32 bits. ------------------------------------------------------------ revno: 0.3.1824 committer: marko timestamp: Tue 2009-09-08 14:50:25 +0000 message: branches/zip: Remove BUF_LRU_INITIAL_RATIO, which should have been removed together with buf_LRU_get_recent_limit(). ------------------------------------------------------------ revno: 0.3.1823 committer: calvin timestamp: Mon 2009-09-07 20:15:05 +0000 message: branches/zip: Build InnoDB on Windows with UNIV_HOTBACKUP The changes are non-functional changes for normal InnoDB, but needed for building the Hot Backup on Windows (with UNIV_HOTBACKUP defined). - Define os_aio_use_native_aio for HB. - Do not acquire seek mutexes for backup since HB is single threaded. - Do not use srv_flush_log_at_trx_commit for HB build rb://155 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1822 committer: marko timestamp: Thu 2009-09-03 13:55:51 +0000 message: branches/zip: recv_recover_page_func(): Write the log sequence number to the compressed page, if there is one. Previously, the function only wrote the LSN to the uncompressed page. It is not clear why recv_recover_page_func() is updating FIL_PAGE_LSN in the buffer pool. The log sequence number will be stamped on the page when it is flushed to disk, in buf_flush_init_for_writing(). I noticed this inconsistency when analyzing Issue #313, but this patch does not fix it. That is no surprise, since FIL_PAGE_LSN should only matter on disk files, not in the buffer pool. ------------------------------------------------------------ revno: 0.3.1821 committer: marko timestamp: Thu 2009-09-03 13:36:15 +0000 message: branches/zip: row_merge(): Remove a bogus debug assertion that was triggered when creating an index on an empty table. row_merge_sort(): Add debug assertions and comments that justify the loop termination condition. The bogus assertion ut_ad(ihalf > 0) was reported by Michael. ------------------------------------------------------------ revno: 0.3.1820 committer: marko timestamp: Thu 2009-09-03 10:05:44 +0000 message: branches/zip: MLOG_MULTI_REC_END: Correct the comment. ------------------------------------------------------------ revno: 0.3.1819 committer: marko timestamp: Thu 2009-09-03 09:46:38 +0000 message: branches/zip: recv_scan_log_recs(): Replace while with do...while, because the termination condition will always hold on the first iteration. ------------------------------------------------------------ revno: 0.3.1818 committer: marko timestamp: Thu 2009-09-03 07:55:36 +0000 message: branches/zip: log_reserve_and_write_fast(): Do not cache the log_sys pointer in a local variable. ------------------------------------------------------------ revno: 0.3.1817 committer: marko timestamp: Thu 2009-09-03 07:38:22 +0000 message: branches/zip: log_check_log_recs(): Enclose in #ifdef UNIV_LOG_DEBUG. Add const qualifiers. ------------------------------------------------------------ revno: 0.3.1816 committer: marko timestamp: Thu 2009-09-03 07:28:35 +0000 message: branches/zip: ut_align(): Make ptr const, like in ut_align_down(). ------------------------------------------------------------ revno: 0.3.1815 committer: marko timestamp: Thu 2009-09-03 05:36:12 +0000 message: branches/zip: log_reserve_and_write_fast(): Remove the redundant output parameter "success". Success is also indicated by a nonzero return value. ------------------------------------------------------------ revno: 0.3.1814 committer: marko timestamp: Wed 2009-09-02 06:53:19 +0000 message: branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP. ------------------------------------------------------------ revno: 0.3.1813 committer: marko timestamp: Wed 2009-09-02 06:43:09 +0000 message: branches/zip: univ.i: Do not undefine PACKAGE or VERSION. InnoDB source code does not refer to these macros. ------------------------------------------------------------ revno: 0.3.1812 committer: sunny timestamp: Wed 2009-09-02 06:08:45 +0000 message: branches/zip: Update ChangeLog with r5733 changes. ------------------------------------------------------------ revno: 0.3.1811 committer: sunny timestamp: Wed 2009-09-02 06:05:15 +0000 message: branches/zip: Fix a regression introduced by the fix for bug#26316. We check whether a transaction holds any AUTOINC locks before we acquire the kernel mutex and release those locks. Fix for rb://153. Approved by Marko. ------------------------------------------------------------ revno: 0.3.1810 committer: vasil timestamp: Mon 2009-08-31 06:47:49 +0000 message: branches/zip: Fix Bug#46718 InnoDB plugin incompatible with gcc 4.1 (at least: on PPC): "Undefined symbol" by implementing our own check in plug.in instead of using the result from the check from MySQL because it is insufficient. Approved by: Marko (rb://154) ------------------------------------------------------------ revno: 0.3.1809 committer: marko timestamp: Mon 2009-08-31 05:10:10 +0000 message: branches/zip: buf_chunk_not_freed(): Do not acquire block->mutex unless block->page.state == BUF_BLOCK_FILE_PAGE. Check that block->page.state makes sense. Approved by Sunny Bains over the IM. ------------------------------------------------------------ revno: 0.3.1808 committer: inaam timestamp: Fri 2009-08-28 05:22:46 +0000 message: branches/zip rb://152 Disable display of deprecated parameter innodb_file_io_threads in 'show variables'. ------------------------------------------------------------ revno: 0.3.1807 committer: inaam timestamp: Thu 2009-08-27 21:43:32 +0000 message: branches/zip Remove redundant TRUE : FALSE from the return statement ------------------------------------------------------------ revno: 0.3.1806 committer: inaam timestamp: Thu 2009-08-27 15:20:35 +0000 message: branches/zip Remove unused macros as we erased the random readahead code in r5703. Also fixed some comments. ------------------------------------------------------------ revno: 0.3.1805 committer: inaam timestamp: Thu 2009-08-27 15:00:27 +0000 message: branches/zip rb://147 Done away with following two status variables: innodb_buffer_pool_read_ahead_rnd innodb_buffer_pool_read_ahead_seq Introduced two new status variables: innodb_buffer_pool_read_ahead = number of pages read as part of readahead since server startup innodb_buffer_pool_read_ahead_evicted = number of pages that are read in as readahead but were evicted before ever being accessed since server startup i.e.: a measure of how badly our readahead is performing SHOW INNODB STATUS will show two extra numbers in buffer pool section: pages read ahead/sec and pages evicted without access/sec Approved by: Marko ------------------------------------------------------------ revno: 0.3.1804 committer: marko timestamp: Thu 2009-08-27 10:56:24 +0000 message: branches/zip: dict_index_find_cols(): On column name lookup failure, return DB_CORRUPTION (HA_ERR_CRASHED) instead of abnormally terminating the server. Also, disable the previously added diagnostic output to the error log, because mysql-test-run does not like extra output in the error log. (Bug #44571) dict_index_add_to_cache(): Handle errors from dict_index_find_cols(). mysql-test/innodb_bug44571.test: A test case for triggering the bug. rb://135 approved by Sunny Bains. ------------------------------------------------------------ revno: 0.3.1803 committer: marko timestamp: Thu 2009-08-27 07:31:17 +0000 message: branches/zip: Fix a critical bug in fast index creation that could corrupt the created indexes. row_merge(): Make "half" an in/out parameter. Determine the offset of half the output file. Copy the last blocks record-by-record instead of block-by-block, so that the records can be counted. Check that the input and output have matching n_rec. row_merge_sort(): Do not assume that two blocks of size N are merged into a block of size 2*N. The output block can be shorter than the input if the last page of each input block is almost empty. Use an accurate termination condition, based on the "half" computed by row_merge(). row_merge_read(), row_merge_write(), row_merge_blocks(): Add debug output. merge_file_t, row_merge_file_create(): Add n_rec, the number of records in the merge file. row_merge_read_clustered_index(): Update n_rec. row_merge_blocks(): Update and check n_rec. row_merge_blocks_copy(): New function, for copying the last blocks in row_merge(). Update and check n_rec. This bug was discovered with a user-supplied test case that creates an index where the initial temporary file is 249 one-megabyte blocks and the merged files become smaller. In the test, possible merge record sizes are 10, 18, and 26 bytes. rb://150 approved by Sunny Bains. This addresses Issue #320. ------------------------------------------------------------ revno: 0.3.1802 committer: marko timestamp: Thu 2009-08-27 06:25:00 +0000 message: branches/zip: Replace the constant 3/8 ratio that controls the LRU_old size with the settable global variable innodb_old_blocks_pct. The minimum and maximum values are 5 and 95 per cent, respectively. The default is 100*3/8, in line with the old behavior. ut_time_ms(): New utility function, to return the current time in milliseconds. TODO: Is there a more efficient timestamp function, such as rdtsc divided by a power of two? buf_LRU_old_threshold_ms: New variable, corresponding to innodb_old_blocks_time. The value 0 is the default behaviour: no timeout before making blocks 'new'. bpage->accessed, bpage->LRU_position, buf_pool->ulint_clock: Remove. bpage->access_time: New field, replacing bpage->accessed. Protected by buf_pool_mutex instead of bpage->mutex. Updated when a page is created or accessed the first time in the buffer pool. buf_LRU_old_ratio, innobase_old_blocks_pct: New variables, corresponding to innodb_old_blocks_pct buf_LRU_old_ratio_update(), innobase_old_blocks_pct_update(): Update functions for buf_LRU_old_ratio, innobase_old_blocks_pct. buf_page_peek_if_too_old(): Compare ut_time_ms() to bpage->access_time if buf_LRU_old_threshold_ms && bpage->old. Else observe buf_LRU_old_ratio and bpage->freed_page_clock. buf_pool_t: Add n_pages_made_young, n_pages_not_made_young, n_pages_made_young_old, n_pages_not_made_young, for statistics. buf_print(): Display buf_pool->n_pages_made_young, buf_pool->n_pages_not_made_young. This function is only for crash diagnostics. buf_print_io(): Display buf_pool->LRU_old_len and quantities derived from buf_pool->n_pages_made_young, buf_pool->n_pages_not_made_young. This function is invoked by SHOW ENGINE INNODB STATUS. rb://129 approved by Heikki Tuuri. This addresses Bug #45015. ------------------------------------------------------------ revno: 0.3.1801 committer: marko timestamp: Thu 2009-08-27 06:03:15 +0000 message: branches/zip: Document also the files affected by r5698 in the ChangeLog. ------------------------------------------------------------ revno: 0.3.1800 committer: marko timestamp: Thu 2009-08-27 06:01:42 +0000 message: branches/zip: Document r5698 in the ChangeLog. ------------------------------------------------------------ revno: 0.3.1799 committer: inaam timestamp: Wed 2009-08-26 13:34:35 +0000 message: branches/zip bug#42885 rb://148 The call to put IO threads to sleep was most probably meant for Windows only as the comment in buf0rea.c suggests. However it was enabled on all platforms. This patch restricts the sleep call to windows. This approach of not putting threads to sleep makes even more sense because now we have multiple threads working in the background and it probably is not a good idea to put all of them to sleep because a user thread wants to post a batch for readahead. Approved by: Marko ------------------------------------------------------------ revno: 0.3.1798 committer: vasil timestamp: Wed 2009-08-26 12:44:40 +0000 message: branches/zip: Fix typo. ------------------------------------------------------------ revno: 0.3.1797 committer: vasil timestamp: Wed 2009-08-26 12:15:59 +0000 message: branches/zip: Merge a change from MySQL: http://lists.mysql.com/commits/80832 2968 Jonathan Perkin 2009-08-14 Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith. modified: CMakeLists.txt cmd-line-utils/readline/util.c storage/innodb_plugin/handler/i_s.cc storage/innodb_plugin/include/univ.i ------------------------------------------------------------ revno: 0.3.1796 committer: marko timestamp: Wed 2009-08-26 12:14:59 +0000 message: branches/zip: UNIV_DEBUG_LOCK_VALIDATE: Move the definition to univ.i. ------------------------------------------------------------ revno: 0.3.1795 committer: marko timestamp: Wed 2009-08-26 10:25:26 +0000 message: branches/zip: buf_page_t: Clarify that bpage->list may contain garbage. This comment was provoked by Inaam. ------------------------------------------------------------ revno: 0.3.1794 committer: vasil timestamp: Thu 2009-08-20 08:20:22 +0000 message: branches/zip: ChangeLog: Follow the convention from the rest of the ChangeLog: for bugfixes from bugs.mysql.com only the bug number and title goes in the ChangeLog. Detailed explanation on what is the problem and how it was fixed is present in the bugs database. ------------------------------------------------------------ revno: 0.3.1793 committer: vasil timestamp: Thu 2009-08-20 08:15:05 +0000 message: branches/zip: White-space fixup. ------------------------------------------------------------ revno: 0.3.1792 committer: sunny timestamp: Thu 2009-08-20 07:18:29 +0000 message: branches/zip: Update the ChangeLog with r5684 change. ------------------------------------------------------------ revno: 0.3.1791 committer: sunny timestamp: Thu 2009-08-20 07:05:30 +0000 message: branches/zip: Fix bug# 46650: Innodb assertion autoinc_lock == lock in lock_table_remove_low on INSERT SELECT We only store the autoinc locks that are granted in the transaction's autoinc lock vector. A transacton, that has been rolled back due to a deadlock because of an AUTOINC lock attempt, will not have added that lock to the vector. We need to check for that when we remove that lock. rb://145 Approved by Marko. ------------------------------------------------------------ revno: 0.3.1790 committer: sunny timestamp: Fri 2009-08-14 05:16:24 +0000 message: branches/zip: When building HotBackup srv_use_sys_malloc is #ifdef out. We move access to the this variable within a !UNIV_HOTBACKUP block. ------------------------------------------------------------ revno: 0.3.1789 committer: marko timestamp: Thu 2009-08-13 07:46:33 +0000 message: branches/zip: ha_innobase::add_index(): Fix Bug #46557: after a successful operation, read innodb_table->flags from the newly created table object, not from the old one that was just freed. Approved by Sunny. ------------------------------------------------------------ revno: 0.3.1788 committer: marko timestamp: Wed 2009-08-12 12:16:37 +0000 message: branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec. This is a non-functional change. ------------------------------------------------------------ revno: 0.3.1787 committer: marko timestamp: Tue 2009-08-11 10:42:37 +0000 message: branches/zip: trx_general_rollback_for_mysql(): Remove the redundant parameter partial. If savept==NULL, partial==FALSE. ------------------------------------------------------------ revno: 0.3.1786 committer: marko timestamp: Tue 2009-08-11 08:54:16 +0000 message: branches/zip: Bump the version number to 1.0.5 after releasing 1.0.4. ------------------------------------------------------------ revno: 0.3.1785 committer: calvin timestamp: Thu 2009-08-06 22:04:03 +0000 message: branches/zip: remove duplicate "the" in comments. ------------------------------------------------------------ revno: 0.3.1784 committer: marko timestamp: Thu 2009-08-06 09:39:34 +0000 message: branches/zip: mem_heap_block_free(): If innodb_use_sys_malloc is set, do not tell Valgrind that the memory is free, to avoid a bogus warning in Valgrind's built-in free() hook. ------------------------------------------------------------ revno: 0.3.1783 committer: marko timestamp: Wed 2009-08-05 11:27:30 +0000 message: branches/zip: lock_rec_validate_page(): Add the parameter zip_size. This should help track down Mantis Issue #289. ------------------------------------------------------------ revno: 0.3.1782 committer: marko timestamp: Wed 2009-08-05 10:06:55 +0000 message: branches/zip: Replace with NUMBER in some comments, to avoid problems with Doxygen XML output. ------------------------------------------------------------ revno: 0.3.1781 committer: marko timestamp: Tue 2009-08-04 10:42:44 +0000 message: branches/zip: mysql-test: Pass MTR's internal checks. ------------------------------------------------------------ revno: 0.3.1780 committer: vasil timestamp: Tue 2009-08-04 04:53:31 +0000 message: branches/zip: Revert the dummy change from c5625. ------------------------------------------------------------ revno: 0.3.1779 committer: vasil timestamp: Tue 2009-08-04 04:52:48 +0000 message: branches/zip: Merge 5518:5622 from branches/5.1, resolving conflict in r5622 (after resolving the conflict Makefile.am was not changed so I have made a dummy change so I can commit and thus record that branches/5.1 has been merged in branches/zip up to 5622): ------------------------------------------------------------------------ r5622 | vasil | 2009-08-03 15:27:00 +0300 (Mon, 03 Aug 2009) | 20 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2988 committer: Satya B branch nick: mysql-5.1-bugteam timestamp: Wed 2009-07-01 11:06:05 +0530 message: Fix build failure after applying Innodb snapshot 5.1-ss5282 After applying Innodb snapshot 5.1-ss5282, build was broken because of missing header file. Adding the header file to Makefile.am after informing the innodb developers. modified: storage/innobase/Makefile.am ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1778 committer: vasil timestamp: Fri 2009-07-31 14:09:07 +0000 message: branches/zip: Add fsp0types.h to the list of noinst_HEADERS Suggested by: Sergey Vojtovich ------------------------------------------------------------ revno: 0.3.1777 committer: vasil timestamp: Tue 2009-07-21 09:28:27 +0000 message: branches/zip: Add a test program to check whether the PAUSE instruction is available. ------------------------------------------------------------ revno: 0.3.1776 committer: vasil timestamp: Tue 2009-07-21 08:31:26 +0000 message: branches/zip: Fixups in ChangeLog: sort filenames alphabetically and wrap to 78 chars per line. ------------------------------------------------------------ revno: 0.3.1775 committer: sunny timestamp: Mon 2009-07-20 20:56:30 +0000 message: branches/zip: For HotBackup builds we don't want to hide the symbols. ------------------------------------------------------------ revno: 0.3.1774 committer: calvin timestamp: Mon 2009-07-20 16:14:30 +0000 message: branches/zip: add ChangeLog entry for r5524. ------------------------------------------------------------ revno: 0.3.1773 committer: inaam timestamp: Mon 2009-07-20 15:23:15 +0000 message: branches/zip Change the read ahead parameter name to innodb_read_ahead_threshold. Change the meaning of this parameter to signify the number of pages that must be sequentially accessed for InnoDB to trigger a readahead request. Suggested by: Ken ------------------------------------------------------------ revno: 0.3.1772 committer: vasil timestamp: Mon 2009-07-20 07:51:47 +0000 message: branches/zip: Add ChangeLog entries for r5498 and r5519. ------------------------------------------------------------ revno: 0.3.1771 committer: vasil timestamp: Mon 2009-07-20 07:45:18 +0000 message: branches/zip: Merge r5497:5518 from branches/5.1: ------------------------------------------------------------------------ r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2874.2.1 committer: Anurag Shekhar branch nick: mysql-5.1-bugteam-windows-warning timestamp: Wed 2009-05-13 15:41:24 +0530 message: Bug #39802 On Windows, 32-bit time_t should be enforced This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', possible loss of data". The fix is to typecast time_t to ulong before assigning it to ulong. Backported this from 6.0-bugteam tree. modified: storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1770 committer: sunny timestamp: Mon 2009-07-20 06:55:11 +0000 message: Add /* UNIV_HOTBACK */ ------------------------------------------------------------ revno: 0.3.1769 committer: sunny timestamp: Mon 2009-07-20 06:46:05 +0000 message: branches/zip: Make this file usable from within HotBackup. A new file has been introduced called hb_univ.i. This file should have all the HotBackup specific configuration. ------------------------------------------------------------ revno: 0.3.1768 committer: sunny timestamp: Mon 2009-07-20 06:29:14 +0000 message: branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup. ------------------------------------------------------------ revno: 0.3.1767 committer: sunny timestamp: Sun 2009-07-19 23:08:49 +0000 message: branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined. ------------------------------------------------------------ revno: 0.3.1766 committer: sunny timestamp: Sun 2009-07-19 22:58:43 +0000 message: branches/zip: Undo r5512 ------------------------------------------------------------ revno: 0.3.1765 committer: sunny timestamp: Sun 2009-07-19 22:52:48 +0000 message: branches/zip: Remove unused extern ref to timed_mutexes. ------------------------------------------------------------ revno: 0.3.1764 committer: calvin timestamp: Thu 2009-07-16 12:45:28 +0000 message: branches/zip: add ChangeLog entry for r5508. ------------------------------------------------------------ revno: 0.3.1763 committer: calvin timestamp: Thu 2009-07-16 12:40:47 +0000 message: branches/zip: Support inlining of functions and prefetch with Sun Studio Those changes are contributed by Sun/MySQL. Two sets of changes in this patch when Sun Studio is used: - Explicit inlining of functions - Prefetch Support This patch has been tested by Sunny with the plugin statically built in. Since we've never built the plugin as a dynamically loaded module on Solaris, it is a separate task to change plug.in. rb://142 Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1762 committer: calvin timestamp: Wed 2009-07-15 07:58:44 +0000 message: branches/zip: fix compile errors on Win64 Both srv_read_ahead_factor and srv_io_capacity should be defined as ulong. Approved by: Sunny ------------------------------------------------------------ revno: 0.3.1761 committer: vasil timestamp: Tue 2009-07-14 17:16:11 +0000 message: branches/zip: Non-functional change: put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort alphabetically, so it is easier to find if a file is there or not and also diffs show exactly the added or removed file instead of surrounding lines too. ------------------------------------------------------------ revno: 0.3.1760 committer: vasil timestamp: Tue 2009-07-14 16:59:59 +0000 message: branches/zip: Add include/ut0auxconf.h to noinst_HEADERS ------------------------------------------------------------ revno: 0.3.1759 committer: vasil timestamp: Tue 2009-07-14 16:58:15 +0000 message: branches/zip: Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h header file that is eventually used by mysqld. ------------------------------------------------------------ revno: 0.3.1758 committer: calvin timestamp: Tue 2009-07-14 16:03:26 +0000 message: branches/zip: minor change Remove an extra "with". ------------------------------------------------------------ revno: 0.3.1757 committer: calvin timestamp: Tue 2009-07-14 15:55:10 +0000 message: branches/zip: add a missing file in Makefile.am This change was suggested by MySQL. ------------------------------------------------------------ revno: 0.3.1756 committer: vasil timestamp: Tue 2009-07-14 06:16:18 +0000 message: branches/zip: Merge r5341:5497 from branches/5.1, skipping: c5419 because it is merge from branches/zip into branches/5.1 c5466 because the source code has been adjusted to match the MySQL behavior and the innodb-autoinc test does not fail in branches/zip, if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested not to merge c5466. and resolving conflicts in c5410, c5440, c5488: ------------------------------------------------------------------------ r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines Changed paths: M /branches/5.1/include/trx0sys.ic M /branches/5.1/trx/trx0purge.c M /branches/5.1/trx/trx0sys.c M /branches/5.1/trx/trx0undo.c branches/5.1: Add missing #include "mtr0log.h" to avoid warnings when compiling with -DUNIV_MUST_NOT_INLINE. ------------------------------------------------------------------------ r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test M /branches/5.1/mysql-test/innodb_bug42101.result M /branches/5.1/mysql-test/innodb_bug42101.test branches/5.1: Merge r5418 from branches/zip: ------------------------------------------------------------------------ r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/handler/ha_innodb.cc M /branches/zip/mysql-test/innodb_bug42101-nonzero.result M /branches/zip/mysql-test/innodb_bug42101-nonzero.test M /branches/zip/mysql-test/innodb_bug42101.result M /branches/zip/mysql-test/innodb_bug42101.test branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines Changed paths: M /branches/5.1/fil/fil0fil.c branches/5.1: Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation by changing the URL from http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html ------------------------------------------------------------------------ r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Adjust the failing innodb-autoinc test to conform to the latest behavior of the MySQL code. The idea and the comment in innodb-autoinc.test come from Sunny. ------------------------------------------------------------------------ r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug21704.test branches/5.1: Fix Bug#21704 Renaming column does not update FK definition by checking whether a column that participates in a FK definition is being renamed and denying the ALTER in this case. The patch was originally developed by Davi Arnaut : http://lists.mysql.com/commits/77714 and was later adjusted to conform to InnoDB coding style by me (Vasil), I also added some more comments and moved the bug specific mysql-test to a separate file to make it more manageable and flexible. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1755 committer: calvin timestamp: Mon 2009-07-13 18:01:00 +0000 message: branches/zip: fix run-time symbols clash on Solaris. This patch is from Sergey Vojtovich of Sun Microsystems, to fix run-time symbols clash on Solaris with older C++ compiler: - when finding out a way to hide symbols, make decision basing on compiler, not operating system. - Sun Studio supports __hidden declaration specifier for this purpose. ------------------------------------------------------------ revno: 0.3.1754 committer: inaam timestamp: Mon 2009-07-13 17:04:57 +0000 message: branches/zip Fixed warnings on windows where ulint != ib_uint64_t ------------------------------------------------------------ revno: 0.3.1753 committer: inaam timestamp: Mon 2009-07-13 14:48:45 +0000 message: branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael. ------------------------------------------------------------ revno: 0.3.1752 committer: vasil timestamp: Mon 2009-07-13 06:37:35 +0000 message: branches/zip: Restore the original value of innodb_sync_spin_loops at the end, previously the test assumed that setting it to 20 will do this, but now the default is 30 and MTR's internal check failed. ------------------------------------------------------------ revno: 0.3.1751 committer: calvin timestamp: Fri 2009-07-10 20:47:34 +0000 message: branches/zip: add ChangeLog entries for r5484-r5486. ------------------------------------------------------------ revno: 0.3.1750 committer: calvin timestamp: Fri 2009-07-10 15:19:17 +0000 message: branches/zip: add copyright info to files related to PAUSE instruction patch, contributed by Sun Microsystems. ------------------------------------------------------------ revno: 0.3.1749 committer: vasil timestamp: Fri 2009-07-10 08:04:20 +0000 message: branches/zip: Add ChangeLog entry for 5489. ------------------------------------------------------------ revno: 0.3.1748 committer: vasil timestamp: Fri 2009-07-10 08:02:22 +0000 message: branches/zip: Change the defaults for innodb_sync_spin_loops: 20 -> 30 innodb_spin_wait_delay: 5 -> 6 This change was proposed by Sun/MySQL based on their performance testing, see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4 ------------------------------------------------------------ revno: 0.3.1747 committer: calvin timestamp: Wed 2009-07-08 15:42:28 +0000 message: branches/zip: fix PAUSE instruction patch on Windows The original PAUSE instruction patch (r5470) does not compile on Windows. Also, there is an elegant way of doing it on Windows - YieldProcessor(). Approved by: Heikki (on IM) ------------------------------------------------------------ revno: 0.3.1746 committer: inaam timestamp: Wed 2009-07-08 15:11:40 +0000 message: branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1745 committer: inaam timestamp: Tue 2009-07-07 22:00:49 +0000 message: branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1744 committer: inaam timestamp: Tue 2009-07-07 21:57:14 +0000 message: branches/zip rb://126 Based on contribution from Google Inc. This patch introduces a new parameter innodb_io_capacity to control the rate at which master threads performs various tasks. The default value is 200 and higher values imply more aggressive flushing and ibuf merges from within the master thread. This patch also changes the ibuf merge from synchronous to asynchronous. Another minor change is not to force the master thread to wait for a log flush to complete every second. Approved by: Heikki ------------------------------------------------------------ revno: 0.3.1743 committer: calvin timestamp: Tue 2009-07-07 08:36:43 +0000 message: branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake. Windows will support PAUSE instruction by default. ------------------------------------------------------------ revno: 0.3.1742 committer: calvin timestamp: Mon 2009-07-06 21:36:35 +0000 message: branches/zip: add COPYING files for Percona and Sun Micro. 1.0.4 contains patches based on contributions from Percona and Sun Microsystems. ------------------------------------------------------------ revno: 0.3.1741 committer: vasil timestamp: Mon 2009-07-06 16:16:32 +0000 message: branches/zip: Remove unnecessary quotes and simplify plug.in. ------------------------------------------------------------ revno: 0.3.1740 committer: vasil timestamp: Thu 2009-07-02 12:12:36 +0000 message: branches/zip: Use PAUSE instruction inside spinloop if it is available. The patch was originally developed by Mikael Ronstrom and can be found here: http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800 Approved by: Heikki (rb://137) ------------------------------------------------------------ revno: 0.3.1739 committer: inaam timestamp: Tue 2009-06-30 17:21:09 +0000 message: branches/zip Non functional change. s/Percona/Percona Inc./ ------------------------------------------------------------ revno: 0.3.1738 committer: marko timestamp: Tue 2009-06-30 11:42:52 +0000 message: branches/zip: Replace a non-ASCII character (ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute. ------------------------------------------------------------ revno: 0.3.1737 committer: marko timestamp: Tue 2009-06-30 11:14:01 +0000 message: branches/zip: os_process_set_priority_boost(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1736 committer: marko timestamp: Tue 2009-06-30 11:10:26 +0000 message: branches/zip: os_file_close_no_error_handling(): Restore, as this function is used within InnoDB Hot Backup. ------------------------------------------------------------ revno: 0.3.1735 committer: marko timestamp: Tue 2009-06-30 11:09:49 +0000 message: branches/zip: page_set_max_trx_id(): Make the code compile with UNIV_HOTBACKUP. ------------------------------------------------------------ revno: 0.3.1734 committer: marko timestamp: Tue 2009-06-30 11:02:20 +0000 message: branches/zip: os_file_close_no_error_handling(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1733 committer: marko timestamp: Tue 2009-06-30 11:00:50 +0000 message: branches/zip: innobase_start_or_create_for_mysql(): Invoke os_get_os_version() at most once. ------------------------------------------------------------ revno: 0.3.1732 committer: marko timestamp: Tue 2009-06-30 10:56:36 +0000 message: branches/zip: mem_heap_cat(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1731 committer: marko timestamp: Tue 2009-06-30 10:37:58 +0000 message: branches/zip: srv_que_task_queue_check(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1730 committer: marko timestamp: Tue 2009-06-30 10:35:45 +0000 message: branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1729 committer: marko timestamp: Tue 2009-06-30 10:28:11 +0000 message: branches/zip: row_build_row_ref_from_row(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1728 committer: marko timestamp: Tue 2009-06-30 10:19:49 +0000 message: branches/zip: que_graph_try_free(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1727 committer: marko timestamp: Tue 2009-06-30 10:03:00 +0000 message: branches/zip: os_event_create_auto(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1726 committer: marko timestamp: Tue 2009-06-30 09:45:41 +0000 message: branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove. ------------------------------------------------------------ revno: 0.3.1725 committer: marko timestamp: Tue 2009-06-30 09:30:14 +0000 message: branches/zip: ha_delete(): Remove this unused function that was very similar to ha_search_and_delete_if_found(). ------------------------------------------------------------ revno: 0.3.1724 committer: marko timestamp: Tue 2009-06-30 08:15:22 +0000 message: branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG. This function is unused, but it could turn out to be a useful debugging aid. ------------------------------------------------------------ revno: 0.3.1723 committer: marko timestamp: Tue 2009-06-30 08:10:32 +0000 message: branches/zip: fseg_free(): Remove this unused function. ------------------------------------------------------------ revno: 0.3.1722 committer: marko timestamp: Tue 2009-06-30 08:10:01 +0000 message: branches/zip: ibuf_dummy_index_free(): Beautify the comment. ------------------------------------------------------------ revno: 0.3.1721 committer: marko timestamp: Mon 2009-06-29 12:58:40 +0000 message: branches/zip: Revert an accidentally made change in r5430 to univ.i. ------------------------------------------------------------ revno: 0.3.1720 committer: marko timestamp: Mon 2009-06-29 12:58:07 +0000 message: branches/zip: lock_rec_validate_page(): Add another assertion to track down Issue #289. ------------------------------------------------------------ revno: 0.3.1719 committer: marko timestamp: Mon 2009-06-29 12:49:54 +0000 message: branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT or SET GLOBAL innodb_file_format_check=DEFAULT. innodb_file_format.test: New test for innodb_file_format and innodb_file_format_check. innodb_file_format_name_validate(): Store the string in *save. innodb_file_format_name_update(): Check the string again. innodb_file_format_check_validate(): Store the string in *save. innodb_file_format_check_update(): Check the string again. Issue #282, rb://140 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.1718 committer: marko timestamp: Mon 2009-06-29 10:06:29 +0000 message: branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast. Do not do arithmetics on void pointers. ------------------------------------------------------------ revno: 0.3.1717 committer: marko timestamp: Mon 2009-06-29 08:54:53 +0000 message: branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages(): Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED). buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)). Issue #289, rb://136 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1716 committer: marko timestamp: Mon 2009-06-29 08:24:27 +0000 message: branches/zip: buf_page_get_gen(): Fix a race condition when reading buf_fix_count. This could explain Issue #156. Tested by Michael. ------------------------------------------------------------ revno: 0.3.1715 committer: marko timestamp: Mon 2009-06-29 07:52:30 +0000 message: branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index(): Start prebuilt->trx before locking the table. This should fix Issue #293 and could fix Issue #229. Approved by Sunny (over IM). ------------------------------------------------------------ revno: 0.3.1714 committer: calvin timestamp: Fri 2009-06-26 19:52:52 +0000 message: branches/zip: Fix typos. ------------------------------------------------------------ revno: 0.3.1713 committer: marko timestamp: Thu 2009-06-25 11:55:52 +0000 message: branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------ revno: 0.3.1712 committer: marko timestamp: Thu 2009-06-25 11:20:56 +0000 message: branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment. ------------------------------------------------------------ revno: 0.3.1711 committer: marko timestamp: Thu 2009-06-25 09:45:57 +0000 message: branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch. This addresses Bug #44571 but does not fix it. rb://135 approved by Sunny Bains. ------------------------------------------------------------ revno: 0.3.1710 committer: marko timestamp: Thu 2009-06-25 09:27:08 +0000 message: branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290. ------------------------------------------------------------ revno: 0.3.1709 committer: calvin timestamp: Wed 2009-06-24 12:51:08 +0000 message: branches/zip: remove relative path of header files. Suggested by Marko. ------------------------------------------------------------ revno: 0.3.1708 committer: calvin timestamp: Tue 2009-06-23 19:59:42 +0000 message: branches/zip: change the header file path. Change the header file path from ../storage/innobase/include/ to ../include/. In the planned 5.1 + plugin release, the source directory of the plugin will not be in storage/innobase. Approved by: Heikki (IM) ------------------------------------------------------------ revno: 0.3.1707 committer: pekka timestamp: Mon 2009-06-22 12:46:34 +0000 message: branches/zip: Add functions for checking the format of tablespaces for Hot Backup build (UNIV_HOTBACKUP defined). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------ revno: 0.3.1706 committer: pekka timestamp: Mon 2009-06-22 12:27:55 +0000 message: branches/zip: Minor changes for Hot Backup to build correctly. (The code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------ revno: 0.3.1705 committer: marko timestamp: Mon 2009-06-22 10:58:20 +0000 message: branches/zip: ha_innobase::check_if_incompatible_data(): When ROW_FORMAT=DEFAULT, do not compare to get_row_type(). Without this change, fast index creation will be disabled in recent versions of MySQL 5.1. ------------------------------------------------------------ revno: 0.3.1704 committer: marko timestamp: Mon 2009-06-22 08:31:35 +0000 message: branches/zip: buf_page_get_zip(): Fix a bogus warning about block_mutex being possibly uninitialized. ------------------------------------------------------------ revno: 0.3.1703 committer: marko timestamp: Wed 2009-06-17 12:03:45 +0000 message: branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426) ------------------------------------------------------------ revno: 0.3.1702 committer: vasil timestamp: Wed 2009-06-17 11:56:12 +0000 message: branches/zip: Add ChangeLog entry for r5342. ------------------------------------------------------------ revno: 0.3.1701 committer: marko timestamp: Wed 2009-06-17 09:15:32 +0000 message: branches/zip: Merge revisions 5233:5341 from branches/5.1: ------------------------------------------------------------------------ r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before the bug fix we would assert on missing autoinc columns. With this fix we allow MySQL to open the table but set the next autoinc value for the column to the MAX value. This effectively disables the next value generation. INSERTs will fail with a generic AUTOINC failure. However, the user should be able to read/dump the table, set the column values explicitly, use ALTER TABLE to set the next autoinc value and/or sync the two data dictionaries to resume normal operations. Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the index (PRIMARY) rb://118 ------------------------------------------------------------------------ r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines branches/5.1: The version of the result file checked in was broken in r5243. ------------------------------------------------------------------------ r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines branches/5.1: Remove the word "Error" from the printout because the mysqltest suite interprets it as an error and thus the innodb-autoinc test fails. Approved by: Sunny (via IM) ------------------------------------------------------------------------ r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines branches/5.1: Add missing #include "mtr0log.h" so that the code compiles with -DUNIV_MUST_NOT_INLINE. (null merge; this had already been committed in branches/zip) ------------------------------------------------------------------------ r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown, refuse to unlock the record. (Bug #45357, caused by the fix of Bug #39320). rb://132 approved by Sunny Bains. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1700 committer: marko timestamp: Tue 2009-06-16 12:23:10 +0000 message: branches/zip: innodb.test: Adjust the tolerance of innodb_buffer_pool_pages_total for r5320. ------------------------------------------------------------ revno: 0.3.1699 committer: marko timestamp: Tue 2009-06-16 08:27:46 +0000 message: branches/zip: buf_page_io_query(): Remove unused function. ------------------------------------------------------------ revno: 0.3.1698 committer: vasil timestamp: Tue 2009-06-16 08:03:27 +0000 message: branches/zip: Add ChangeLog entries for r5283 and r5320. ------------------------------------------------------------ revno: 0.3.1697 committer: marko timestamp: Tue 2009-06-16 08:00:48 +0000 message: branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call. The function must switch on the block state anyway. ------------------------------------------------------------ revno: 0.3.1696 committer: marko timestamp: Tue 2009-06-16 07:08:59 +0000 message: branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting buf_pool->n_pend_unzip while only holding buf_pool_mutex. ------------------------------------------------------------ revno: 0.3.1695 committer: inaam timestamp: Thu 2009-06-11 12:15:41 +0000 message: branches/zip rb://131 This patch changes the following defaults: max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99 additional_mem_pool_size: default from 1 to 8 MB buffer_pool_size: default from 8 to 128 MB log_buffer_size: default from 1 to 8 MB read_io_threads/write_io_threads: default from 1 to 4 The log file sizes are untouched because of upgrade issues Reviewed by: Heikki ------------------------------------------------------------ revno: 0.3.1694 committer: marko timestamp: Thu 2009-06-11 07:40:33 +0000 message: branches/zip: Declare os_thread_id_t as unsigned long, because ulint is wrong on Win64. Pointed out by Vladislav Vaintroub . ------------------------------------------------------------ revno: 0.3.1693 committer: inaam timestamp: Tue 2009-06-09 16:46:29 +0000 message: branches/zip rb://130 Enable Group Commit functionality that was broken in 5.0 when distributed transactions were introduced. Reviewed by: Heikki ------------------------------------------------------------ revno: 0.3.1692 committer: inaam timestamp: Mon 2009-06-08 15:18:21 +0000 message: branches/zip Non functional change: Added legal notices acknowledging percona contribution to the multiple IO helper threads patch i.e.: r5262 ------------------------------------------------------------ revno: 0.3.1691 committer: vasil timestamp: Fri 2009-06-05 15:34:11 +0000 message: branches/zip: Add ChangeLog entry for r5262. ------------------------------------------------------------ revno: 0.3.1690 committer: vasil timestamp: Fri 2009-06-05 15:26:58 +0000 message: branches/zip: Add ChangeLog entry for r5261. ------------------------------------------------------------ revno: 0.3.1689 committer: vasil timestamp: Fri 2009-06-05 15:19:37 +0000 message: branches/zip: Whitespace cleanup. ------------------------------------------------------------ revno: 0.3.1688 committer: vasil timestamp: Fri 2009-06-05 15:04:25 +0000 message: branches/zip: Enable functionality to have multiple background io helper threads. This patch is based on percona contributions. More details about this patch will be written at: https://svn.innodb.com/innobase/MultipleBackgroundThreads The patch essentially does the following: expose following knobs: innodb_read_io_threads = [1 - 64] default 1 innodb_write_io_threads = [1 - 64] default 1 deprecate innodb_file_io_threads (this parameter was relevant only on windows) Internally it allows multiple segments for read and write IO request arrays where one thread works on one segement. Submitted by: Inaam (rb://124) Approved by: Heikki (rb://124) ------------------------------------------------------------ revno: 0.3.1687 committer: vasil timestamp: Fri 2009-06-05 14:13:31 +0000 message: branches/zip: Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern) The changes are: 1) Take into account access pattern when deciding whether or not to do linear read ahead. 2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic, global to control linear read ahead behvior 3) Disable random read ahead. Keep the code for now. Submitted by: Inaam (rb://122) Approved by: Heikki (rb://122) ------------------------------------------------------------ revno: 0.3.1686 committer: marko timestamp: Thu 2009-06-04 09:37:35 +0000 message: branches/zip: Add missing Doxygen comments for page0zip. ------------------------------------------------------------ revno: 0.3.1685 committer: marko timestamp: Thu 2009-06-04 05:59:51 +0000 message: branches/zip: Replace <= in a function comment. ------------------------------------------------------------ revno: 0.3.1684 committer: marko timestamp: Thu 2009-06-04 05:58:23 +0000 message: branches/zip: Add Doxygen comments to the rest of buf0*. ------------------------------------------------------------ revno: 0.3.1683 committer: marko timestamp: Wed 2009-06-03 11:26:41 +0000 message: branches/zip: Merge revisions 5148:5233 from branches/5.1: ------------------------------------------------------------------------ r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines branches/5.1: Merge a change from MySQL (this fixes the failing innodb_mysql test): ------------------------------------------------------------ revno: 1810.3894.10 committer: Sergey Glukhov branch nick: mysql-5.0-bugteam timestamp: Tue 2009-05-19 11:32:21 +0500 message: Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value Internal InnoDN FK parser does not recognize '\'' as quotation symbol. Suggested fix is to add '\'' symbol check for quotation condition (dict_strip_comments() function). modified: innobase/dict/dict0dict.c mysql-test/r/innodb_mysql.result mysql-test/t/innodb_mysql.test ------------------------------------------------------------------------ r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1682 committer: marko timestamp: Mon 2009-06-01 09:35:25 +0000 message: branches/zip: Clean up some comments. Make the rec parameter of mlog_open_and_write_index() const. ------------------------------------------------------------ revno: 0.3.1681 committer: marko timestamp: Thu 2009-05-28 10:14:02 +0000 message: branches/zip: Correct a debug assertion that was added in r5125. ------------------------------------------------------------ revno: 0.3.1680 committer: marko timestamp: Thu 2009-05-28 06:21:55 +0000 message: branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types. ------------------------------------------------------------ revno: 0.3.1679 committer: marko timestamp: Wed 2009-05-27 10:46:42 +0000 message: branches/zip: Merge revisions 4994:5148 from branches/5.1: ------------------------------------------------------------------------ r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Non-functional change: move FSP_* macros from fsp0fsp.h to a new file fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE in mtr0log.ic. ------------------------------------------------------------------------ r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h and include fsp0fsp.h just before it is needed. This is needed in order to be able to use TRX_SYS_SPACE in mtr0log.ic. ------------------------------------------------------------------------ r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines branches/5.1: Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not write redo log for the pages in the doublewrite buffer. Also, do not make a dummy change to the page because this is not needed. ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1678 committer: marko timestamp: Wed 2009-05-27 09:55:14 +0000 message: branches/zip: ibuf0ibuf.c: Improve a comment. ------------------------------------------------------------ revno: 0.3.1677 committer: marko timestamp: Wed 2009-05-27 06:57:25 +0000 message: branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation. @defgroup is for source code modules, not for field groups. Tell Doxygen to expand the UT_LIST declarations. ------------------------------------------------------------ revno: 0.3.1676 committer: marko timestamp: Wed 2009-05-27 06:01:40 +0000 message: branches/zip: Add Doxyfile. ------------------------------------------------------------ revno: 0.3.1675 committer: marko timestamp: Wed 2009-05-27 05:08:43 +0000 message: branches/zip: Add some Doxygen @return comments. ------------------------------------------------------------ revno: 0.3.1674 committer: marko timestamp: Tue 2009-05-26 12:28:49 +0000 message: branches/zip: Add some Doxygen comments for many structs, typedefs, #defines and global variables. Many are still missing. ------------------------------------------------------------ revno: 0.3.1673 committer: marko timestamp: Mon 2009-05-25 20:32:35 +0000 message: branches/zip: lexyy.c: Remove the inadvertently added @file directive. There is nothing for Doxygen to see in this file, move along. ------------------------------------------------------------ revno: 0.3.1672 committer: marko timestamp: Mon 2009-05-25 12:09:24 +0000 message: branches/zip: Add some Doxygen comments, mainly to structs, typedefs, macros and global variables. Many more to go. ------------------------------------------------------------ revno: 0.3.1671 committer: marko timestamp: Mon 2009-05-25 10:52:20 +0000 message: branches/zip: Enclose some #error checks inside #ifndef DOXYGEN to prevent bogus Doxygen errors. ------------------------------------------------------------ revno: 0.3.1670 committer: marko timestamp: Mon 2009-05-25 10:39:07 +0000 message: branches/zip: Revert ut0auxconf_* to r5102, that is, make Doxygen ignore these test programs. ------------------------------------------------------------ revno: 0.3.1669 committer: marko timestamp: Mon 2009-05-25 09:52:29 +0000 message: branches/zip: Add @file comments, and convert decorative /********************************* comments to Doxygen /** style like this: /*****************************//** This conversion was performed by the following command: perl -i -e 'while(){if (m|^/\*{30}\**$|) { s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i ------------------------------------------------------------ revno: 0.3.1668 committer: marko timestamp: Mon 2009-05-25 09:47:14 +0000 message: branches/zip: Add missing file comments. ------------------------------------------------------------ revno: 0.3.1667 committer: marko timestamp: Mon 2009-05-25 08:42:47 +0000 message: branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR. This is to avoid triggering an error in Doxygen. ------------------------------------------------------------ revno: 0.3.1666 committer: marko timestamp: Mon 2009-05-25 08:09:45 +0000 message: branches/zip: Split some long lines that were introduced in r5091. ------------------------------------------------------------ revno: 0.3.1665 committer: marko timestamp: Mon 2009-05-25 05:54:17 +0000 message: branches/zip: Adjust some function comments after r5091. ------------------------------------------------------------ revno: 0.3.1664 committer: marko timestamp: Mon 2009-05-25 05:30:14 +0000 message: branches/zip: Convert the function comments to Doxygen format. This patch was created by running the following commands: for i in */*[ch]; do doxygenify.pl $i; done perl -i -pe 's#\*{3} \*/$#****/#' */*[ch] where doxygenify.pl is https://svn.innodb.com/svn/misc/trunk/tools/doxygenify.pl r510 Verified the consistency as follows: (0) not too many /* in: */ or /* out: */ comments left in the code: grep -l '/\*\s*\(in\|out\)[,:/]' */*[ch] (1) no difference when ignoring blank lines, after stripping all C90-style /* comments */, including multi-line ones, before and after applying this patch: perl -i -e 'undef $/;while(){s#/\*(.*?)\*/##gs;print}' */*[ch] diff -I'^\s*$' --exclude .svn -ru TREE1 TREE2 (2) after stripping @return comments and !<, generated a diff and omitted the hunks where /* out: */ function return comments were removed: perl -i -e'undef $/;while(){s#!<##g;s#\n\@return\t.*?\*/# \*/#gs;print}'\ */*[ch] svn diff| perl -e 'undef $/;$_=<>;s#\n-\s*/\* out[:,]([^\n]*?)(\n-[^\n]*?)*\*/##gs;print' Some unintended changes were left. These will be removed in a subsequent patch. ------------------------------------------------------------ revno: 0.3.1663 committer: vasil timestamp: Thu 2009-05-21 04:27:00 +0000 message: branches/zip: Whitespace fixup. ------------------------------------------------------------ revno: 0.3.1662 committer: marko timestamp: Wed 2009-05-20 20:51:23 +0000 message: branches/zip: Fix some function comments. ------------------------------------------------------------ revno: 0.3.1661 committer: marko timestamp: Wed 2009-05-20 19:17:43 +0000 message: branches/zip: ha_innodb.cc: Add some missing function comments. ------------------------------------------------------------ revno: 0.3.1660 committer: marko timestamp: Wed 2009-05-20 12:17:26 +0000 message: branches/zip: innobase_end(), innobase_flush_logs(): Document the function parameters. ------------------------------------------------------------ revno: 0.3.1659 committer: marko timestamp: Wed 2009-05-20 12:10:17 +0000 message: branches/zip: ut_dulint_sort(): Write proper comments. ------------------------------------------------------------ revno: 0.3.1658 committer: marko timestamp: Wed 2009-05-20 10:45:03 +0000 message: branches/zip: ha_innodb.cc: Clean up some comments. ------------------------------------------------------------ revno: 0.3.1657 committer: marko timestamp: Wed 2009-05-20 10:07:49 +0000 message: branches/zip: innodb_export_status(): Remove the return(0), now that the function was declared void in r5060. ------------------------------------------------------------ revno: 0.3.1656 committer: marko timestamp: Wed 2009-05-20 10:06:59 +0000 message: branches/zip: Clean up some comments. ------------------------------------------------------------ revno: 0.3.1655 committer: marko timestamp: Wed 2009-05-20 09:06:03 +0000 message: branches/zip: Clean up some function comments. ------------------------------------------------------------ revno: 0.3.1654 committer: marko timestamp: Wed 2009-05-20 08:45:17 +0000 message: branches/zip: Remove bogus in: comments from struct members. ------------------------------------------------------------ revno: 0.3.1653 committer: marko timestamp: Wed 2009-05-20 08:35:33 +0000 message: branches/zip: page_cur_lcg_prng(): Add missing parameter list. ------------------------------------------------------------ revno: 0.3.1652 committer: marko timestamp: Wed 2009-05-20 08:32:37 +0000 message: branches/zip: ib_vector_is_empty(): Fix the function comment. ------------------------------------------------------------ revno: 0.3.1651 committer: marko timestamp: Wed 2009-05-20 08:28:44 +0000 message: branches/zip: inno_bcmp(): Remove this memcmp replacement. srv0start.c does not (any longer) call memcmp. srv_parse_megabytes(): Add a function comment. ------------------------------------------------------------ revno: 0.3.1650 committer: marko timestamp: Wed 2009-05-20 08:26:49 +0000 message: branches/zip: ut_snprintf(): Fix the function comments. ------------------------------------------------------------ revno: 0.3.1649 committer: marko timestamp: Wed 2009-05-20 08:19:40 +0000 message: branches/zip: Fix some function comments. ------------------------------------------------------------ revno: 0.3.1648 committer: marko timestamp: Wed 2009-05-20 07:37:08 +0000 message: branches/zip: fil0fil.c: Correct some comments. ------------------------------------------------------------ revno: 0.3.1647 committer: marko timestamp: Wed 2009-05-20 07:11:58 +0000 message: branches/zip: mlog_parse_index(): Correct a parameter comment and add a const qualifier that was missing. ------------------------------------------------------------ revno: 0.3.1646 committer: marko timestamp: Wed 2009-05-20 04:46:01 +0000 message: branches/zip: sync0rw.ic: Remove an extra ; that was added in r5041. ------------------------------------------------------------ revno: 0.3.1645 committer: marko timestamp: Wed 2009-05-20 04:42:12 +0000 message: branches/zip: Add missing function comments. ------------------------------------------------------------ revno: 0.3.1644 committer: marko timestamp: Tue 2009-05-19 19:13:12 +0000 message: branches/zip: ib_wqueue_wait(): Add decorative comment. ------------------------------------------------------------ revno: 0.3.1643 committer: marko timestamp: Tue 2009-05-19 18:59:07 +0000 message: branches/zip: Write PAGE_MAX_TRX_ID to the redo log. Otherwise, transactions that are started before the rollback of incomplete transactions has finished may have an inconsistent view of the secondary indexes. dict_index_is_sec_or_ibuf(): Auxiliary function for controlling updates and checks of PAGE_MAX_TRX_ID: check whether an index is a secondary index or the insert buffer tree. page_set_max_trx_id(), page_update_max_trx_id(), lock_rec_insert_check_and_lock(), lock_sec_rec_modify_check_and_lock(), btr_cur_ins_lock_and_undo(), btr_cur_upd_lock_and_undo(): Add the parameter mtr. page_set_max_trx_id(): Allow mtr to be NULL. When mtr==NULL, do not attempt to write to the redo log. This only occurs when creating a page or reorganizing a compressed page. In these cases, the PAGE_MAX_TRX_ID will be set correctly during the application of redo log records, even though there is no explicit log record about it. btr_discard_only_page_on_level(): Preserve PAGE_MAX_TRX_ID. This function should be unreachable, though. btr_cur_pessimistic_update(): Update PAGE_MAX_TRX_ID. Add some assertions for checking that PAGE_MAX_TRX_ID is set on all secondary index leaf pages. rb://115 tested by Michael, fixes Issue #211 ------------------------------------------------------------ revno: 0.3.1642 committer: marko timestamp: Tue 2009-05-19 09:08:16 +0000 message: branches/zip: Fix a typo that was introduced in r5036. ------------------------------------------------------------ revno: 0.3.1641 committer: marko timestamp: Tue 2009-05-19 09:05:50 +0000 message: branches/zip: Add proper comments to some file page accessors. ------------------------------------------------------------ revno: 0.3.1640 committer: marko timestamp: Tue 2009-05-19 09:04:58 +0000 message: branches/zip: ut0auxconf_have_solaris_atomics.c: Get the function declarations from . Call the functions with proper arguments. ------------------------------------------------------------ revno: 0.3.1639 committer: marko timestamp: Tue 2009-05-19 08:41:32 +0000 message: branches/zip: row_update_prebuilt_trx(): Correct bogus comment. ------------------------------------------------------------ revno: 0.3.1638 committer: marko timestamp: Tue 2009-05-19 07:00:51 +0000 message: branches/zip: Remove bogus out: comments of functions returning void. ------------------------------------------------------------ revno: 0.3.1637 committer: marko timestamp: Tue 2009-05-19 06:30:02 +0000 message: branches/zip: Add missing out: comments to nullary functions. ------------------------------------------------------------ revno: 0.3.1636 committer: marko timestamp: Tue 2009-05-19 06:04:04 +0000 message: branches/zip: os_thread_get_curr_id(), os_thread_get_curr(): Add missing out: comments. ------------------------------------------------------------ revno: 0.3.1635 committer: marko timestamp: Mon 2009-05-18 12:40:07 +0000 message: branches/zip: When executing an optimistic update by delete-and-insert, correctly estimate the free space on the compressed page by page_zip_available(..., create=TRUE). This was reported as Issue #231. btr_cur_update_alloc_zip(): Add the parameter ibool create and pass it to page_zip_available(). The parameter was previously passed as 0. btr_cur_optimistic_update(): Pass create=TRUE to btr_cur_update_alloc_zip(). rb://120 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.1634 committer: marko timestamp: Mon 2009-05-18 12:36:10 +0000 message: branches/zip: Add some missing out: comments to buf0buf.h, buf0buf.c. ------------------------------------------------------------ revno: 0.3.1633 committer: marko timestamp: Mon 2009-05-18 12:29:51 +0000 message: branches/zip: buf_validate(): Add missing out: comment. ------------------------------------------------------------ revno: 0.3.1632 committer: vasil timestamp: Thu 2009-05-14 16:13:41 +0000 message: branches/zip: Add ChangeLog entry for r4994. ------------------------------------------------------------ revno: 0.3.1631 committer: marko timestamp: Thu 2009-05-14 11:31:43 +0000 message: branches/zip: Merge revisions 4976:4994 from branches/5.1: ------------------------------------------------------------------------ r4994 | marko | 2009-05-14 15:04:55 +0300 (Thu, 14 May 2009) | 18 lines branches/5.1: Prevent a race condition in innobase_commit() by ensuring that innodb_commit_concurrency>0 remains constant at run time. (Bug #42101) srv_commit_concurrency: Make this a static variable in ha_innodb.cc. innobase_commit_concurrency_validate(): Check that innodb_commit_concurrency is not changed from or to 0 at run time. This is needed, because innobase_commit() assumes that innodb_commit_concurrency>0 remains constant. Without this limitation, the checks for innodb_commit_concurrency>0 in innobase_commit() should be removed and that function would have to acquire and release commit_cond_m at least twice per invocation. Normally, innodb_commit_concurrency=0, and introducing the mutex operations would mean significant overhead. innodb_bug42101.test, innodb_bug42101-nonzero.test: Test cases. rb://123 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1630 committer: vasil timestamp: Wed 2009-05-13 12:21:55 +0000 message: branches/zip: Add ChangeLog entry for r4977. ------------------------------------------------------------ revno: 0.3.1629 committer: marko timestamp: Wed 2009-05-13 11:49:38 +0000 message: branches/zip: Merge revisions 4746:4976 from branches/5.1: ------------------------------------------------------------------------ r4976 | marko | 2009-05-13 15:44:54 +0300 (Wed, 13 May 2009) | 6 lines branches/5.1: Display DB_ROLL_PTR in the COLUMNS section of the innodb_table_monitor output. It was accidentally omitted due to an off-by-one loop condition. (Bug #44320) rb://116 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1628 committer: marko timestamp: Wed 2009-04-29 19:23:27 +0000 message: branches/zip: Distinguish temporary tables in MLOG_FILE_CREATE. This addresses Mantis Issue #23 in InnoDB Hot Backup and some of MySQL Bug #41609. In MLOG_FILE_CREATE, we need to distinguish temporary tables, so that InnoDB Hot Backup can work correctly. It turns out that we can do this easily, by using a bit of the previously unused parameter for page number. (The page number parameter of MLOG_FILE_CREATE has been written as 0 ever since MySQL 4.1, which introduced MLOG_FILE_CREATE.) MLOG_FILE_FLAG_TEMP: A flag for indicating a temporary table in the page number parameter of MLOG_FILE_ operations. fil_op_write_log(): Add the parameter log_flags. fil_op_log_parse_or_replay(): Add the parameter log_flags. Do not replay MLOG_FILE_CREATE when MLOG_FILE_FLAG_TEMP is set in log_flags. This only affects ibbackup --apply-log. InnoDB itself never replays file operations. rb://117 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.1627 committer: marko timestamp: Wed 2009-04-29 07:51:25 +0000 message: branches/zip: btr_cur_optimistic_insert(): Remove a redundant condition. The insert buffer tree is a clustered index. ------------------------------------------------------------ revno: 0.3.1626 committer: marko timestamp: Mon 2009-04-27 09:40:20 +0000 message: branches/zip: row_scan_and_check_index(): Add some comments on prebuilt->index_usable, as suggested by Michael. ------------------------------------------------------------ revno: 0.3.1625 committer: marko timestamp: Thu 2009-04-23 11:15:07 +0000 message: branches/zip: Correct a misleading comment. PAGE_MAX_TRX_ID will be updated in ibuf_insert_low() and updated from the insert buffer tree page to the secondary index tree page during the insert buffer merge. ------------------------------------------------------------ revno: 0.3.1624 committer: marko timestamp: Thu 2009-04-23 06:40:34 +0000 message: branches/zip: row_scan_and_check_index(): Check row_merge_is_index_usable() earlier, to make the logic clearer. ------------------------------------------------------------ revno: 0.3.1623 committer: marko timestamp: Thu 2009-04-23 06:37:40 +0000 message: branches/zip: row_scan_and_check_index(): Improve the diagnostics, by reporting errors from row_search_for_mysql() in the error log. The errors will still be ignored by CHECK TABLE. This is somewhat related to Issue #211. ------------------------------------------------------------ revno: 0.3.1622 committer: marko timestamp: Thu 2009-04-23 06:22:06 +0000 message: branches/zip: ChangeLog: Add the missing include/ to two files. ------------------------------------------------------------ revno: 0.3.1621 committer: marko timestamp: Thu 2009-04-23 06:21:07 +0000 message: branches/zip: ChangeLog: Document r4893. ------------------------------------------------------------ revno: 0.3.1620 committer: marko timestamp: Thu 2009-04-23 05:32:36 +0000 message: branches/zip: Introduce the logical type names trx_id_t, roll_ptr_t, and undo_no_t. Each type is still defined as dulint. This is an initial step towards replacing dulint with a 64-bit data type. Because modern compilers have no trouble supporting 64-bit arithmetics even on 32-bit targets, the dulint struct is a relic that should go. The last remaining major use of dulint is dictionary IDs (table, index, and row ids). rb://114 approved by Sunny Bains ------------------------------------------------------------ revno: 0.3.1619 committer: marko timestamp: Mon 2009-04-20 12:11:38 +0000 message: branches/zip: Cosmetic fixes. row_unlock_for_mysql(): Add a const qualifier to read-only rec_t*. Use dict_index_is_clust(). CMakeLists.txt: svn propset svn:eol-style native. ------------------------------------------------------------ revno: 0.3.1618 committer: vasil timestamp: Fri 2009-04-17 22:40:47 +0000 message: branches/zip: Add aux config programs to emulate the newly added checks in plug.in (from r4678). ------------------------------------------------------------ revno: 0.3.1617 committer: vasil timestamp: Fri 2009-04-17 22:22:33 +0000 message: branches/zip: Add comment and copyright notice to the aux config program. ------------------------------------------------------------ revno: 0.3.1616 committer: vasil timestamp: Fri 2009-04-17 22:19:03 +0000 message: branches/zip: Rename the aux config program and give it a more specific name because more are coming. ------------------------------------------------------------ revno: 0.3.1615 committer: vasil timestamp: Fri 2009-04-17 21:31:34 +0000 message: branches/zip: Silence a compiler warning. ------------------------------------------------------------ revno: 0.3.1614 committer: vasil timestamp: Fri 2009-04-17 21:30:37 +0000 message: branches/zip: Include the needed header for memset(). ------------------------------------------------------------ revno: 0.3.1613 committer: vasil timestamp: Fri 2009-04-17 21:29:16 +0000 message: branches/zip: Silence warning about unused variables. ------------------------------------------------------------ revno: 0.3.1612 committer: vasil timestamp: Fri 2009-04-17 20:58:08 +0000 message: branches/zip: Add ChangeLog entry for t4748. ------------------------------------------------------------ revno: 0.3.1611 committer: vasil timestamp: Fri 2009-04-17 20:50:09 +0000 message: branches/zip: Merge revisions 4710:4746 from branches/5.1: ------------------------------------------------------------------------ r4746 | vasil | 2009-04-18 00:32:08 +0300 (Sat, 18 Apr 2009) | 110 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/pars0pars.h branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2728.10.2 committer: Ignacio Galarza branch nick: mysql-5.1-bugteam-bug29125 timestamp: Fri 2009-02-13 11:41:47 -0500 message: Bug#29125 Windows Server X64: so many compiler warnings - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length modified: client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlslap.c client/mysqltest.cc client/sql_string.cc extra/comp_err.c extra/yassl/src/buffer.cpp extra/yassl/taocrypt/include/block.hpp extra/yassl/taocrypt/src/algebra.cpp extra/yassl/taocrypt/src/asn.cpp include/config-win.h libmysql/libmysql.c mysys/array.c mysys/base64.c mysys/charset.c mysys/checksum.c mysys/default.c mysys/default_modify.c mysys/hash.c mysys/mf_keycache.c mysys/mf_tempdir.c mysys/my_append.c mysys/my_compress.c mysys/my_conio.c mysys/my_copy.c mysys/my_getwd.c mysys/my_pread.c mysys/my_quick.c mysys/my_read.c mysys/safemalloc.c mysys/string.c server-tools/instance-manager/buffer.cc server-tools/instance-manager/instance.cc server-tools/instance-manager/options.cc server-tools/instance-manager/parse.h sql-common/client.c sql-common/my_user.c sql/event_data_objects.cc sql/event_parse_data.cc sql/events.cc sql/gen_lex_hash.cc sql/item.h sql/item_func.cc sql/item_strfunc.cc sql/item_timefunc.cc sql/lock.cc sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/net_serv.cc sql/sp_head.h sql/spatial.h sql/sql_class.h sql/sql_connect.cc sql/sql_crypt.cc sql/sql_error.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_prepare.cc sql/sql_profile.cc sql/sql_repl.cc sql/sql_servers.cc sql/sql_string.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_udf.cc sql/sql_view.cc sql/udf_example.c sql/uniques.cc storage/archive/azio.c storage/archive/azlib.h storage/csv/ha_tina.cc storage/csv/ha_tina.h storage/csv/transparent_file.h storage/federated/ha_federated.cc storage/federated/ha_federated.h storage/heap/hp_write.c storage/innobase/handler/ha_innodb.cc storage/innobase/include/pars0pars.h storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/mi_packrec.c storage/myisam/mi_search.c storage/myisam/rt_index.c storage/myisammrg/ha_myisammrg.cc strings/ctype.c strings/my_vsnprintf.c tests/bug25714.c tests/mysql_client_test.c ------------------------------------------------------------ revno: 0.3.1610 committer: calvin timestamp: Fri 2009-04-17 04:13:20 +0000 message: branches/zip: minor changes to CMakeLists.txt All are non-functional changes: - should check for long (not int), spotted by Sunny - comment out the project definition, avoiding to generate another .sln file. ------------------------------------------------------------ revno: 0.3.1609 committer: marko timestamp: Thu 2009-04-16 12:02:27 +0000 message: branches/zip: univ.i: Define REFMAN as the base URL of the MySQL Reference Manual and use it in every string. This fixes Issue #221. ------------------------------------------------------------ revno: 0.3.1608 committer: marko timestamp: Thu 2009-04-16 06:32:09 +0000 message: branches/zip: row_scan_and_check_index(): Initialize prebuilt->index_usable. This should have been done in r4631. Spotted by Michael. ------------------------------------------------------------ revno: 0.3.1607 committer: vasil timestamp: Thu 2009-04-16 05:44:48 +0000 message: branches/zip: Add ChangeLog entry for r4717. ------------------------------------------------------------ revno: 0.3.1606 committer: calvin timestamp: Wed 2009-04-15 21:22:35 +0000 message: branches/zip: Use the Windows Interlocked functions for atomic memory access Mapping the atomic operations to Windows Interlocked functions: os_compare_and_swap_* to InterlockedCompareExchange(64) os_atomic_increment_* to InterlockedExchangeAdd(64) os_atomic_test_and_set_byte to InterlockedExchange In this patch, the legacy code under UNIV_CAN_USE_X86_ASSEMBLER is removed all together, and add HAVE_WINDOWS_ATOMICS and INNODB_RW_LOCKS_USE_ATOMICS to CMakeLists.txt This is to address mantis issue#194. rb://113 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1605 committer: vasil timestamp: Wed 2009-04-15 17:36:06 +0000 message: branches/zip: Add ChangeLog entry for r4543. ------------------------------------------------------------ revno: 0.3.1604 committer: vasil timestamp: Wed 2009-04-15 08:39:04 +0000 message: branches/zip: Whitespace cleanup in ChangeLog ------------------------------------------------------------ revno: 0.3.1603 committer: vasil timestamp: Wed 2009-04-15 08:36:57 +0000 message: branches/zip: Fix typo in the ChangeLog ------------------------------------------------------------ revno: 0.3.1602 committer: vasil timestamp: Wed 2009-04-15 08:36:16 +0000 message: branches/zip: Add missing ChangeLog entries ------------------------------------------------------------ revno: 0.3.1601 committer: vasil timestamp: Wed 2009-04-15 08:26:32 +0000 message: branches/zip: Merge revisions 4481:4710 from branches/5.1: (resolving conflict in r4574, r4575 and skipping r4699 and r4705 because analogous changes to r4699 and r4705 were already made to branches/zip) ------------------------------------------------------------------------ r4573 | vasil | 2009-03-30 14:17:13 +0300 (Mon, 30 Mar 2009) | 4 lines Changed paths: M /branches/5.1/mysql-test/innodb.test branches/5.1: Fix email address from dev@innodb.com to innodb_dev_ww@oracle.com ------------------------------------------------------------------------ r4574 | vasil | 2009-03-30 14:27:08 +0300 (Mon, 30 Mar 2009) | 38 lines Changed paths: M /branches/5.1/Makefile.am M /branches/5.1/mysql-test/innodb.test branches/5.1: Restore the state of INNODB_THREAD_CONCURRENCY to silence this warning: TEST RESULT TIME (ms) ------------------------------------------------------------ worker[1] Using MTR_BUILD_THREAD 250, with reserved ports 12500..12509 main.innodb [ pass ] 8803 MTR's internal check of the test case 'main.innodb' failed. This means that the test case does not preserve the state that existed before the test case was executed. Most likely the test case did not do a proper clean-up. This is the diff of the states of the servers before and after the test case was executed: mysqltest: Logging to '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'. mysqltest: Results saved in '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'. mysqltest: Connecting to server localhost:12500 (socket /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ... mysqltest: ... Connected. mysqltest: Start processing test commands from './include/check-testcase.test' ... mysqltest: ... Done processing test commands. --- /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-03-30 14:12:31.000000000 +0300 +++ /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-03-30 14:12:41.000000000 +0300 @@ -99,7 +99,7 @@ INNODB_SUPPORT_XA ON INNODB_SYNC_SPIN_LOOPS 20 INNODB_TABLE_LOCKS ON -INNODB_THREAD_CONCURRENCY 8 +INNODB_THREAD_CONCURRENCY 16 INNODB_THREAD_SLEEP_DELAY 10000 INSERT_ID 0 INTERACTIVE_TIMEOUT 28800 mysqltest: Result content mismatch not ok ------------------------------------------------------------------------ r4575 | vasil | 2009-03-30 15:55:31 +0300 (Mon, 30 Mar 2009) | 8 lines Changed paths: M /branches/5.1/mysql-test/innodb.result M /branches/5.1/mysql-test/innodb.test branches/5.1: Fix Bug#43309 Test main.innodb can't be run twice Make the innodb mysql-test more flexible by inspecting how much a variable of interest has changed since the start of the test. Do not assume the variables have zero values at the start of the test. ------------------------------------------------------------------------ r4576 | vasil | 2009-03-30 16:25:10 +0300 (Mon, 30 Mar 2009) | 4 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Revert a change to Makefile.am that I committed accidentally in c4574. ------------------------------------------------------------------------ r4659 | vasil | 2009-04-06 15:34:51 +0300 (Mon, 06 Apr 2009) | 6 lines Changed paths: M /branches/5.1/mysql-test/innodb.test branches/5.1: Followup to r4575 and the fix of Bug#43309 Test main.innodb can't be run twice: Add an explanatory comment, as suggested by Patrick Crews in the bug report. ------------------------------------------------------------------------ r4699 | vasil | 2009-04-09 14:01:52 +0300 (Thu, 09 Apr 2009) | 15 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/srv0srv.h M /branches/5.1/page/page0cur.c M /branches/5.1/srv/srv0srv.c branches/5.1: Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes of InnoDB table by replacing the PRNG that is used to pick random pages with a better one. This is based on r4670 but also adds a new configuration option and enables the fix only if this option is changed. Please skip the present revision when merging. Approved by: Heikki (via email) ------------------------------------------------------------------------ r4705 | vasil | 2009-04-14 14:30:13 +0300 (Tue, 14 Apr 2009) | 5 lines Changed paths: M /branches/5.1/page/page0cur.c branches/5.1: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------------------ r4710 | vasil | 2009-04-15 11:55:18 +0300 (Wed, 15 Apr 2009) | 25 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL (looks like this is against 5.0 but they later merged it to 5.1): ------------------------------------------------------------ revno: 1810.3846.1 committer: Alexey Botchkov branch nick: 31435 timestamp: Tue 2008-11-11 14:42:32 +0400 message: Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse I think we don't need to issue an error statement in the convert_search_mode_to_innobase(). Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this case depending on the requirements. per-file comments: sql/ha_innodb.cc Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse no error issued in convert_search_mode_to_innobase. ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't supported. modified: sql/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1600 committer: calvin timestamp: Tue 2009-04-14 13:47:31 +0000 message: branches/zip: remove statically linked libraries from mysql To make zlib and strings dynamically linked; mysqld will export additional functions required by InnoDB. Since the symbols will be resolved dynamically during runtime, wdl_load_mapfile() is no longer able to make any function calls to ones in mysqld. As the result, strtoull() (from strings.lib) is replaced with _strtoui64(). rb://111 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1599 committer: vasil timestamp: Tue 2009-04-14 10:32:11 +0000 message: branches/zip: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------ revno: 0.3.1598 committer: calvin timestamp: Mon 2009-04-13 14:20:45 +0000 message: branches/zip: new CMakeLists.txt CMakeLists.txt is completely rewritten with enhancements: - Print out useful information, such as system name, directory, generator used, win64, Microsoft compiler, etc. - Remove one workaround for mysqld.lib location. User does not need to specify a build type when invoking MSVC generator. ------------------------------------------------------------ revno: 0.3.1597 committer: calvin timestamp: Mon 2009-04-13 14:16:44 +0000 message: branches/zip: delete the original CMakeLists.txt A new version will be committed, suggested by Ken. ------------------------------------------------------------ revno: 0.3.1596 committer: calvin timestamp: Fri 2009-04-10 20:37:10 +0000 message: branches/zip: Rewrite CMakeLists.txt CMakeLists.txt is completely rewritten: - To replace the one written by mysql - Print out some useful information, such as system name, directory, generator used, win64, Microsoft compiler, etc. - Remove one workaround for mysqld.lib location. User does not need to specify a build type ------------------------------------------------------------ revno: 0.3.1595 committer: marko timestamp: Wed 2009-04-08 10:24:49 +0000 message: branches/zip: Hide unnecessarily visible globals. dict_ind_redundant, dict_ind_compact: Declare these UNIV_INTERN. innodb_hton_ptr: Declare static. We do not attempt to access the built-in InnoDB any more. trx_roll_savepoints_free(): Declare UNIV_INTERN. ------------------------------------------------------------ revno: 0.3.1594 committer: vasil timestamp: Wed 2009-04-08 09:11:15 +0000 message: branches/zip: Add ChangeLog entry for r4678. ------------------------------------------------------------ revno: 0.3.1593 committer: vasil timestamp: Wed 2009-04-08 09:08:59 +0000 message: branches/zip: Whitespace fixup in the ChangeLog ------------------------------------------------------------ revno: 0.3.1592 committer: inaam timestamp: Tue 2009-04-07 14:45:37 +0000 message: branches/zip Enable atomics on solaris (using the libc functions as defined in atomic.h) if GCC atomic builtins are not present. There still remains some work to be done (by Vasil?). This patch makes changes to plug.in to check pthread_t size and presence of atomic functions when running on solaris. The same has to become a part of the generated Makefile.in when we bake our source. Reviewed by: Heikki rb://106 ------------------------------------------------------------ revno: 0.3.1591 committer: marko timestamp: Tue 2009-04-07 12:19:31 +0000 message: branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676. ------------------------------------------------------------ revno: 0.3.1590 committer: marko timestamp: Tue 2009-04-07 11:45:28 +0000 message: branches/zip: Allow in-place updates of UTF-8 CHAR columns from or to NULL in ROW_FORMAT=REDUNDANT. (Bug #44032) rb://107 approved by Heikki Tuuri. ------------------------------------------------------------ revno: 0.3.1589 committer: vasil timestamp: Tue 2009-04-07 05:37:31 +0000 message: branches/zip: Add ChangeLog entry for r4670. ------------------------------------------------------------ revno: 0.3.1588 committer: vasil timestamp: Tue 2009-04-07 05:35:23 +0000 message: branches/zip: Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes of InnoDB table by replacing the pseudo random number generator with a better one (LCG). This also fixes Mantis Issue#212. Approved by: Heikki (rb://110) ------------------------------------------------------------ revno: 0.3.1587 committer: marko timestamp: Mon 2009-04-06 12:17:30 +0000 message: branches/zip: Initialize innodb_change_buffering from the configuration file. So far, the parameter innodb_change_buffering was only settable by the SET GLOBAL command. Any change specified in the configuration file or on the mysqld command line was ignored. This was reported as Issue #217. rb://109 approved by Heikki Tuuri. ------------------------------------------------------------ revno: 0.3.1586 committer: marko timestamp: Mon 2009-04-06 11:13:45 +0000 message: branches/zip: Remove the bogus failure reported in Issue #219. ------------------------------------------------------------ revno: 0.3.1585 committer: vasil timestamp: Mon 2009-04-06 06:07:26 +0000 message: branches/zip: Fix formatting in ChangeLog to be consistent. ------------------------------------------------------------ revno: 0.3.1584 committer: vasil timestamp: Mon 2009-04-06 06:05:25 +0000 message: branches/zip: Add changelog entry for c4630. ------------------------------------------------------------ revno: 0.3.1583 committer: marko timestamp: Thu 2009-04-02 12:23:12 +0000 message: branches/zip: Refuse to use newly created indexes that may lack history. This addresses Mantis issue #116. dict_index_t: Enable the storage of trx_id. row_prebuilt_t: Make many fields bit-fields to reduce the memory footprint. Add index_usable. ha_innobase::change_active_index(): Check if the index is usable and set prebuilt->index_usable accordingly. Unfortunately, the return status of this function is ignored by MySQL, and the actual refusal to use the index must be made in row_search_for_mysql(). row_search_for_mysql(): Return DB_MISSING_HISTORY if !prebuilt->index_usable. convert_error_code_to_mysql(): Map DB_MISSING_HISTORY to HA_ERR_TABLE_DEF_CHANGED. innodb-index.test: Add a test case where access to a newly created secondary index must be blocked for old transactions. rb://100 approved by Heikki Tuuri ------------------------------------------------------------ revno: 0.3.1582 committer: calvin timestamp: Thu 2009-04-02 11:46:47 +0000 message: branches/zip: Mantis issue #197 - Make srv_spin_wait_delay configurable New parameter innodb_spin_wait_delay to set the maximum delay between polling for a spin lock. 5 is the default. Approved by: Marko (on IM) ------------------------------------------------------------ revno: 0.3.1581 committer: marko timestamp: Tue 2009-03-31 06:40:58 +0000 message: branches/zip: struct read_view_struct: Add clarifying comments about low_limit_id and up_limit_id. ------------------------------------------------------------ revno: 0.3.1580 committer: inaam timestamp: Wed 2009-03-25 17:18:33 +0000 message: branches/zip SHOW ENGINE INNODB MUTEX shows all mutexes and rw_locks. This can be overwhelming particularly when the buffer pool is very large (note that each block in buffer pool has at least one mutex, one rw_lock and an additional mutex if rw_lock does not use atomics). With this patch status of following mutexes and rw-locks is not shown: 1) block->mutex 2) block->lock 3) block->lock->mutex (if applicable) 4) All other mutexes and rw-locks for which number of os-waits are zero Addresses issue# 179 rb://99 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1579 committer: calvin timestamp: Tue 2009-03-24 15:59:45 +0000 message: branches/zip: Mantis issue #201 - remove innodb_plugin_init() due to new option --ignore_builtin_innodb Starting 5.1.33, MySQL has a new option --ignore_builtin_innodb for using the dynamic plugin. It is required to remove innodb_plugin_init() in the plugin. This patch removes innodb_plugin_init() as well as functions, variables used by innodb_plugin_init(). rb://98 Approved by: Marko ------------------------------------------------------------ revno: 0.3.1578 committer: marko timestamp: Tue 2009-03-24 13:46:12 +0000 message: branches/zip: Note that buf_page_t::list and buf_page_t::in_flush_list are only protected by buf_pool_mutex, not by the block mutex. buf_page_release(): Remove the assertion on in_flush_list. The function is only holding block->mutex, not buf_pool_mutex. This was reported by Sunny. This was the only piece of code that accessed in_flush_list while not holding buf_pool_mutex. ------------------------------------------------------------ revno: 0.3.1577 committer: marko timestamp: Tue 2009-03-24 12:02:29 +0000 message: branches/zip: Remove references to UNIV_HOTBACKUP from files that are not used when building InnoDB Hot Backup. Declare innobase_invalidate_query_cache() in ha_prototypes.h. ------------------------------------------------------------ revno: 0.3.1576 committer: calvin timestamp: Mon 2009-03-23 21:15:33 +0000 message: branches/zip: adjust build files on Windows Adjust the patch positions based on the latest MySQL source. Also add the patches to the .bat files for vs9. ------------------------------------------------------------ revno: 0.3.1575 committer: marko timestamp: Mon 2009-03-23 14:21:34 +0000 message: branches/zip: Remove unneeded definitions and dependencies from UNIV_HOTBACKUP builds. ------------------------------------------------------------ revno: 0.3.1574 committer: marko timestamp: Mon 2009-03-23 12:57:45 +0000 message: branches/zip: recv_parse_or_apply_log_rec_body(): Add debug assertions ensuring that FIL_PAGE_TYPE makes sense when applying log records. ------------------------------------------------------------ revno: 0.3.1573 committer: marko timestamp: Mon 2009-03-23 12:05:18 +0000 message: branches/zip: Enclose recv_recovery_from_backup_on and recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE. ------------------------------------------------------------ revno: 0.3.1572 committer: marko timestamp: Mon 2009-03-23 11:00:43 +0000 message: branches/zip: Remove the remaining references to hash_table_t::adapive from UNIV_HOTBACKUP builds. This should have been done in r4515. ------------------------------------------------------------ revno: 0.3.1571 committer: marko timestamp: Mon 2009-03-23 10:20:50 +0000 message: branches/zip: Exclude some operating system interface code from UNIV_HOTBACKUP builds. ------------------------------------------------------------ revno: 0.3.1570 committer: marko timestamp: Mon 2009-03-23 10:05:47 +0000 message: branches/zip: buf_page_print(): Clean up the code #ifdef UNIV_HOTBACKUP. ------------------------------------------------------------ revno: 0.3.1569 committer: marko timestamp: Mon 2009-03-23 09:07:20 +0000 message: branches/zip: Define and use PAGE_ZIP_MATCH. In UNIV_HOTBACKUP builds, assume fixed allocation. ------------------------------------------------------------ revno: 0.3.1568 committer: marko timestamp: Mon 2009-03-23 08:57:16 +0000 message: branches/zip: Define and use ASSERT_HASH_MUTEX_OWN. Make it a no-op in UNIV_HOTBACKUP builds. ------------------------------------------------------------ revno: 0.3.1567 committer: marko timestamp: Mon 2009-03-23 08:49:53 +0000 message: branches/zip: hash_table_t: adaptive: Remove from UNIV_HOTBACKUP builds. ------------------------------------------------------------ revno: 0.3.1566 committer: vasil timestamp: Fri 2009-03-20 14:50:41 +0000 message: branches/zip: Add any entry about the release of 1.0.3 in the ChangeLog. ------------------------------------------------------------ revno: 0.3.1565 committer: marko timestamp: Fri 2009-03-20 13:47:17 +0000 message: branches/zip: fil_init(): Add the parameter hash_size. ------------------------------------------------------------ revno: 0.3.1564 committer: marko timestamp: Fri 2009-03-20 13:10:25 +0000 message: branches/zip: recv_scan_log_recs(): Remove a compile-time constant parameter. ------------------------------------------------------------ revno: 0.3.1563 committer: marko timestamp: Fri 2009-03-20 13:08:05 +0000 message: branches/zip: Non-functional change: Add const qualifiers. log_block_checksum_is_ok_or_old_format(), recv_sys_add_to_parsing_buf(): The log block is read-only. Make it const. ------------------------------------------------------------ revno: 0.3.1562 committer: marko timestamp: Fri 2009-03-20 12:56:19 +0000 message: branches/zip: recv_sys_init(): Remove a compile-time constant parameter. ------------------------------------------------------------ revno: 0.3.1561 committer: marko timestamp: Fri 2009-03-20 12:48:26 +0000 message: branches/zip: recv_recover_page(): Remove compile-time constant parameters. ------------------------------------------------------------ revno: 0.3.1560 committer: marko timestamp: Fri 2009-03-20 12:15:52 +0000 message: branches/zip: innobase_get_at_most_n_mbchars(): Declare in ha_prototypes.h. ------------------------------------------------------------ revno: 0.3.1559 committer: marko timestamp: Fri 2009-03-20 11:51:35 +0000 message: branches/zip: fil0fil.c: Refer to fil_system directly, not via local vars. This eliminates some "unused variable" warnings when building InnoDB Hot Backup in such a way that all mutex operations are no-ops. ------------------------------------------------------------ revno: 0.3.1558 committer: marko timestamp: Fri 2009-03-20 11:24:06 +0000 message: branches/zip: Replace fil_get_space_for_id_low() with fil_space_get_by_id(). ------------------------------------------------------------ revno: 0.3.1557 committer: marko timestamp: Fri 2009-03-20 10:52:14 +0000 message: branches/zip: page_validate(): Always report the space id and the name of the index. In Hot Backup, do not invoke comparison functions, as MySQL collations will be unavailable. ------------------------------------------------------------ revno: 0.3.1556 committer: marko timestamp: Fri 2009-03-20 10:45:18 +0000 message: branches/zip: Add const qualifiers or in/out comments to some function parameters in log0log. ------------------------------------------------------------ revno: 0.3.1555 committer: marko timestamp: Fri 2009-03-20 10:33:33 +0000 message: branches/zip: Non-functional change for reducing dependencies in InnoDB Hot Backup: Replace srv_sys->dummy_ind1 and srv_sys->dummy_ind2 with dict_ind_redundant and dict_ind_compact, initialized in dict_init(). ------------------------------------------------------------ revno: 0.3.1554 committer: marko timestamp: Thu 2009-03-19 13:23:32 +0000 message: branches/zip: Merge revisions 4400:4481 from branches/5.1: ------------------------------------------------------------------------ r4481 | marko | 2009-03-19 15:01:48 +0200 (Thu, 19 Mar 2009) | 6 lines branches/5.1: row_unlock_for_mysql(): Do not unlock records that were modified by the current transaction. This bug was introduced or unmasked in r4400. rb://97 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1553 committer: marko timestamp: Wed 2009-03-18 12:32:13 +0000 message: branches/zip: buf_buddy_free_low(): Correct the function comment. ------------------------------------------------------------ revno: 0.3.1552 committer: marko timestamp: Wed 2009-03-18 10:43:54 +0000 message: branches/zip: buf_LRU_block_remove_hashed_page(): Add some debug assertions. ------------------------------------------------------------ revno: 0.3.1551 committer: vasil timestamp: Wed 2009-03-18 09:53:53 +0000 message: branches/zip: Remove mysql-test/patches/bug41893.diff because that bug has been fixed in the MySQL repository, see http://bugs.mysql.com/41893. ------------------------------------------------------------ revno: 0.3.1550 committer: vasil timestamp: Tue 2009-03-17 13:50:30 +0000 message: branches/zip: Increment the InnoDB Plugin version from 1.0.3 to 1.0.4 now that 1.0.3 has been released. ------------------------------------------------------------ revno: 0.3.1549 committer: marko timestamp: Tue 2009-03-17 10:34:19 +0000 message: branches/zip: buf0buddy.c: Add and adjust some debug assertions. ------------------------------------------------------------ revno: 0.3.1548 committer: vasil timestamp: Tue 2009-03-17 07:38:19 +0000 message: branches/zip: Remove mysql-test/patches/bug32625.diff because that bug was fixed in the mysql repository (1 year and 4 months after sending them the simple patch!). See http://bugs.mysql.com/32625 ------------------------------------------------------------ revno: 0.3.1547 committer: marko timestamp: Mon 2009-03-16 12:12:02 +0000 message: branches/zip: sync_thread_add_level(): Make the assertions about level == SYNC_BUF_BLOCK more readable. ------------------------------------------------------------ revno: 0.3.1546 committer: marko timestamp: Mon 2009-03-16 10:59:25 +0000 message: branches/zip: UT_LIST_VALIDATE(): Assert that the link is non-NULL before dereferencing it. In this way, ut_list_node_313 will be pointing to the last non-NULL list item at the time of the assertion failure. (gcc-4.3.2 -O3 seems to optimize the common subexpressions and make the variable NULL, though.) ------------------------------------------------------------ revno: 0.3.1545 committer: marko timestamp: Mon 2009-03-16 09:43:34 +0000 message: branches/zip: UT_LIST_VALIDATE(): Add the parameter ASSERTION and adjust all callers. ------------------------------------------------------------ revno: 0.3.1544 committer: marko timestamp: Thu 2009-03-12 08:26:40 +0000 message: branches/zip: Merge revisions 4359:4400 from branches/5.1: ------------------------------------------------------------------------ r4399 | marko | 2009-03-12 09:38:05 +0200 (Thu, 12 Mar 2009) | 2 lines branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position also for unlock_row(). (Bug #39320) ------------------------------------------------------------------------ r4400 | marko | 2009-03-12 10:06:44 +0200 (Thu, 12 Mar 2009) | 5 lines branches/5.1: Fix a bug in multi-table semi-consistent reads. Remember the acquired record locks per table handle (row_prebuilt_t) rather than per transaction (trx_t), so that unlock_row should successfully unlock all non-matching rows in multi-table operations. This deficiency was found while investigating Bug #39320. ------------------------------------------------------------------------ These were submitted as rb://94 and rb://96 and approved by Heikki Tuuri. ------------------------------------------------------------ revno: 0.3.1543 committer: marko timestamp: Thu 2009-03-12 07:26:11 +0000 message: branches/zip: trx_sys_create_doublewrite_buf(): As the dummy change, initialize FIL_PAGE_TYPE. This will make it easier to write the debug assertions for ibbackup --apply-log. ------------------------------------------------------------ revno: 0.3.1542 committer: marko timestamp: Thu 2009-03-12 07:22:27 +0000 message: branches/zip: btr_store_big_rec_extern_fields(): Initialize FIL_PAGE_TYPE in a separate redo log entry. This will make ibbackup --apply-log debugging easier. ------------------------------------------------------------ revno: 0.3.1541 committer: calvin timestamp: Mon 2009-03-09 08:10:17 +0000 message: branches/zip: remove compile flag MYSQL_SERVER for dynamic plugin The dynamic plugin on Windows used to be built with MYSQL_SERVER compile flag, while it is not the case for other platforms. r3797 assumed MYSQL_SERVER was not defined for dynamic plugin, which introduced the engine crash during dropping a database. ------------------------------------------------------------ revno: 0.3.1540 committer: vasil timestamp: Thu 2009-03-05 20:31:37 +0000 message: branches/zip: Add ChangeLog entry for the bugfix in c4360. ------------------------------------------------------------ revno: 0.3.1539 committer: vasil timestamp: Thu 2009-03-05 20:29:07 +0000 message: branches/zip: Merge revision 4359 from branches/5.1: ------------------------------------------------------------------------ r4359 | vasil | 2009-03-05 21:42:01 +0200 (Thu, 05 Mar 2009) | 14 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2747 committer: Timothy Smith branch nick: 51 timestamp: Fri 2009-01-16 17:49:07 +0100 message: Add another cast to ignore int/ulong difference in error types, silence warning on Win64 modified: storage/innobase/handler/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1538 committer: vasil timestamp: Thu 2009-03-05 20:27:54 +0000 message: branches/zip: Merge revision 4358 from branches/5.1 (resolving a conflict): ------------------------------------------------------------------------ r4358 | vasil | 2009-03-05 21:21:10 +0200 (Thu, 05 Mar 2009) | 21 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2728.19.1 committer: Alfranio Correia branch nick: mysql-5.1-bugteam timestamp: Tue 2009-02-03 11:36:46 +0000 message: BUG#42445 Warning messages in innobase/handler/ha_innodb.cc There was a type casting problem in the storage/innobase/handler/ha_innodb.cc, (int ha_innobase::write_row(...)). Innobase uses has an internal error variable of type 'ulint' while mysql uses an 'int'. To fix the problem the function manipulates an error variable of type 'ulint' and only casts it into 'int' when needs to return the value. modified: storage/innobase/handler/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1537 committer: vasil timestamp: Thu 2009-03-05 20:23:17 +0000 message: branches/zip: Merge revisions 4287:4357 from branches/5.1: ------------------------------------------------------------------------ r4325 | sunny | 2009-03-02 02:28:52 +0200 (Mon, 02 Mar 2009) | 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Bug#43203: Overflow from auto incrementing causes server segv It was not a SIGSEGV but an assertion failure. The assertion was checking the invariant that *first_value passed in by MySQL doesn't contain a value that is greater than the max value for that type. The assertion has been changed to a check and if the value is greater than the max we report a generic AUTOINC failure. rb://93 Approved by Heikki ------------------------------------------------------------------------ ------------------------------------------------------------ revno: 0.3.1536 committer: vasil timestamp: Thu 2009-03-05 14:38:59 +0000 message: branches/zip: Implement a check whether pthread_t objects can be used by GCC atomic builtin functions. This check is implemented in plug.in and defines the macro HAVE_ATOMIC_PTHREAD_T. This macro is checked in univ.i and the relevant part of the code enabled (the one that uses GCC atomics against pthread_t objects). In addition to this, the same program that is compiled as part of the plug.in check is added in ut/ut0auxconf.c. In the InnoDB Plugin source archives that are shipped to the users, a generated Makefile.in is added. That Makefile.in will be modified to compile ut/ut0auxconf.c and define the macro HAVE_ATOMIC_PTHREAD_T if the compilation succeeds. I.e. Makefile.in will emulate the work that is done by plug.in. This is done in order to make the check happen and HAVE_ATOMIC_PTHREAD_T eventually defined without regenerating MySQL's ./configure from ./storage/innobase/plug.in. The point is not to ask users to install the autotools and regenerate ./configure.