mariadb

Commit Graph

Author	SHA1	Message	Date
Vasil Dimov	41e5a2fb78	Repply changes to storage/innodb_plugin/handler/ha_innodb.cc that were made by MySQL	16 years ago
Sergey Vojtovich	ec271fd3c7	Applying InnoDB snapshot Detailed revision comments: r6897 \| mmakela \| 2010-03-29 11:36:19 +0300 (Mon, 29 Mar 2010) \| 3 lines 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.	16 years ago
Sergey Vojtovich	c16f76bed6	Applying InnoDB snapshot Detailed revision comments: r6858 \| mmakela \| 2010-03-23 14:09:24 +0200 (Tue, 23 Mar 2010) \| 1 line branches/zip: innodb_read_ahead_threshold: Add missing space to help string.	16 years ago
Sergey Vojtovich	4da9286ddd	Applying InnoDB snapshot Detailed revision comments: r6857 \| mmakela \| 2010-03-23 14:07:53 +0200 (Tue, 23 Mar 2010) \| 1 line branches/zip: innodb_change_buffering: Correct the documentation.	16 years ago
Sergey Vojtovich	2b38090990	Applying InnoDB snapshot Detailed revision comments: r6792 \| marko \| 2010-03-10 13:56:41 +0200 (Wed, 10 Mar 2010) \| 1 line branches/zip: Copy tests from branches/5.1 that were lost in some merge. r6793 \| marko \| 2010-03-10 14:02:19 +0200 (Wed, 10 Mar 2010) \| 60 lines 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. ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	1fb843587c	Applying InnoDB snapshot, fixes BUG#51356. Detailed revision comments: r6790 \| jyang \| 2010-03-10 13:09:41 +0200 (Wed, 10 Mar 2010) \| 7 lines 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	16 years ago
Sergey Vojtovich	5676876884	Applying InnoDB snapshot, fixes BUG#51378. Detailed revision comments: r6789 \| jyang \| 2010-03-10 11:18:18 +0200 (Wed, 10 Mar 2010) \| 10 lines 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.	16 years ago
Sergey Vojtovich	7197cab3c7	Applying InnoDB snapshot Detailed revision comments: r6781 \| marko \| 2010-03-09 09:41:08 +0200 (Tue, 09 Mar 2010) \| 4 lines 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	16 years ago
Sergey Vojtovich	385df07603	Applying InnoDB snapshot Detailed revision comments: r6770 \| marko \| 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) \| 12 lines 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	16 years ago
Sergey Vojtovich	44a0ff6c76	Applying InnoDB snapshot Detailed revision comments: r6749 \| vasil \| 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) \| 5 lines 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	16 years ago
Sergey Vojtovich	f64b9eaa4f	Applying InnoDB snapshot Detailed revision comments: r6608 \| marko \| 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) \| 1 line branches/zip: ha_innobase::add_index(): Check for !innodb_table.	16 years ago
Sergey Vojtovich	82f3117eea	Applying InnoDB snapshot Detailed revision comments: r6547 \| marko \| 2010-02-03 14:43:38 +0200 (Wed, 03 Feb 2010) \| 14 lines 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	16 years ago
Sergey Vojtovich	4cba299e29	Applying InnoDB snapshot Detailed revision comments: r6546 \| jyang \| 2010-02-03 11:05:24 +0200 (Wed, 03 Feb 2010) \| 9 lines 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.	16 years ago
Sergey Vojtovich	19448219e1	Applying InnoDB snapshot Detailed revision comments: r6539 \| marko \| 2010-02-01 11:31:12 +0200 (Mon, 01 Feb 2010) \| 75 lines 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 ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	be24a9eaf1	Applying InnoDB snapshot Detailed revision comments: r6533 \| calvin \| 2010-01-29 23:31:59 +0200 (Fri, 29 Jan 2010) \| 4 lines branches/zip: remove duplicated copyright and license info.	16 years ago
Sergey Vojtovich	84d09ccc72	Applying InnoDB snapshot, fixes BUG#47622. Detailed revision comments: r6526 \| jyang \| 2010-01-28 18:12:40 +0200 (Thu, 28 Jan 2010) \| 8 lines 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	16 years ago
Sergey Vojtovich	a8c583f810	Applying InnoDB snapshot Detailed revision comments: r6425 \| marko \| 2010-01-12 13:47:11 +0200 (Tue, 12 Jan 2010) \| 45 lines 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 ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	cbeff93f09	Applying InnoDB snapshot Detailed revision comments: r6348 \| marko \| 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) \| 37 lines branches/zip: Merge a change from MySQL: r6351 \| marko \| 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) \| 1 line branches/zip: Remove an obsolete declaration of LOCK_thread_count. r6352 \| marko \| 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) \| 104 lines 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. ------------------------------------------------------------------------ r6364 \| marko \| 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) \| 4 lines 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.	16 years ago
Sergey Vojtovich	31143f1cf8	Applying InnoDB snapshot, fixes BUG#41609. Detailed revision comments: r6252 \| marko \| 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) \| 23 lines branches/zip: Suppress errors about non-found temporary tables. Write the is_temp flag to SYS_TABLES.MIX_LEN. dict_table_t:🎏 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.	16 years ago
Gleb Shchepa	43d8e02f59	Bug #38883 : thd_security_context is not thread safe, crashes? After-push minor code cleanup for WL 2360: unnecessary external reference to LOCK_thread_count has been removed from ha_innodb.cc.	16 years ago
Satya B	3606e59cfe	Applying InnoDB Plugin 1.0.6 snapshot, Fixes BUG#48469 applied revisions: r6201, r6202, r6207, r6208, r6210 r6202 - port fix for BUG#48469 to plugin Detailed revision comments: r6201 \| marko \| 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) \| 2 lines branches/zip: ha_innobase::add_index(): Clarify the comment on orphaned tables when creating a primary key. r6202 \| jyang \| 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) \| 8 lines 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. r6207 \| vasil \| 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) \| 54 lines 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(). ------------------------------------------------------------------------ r6208 \| vasil \| 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) \| 4 lines branches/zip: Add ChangeLog entry for c6207. r6210 \| vasil \| 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) \| 3 lines branches/zip: Whitespace fixup.	16 years ago
Satya B	1e26b2c26b	Applying InnoDB Plugin 1.0.6 snapshot, part 8. Fixes BUG#48782 applied revisions: r6185, r6186, r6189, r6194 r6185 - only code changes incorporated, changesets which change innodb tests in the main mysql suite are discarded r61889 - Fixes BUG#48782 Detailed revision comments: r6185 \| marko \| 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) \| 16 lines 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 r6186 \| vasil \| 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) \| 4 lines branches/zip: Add ChangeLog entry for r6185. r6189 \| marko \| 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) \| 5 lines 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 r6194 \| vasil \| 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) \| 5 lines 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.	16 years ago
Satya B	444c6d0d73	Applying InnoDB Plugin 1.0.6 snapshot, part 6. Add Testcase for BUG#46676 1. add testcase for BUG#46676 2. Allow CREATE INDEX to be interrupted 3. ha_innobase::change_active_index(): When the history is missing, report it to the client, not to the error log 4. ChangeLog entries appplied revisions:r6169, r6170, r6175, r6177, r6179 Detailed revision comments: r6169 \| calvin \| 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) \| 6 lines 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. r6170 \| marko \| 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) \| 4 lines branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354) rb://183 approved by Heikki Tuuri r6175 \| vasil \| 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) \| 4 lines branches/zip: Wrap line at 78th char in the ChangeLog r6177 \| calvin \| 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) \| 2 lines branches/zip: add an entry to ChangeLog for r6065 r6179 \| marko \| 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) \| 2 lines branches/zip: ha_innobase::change_active_index(): When the history is missing, report it to the client, not to the error log.	16 years ago
Satya B	f77d7aaebb	Applying InnoDB Plugin 1.0.6 snapshot, part 5. applied revisions: r6161, r6162, r6163 Detailed revision comments: r6161 \| vasil \| 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) \| 4 lines branches/zip: Add changelog entry for r6160. r6162 \| vasil \| 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) \| 4 lines branches/zip: Add ChangeLog for r6157. r6163 \| calvin \| 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) \| 8 lines 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).	16 years ago
Satya B	e50e69409b	Applying InnoDB Plugin 1.0.6 snapshot, part 3. Fixes BUG#47167 applied revisions: r6157 Detailed revision comments: r6157 \| jyang \| 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) \| 10 lines 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.	16 years ago
Satya B	54e01f3ce1	Applying InnoDB Plugin 1.0.6 snapshot, part 2. Fixes BUG#32430 Enable partition_innodb_plugin.test for BUG#32430 applied revisions: r6134, r6137, r6153 Detailed revision comments: r6134 \| marko \| 2009-11-04 09:57:29 +0200 (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 r6137 \| marko \| 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) \| 1 line branches/zip: dict_index_too_big_for_undo(): Correct a typo. r6153 \| vasil \| 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) \| 145 lines 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 <vvaintroub@mysql.com> 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. ------------------------------------------------------------------------	16 years ago
MySQL Build Team	eeaedab28a	Patch adjustments	16 years ago
MySQL Build Team	c360a20a40	Patch adjustments	16 years ago
Sergey Vojtovich	f24dd341da	Applying InnoDB plugin snashot Detailed revision comments: r6126 \| vasil \| 2009-10-30 10:36:07 +0200 (Fri, 30 Oct 2009) \| 45 lines 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. ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	976696fe4f	Applying InnoDB plugin snashot Detailed revision comments: r6113 \| vasil \| 2009-10-29 18:15:50 +0200 (Thu, 29 Oct 2009) \| 93 lines 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. ------------------------------------------------------------------------	16 years ago
Sergey Vojtovich	7d263d1072	Applying InnoDB plugin snashot Detailed revision comments: r6100 \| jyang \| 2009-10-22 06:51:07 +0300 (Thu, 22 Oct 2009) \| 6 lines 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.	16 years ago
Sergey Vojtovich	1e09890375	Applying InnoDB plugin snashot Detailed revision comments: r6099 \| jyang \| 2009-10-22 05:58:39 +0300 (Thu, 22 Oct 2009) \| 7 lines 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	16 years ago
Satya B	ef68a99aa2	Applying InnoDB Plugin 1.0.5 snapshot, part 13 1. Undo r6031 btr/btr0btr.c changes 2. apply skipped Plug.in changes and missed revisions Detailed revision comments: r5865 \| vasil \| 2009-09-12 02:26:03 -0500 (Sat, 12 Sep 2009) \| 10 lines 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 r5869 \| vasil \| 2009-09-12 03:33:11 -0500 (Sat, 12 Sep 2009) \| 15 lines 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. r5871 \| vasil \| 2009-09-12 04:25:44 -0500 (Sat, 12 Sep 2009) \| 6 lines 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. r5888 \| vasil \| 2009-09-14 03:38:45 -0500 (Mon, 14 Sep 2009) \| 40 lines 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. ------------------------------------------------------------------------ r5889 \| vasil \| 2009-09-14 04:17:18 -0500 (Mon, 14 Sep 2009) \| 5 lines branches/zip: Add missing return statement in the test program that could have caused a warning. r5893 \| inaam \| 2009-09-14 10:20:48 -0500 (Mon, 14 Sep 2009) \| 10 lines 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 r5537 \| vasil \| 2009-07-21 04:31:26 -0500 (Tue, 21 Jul 2009) \| 5 lines branches/zip: Fixups in ChangeLog: sort filenames alphabetically and wrap to 78 chars per line. r5870 \| vasil \| 2009-09-12 04:13:44 -0500 (Sat, 12 Sep 2009) \| 7 lines 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. r5696 \| vasil \| 2009-08-26 08:15:59 -0500 (Wed, 26 Aug 2009) \| 14 lines 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 r5897 \| marko \| 2009-09-15 03:29:00 -0500 (Tue, 15 Sep 2009) \| 8 lines 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. r5899 \| marko \| 2009-09-15 06:26:01 -0500 (Tue, 15 Sep 2009) \| 4 lines 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.	16 years ago
Satya B	e011c02e2f	Applying InnoDB Plugin 1.0.5 snapshot ,part 12 From r5995 to r6043 Detailed revision comments: r5995 \| marko \| 2009-09-28 03:52:25 -0500 (Mon, 28 Sep 2009) \| 17 lines 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 r5996 \| marko \| 2009-09-28 07:46:02 -0500 (Mon, 28 Sep 2009) \| 4 lines 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. r5997 \| marko \| 2009-09-28 08:03:58 -0500 (Mon, 28 Sep 2009) \| 12 lines 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. r6005 \| vasil \| 2009-09-29 03:09:52 -0500 (Tue, 29 Sep 2009) \| 4 lines branches/zip: ChangeLog: wrap around 78th column, not earlier. r6006 \| vasil \| 2009-09-29 05:15:25 -0500 (Tue, 29 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for the release of 1.0.4. r6007 \| vasil \| 2009-09-29 08:19:59 -0500 (Tue, 29 Sep 2009) \| 6 lines branches/zip: Fix the year, should be 2009. Pointed by: Calvin r6026 \| marko \| 2009-09-30 02:18:24 -0500 (Wed, 30 Sep 2009) \| 1 line branches/zip: Add some debug assertions for checking FSEG_MAGIC_N. r6028 \| marko \| 2009-09-30 08:55:23 -0500 (Wed, 30 Sep 2009) \| 3 lines 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. r6029 \| calvin \| 2009-09-30 15:32:02 -0500 (Wed, 30 Sep 2009) \| 4 lines branches/zip: non-functional changes Fix typo. r6031 \| marko \| 2009-10-01 06:24:33 -0500 (Thu, 01 Oct 2009) \| 49 lines 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); r6033 \| calvin \| 2009-10-01 15:19:46 -0500 (Thu, 01 Oct 2009) \| 4 lines branches/zip: fix a typo in error message Reported as bug#47763. r6043 \| inaam \| 2009-10-05 09:45:35 -0500 (Mon, 05 Oct 2009) \| 12 lines 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	16 years ago
Satya B	8709cea18a	Applying InnoDB Plugin 1.0.5 snapshot, part 11 From revision r5945 to r5994 r5950 - already applied and so skipped Detailed revision comments: r5945 \| calvin \| 2009-09-21 09:53:22 -0500 (Mon, 21 Sep 2009) \| 4 lines branches/zip: fix a type in r5935 Should be innodb_open_files, spotted by Michael. r5951 \| calvin \| 2009-09-22 10:17:01 -0500 (Tue, 22 Sep 2009) \| 4 lines branches/zip: adjust CMake file to work with old versions of MySQL Tested with MySQL 5.1.38 and 5.1.30. r5956 \| calvin \| 2009-09-22 18:30:10 -0500 (Tue, 22 Sep 2009) \| 4 lines branches/zip: remove handler0vars.h from Makefile.am Left over from r5950. r5971 \| marko \| 2009-09-23 08:03:51 -0500 (Wed, 23 Sep 2009) \| 2 lines branches/zip: os_file_pwrite(): Make the code compile in InnoDB Hot Backup when the pwrite system call is not available. r5972 \| marko \| 2009-09-23 14:44:52 -0500 (Wed, 23 Sep 2009) \| 5 lines 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. r5973 \| marko \| 2009-09-23 14:53:21 -0500 (Wed, 23 Sep 2009) \| 2 lines branches/zip: recv_add_to_hash_table(): Simplify obfuscated pointer arithmetics. r5978 \| marko \| 2009-09-24 02:47:56 -0500 (Thu, 24 Sep 2009) \| 1 line branches/zip: Fix warnings and errors when UNIV_HOTBACKUP is defined. r5979 \| marko \| 2009-09-24 05:16:10 -0500 (Thu, 24 Sep 2009) \| 4 lines 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. r5988 \| calvin \| 2009-09-25 14:14:43 -0500 (Fri, 25 Sep 2009) \| 8 lines 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) r5992 \| vasil \| 2009-09-28 02:10:29 -0500 (Mon, 28 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entry for c5988. r5994 \| marko \| 2009-09-28 03:33:59 -0500 (Mon, 28 Sep 2009) \| 17 lines 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.	16 years ago
Satya B	2ad81fd74c	Applying InnoDB Plugin 1.0.5 snapshot, part 10 From r5917 to r5940 Detailed revision comments: r5917 \| marko \| 2009-09-16 04:56:23 -0500 (Wed, 16 Sep 2009) \| 1 line branches/zip: innobase_get_cset_width(): Cache the value of current_thd. r5919 \| vasil \| 2009-09-16 13:37:13 -0500 (Wed, 16 Sep 2009) \| 4 lines branches/zip: Whitespace cleanup in the ChangeLog. r5920 \| vasil \| 2009-09-16 13:47:22 -0500 (Wed, 16 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entries for r5916. r5922 \| marko \| 2009-09-17 01:32:08 -0500 (Thu, 17 Sep 2009) \| 4 lines 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. r5924 \| vasil \| 2009-09-17 23:59:30 -0500 (Thu, 17 Sep 2009) \| 4 lines branches/zip: White space and formatting cleanup in the ChangeLog r5934 \| vasil \| 2009-09-18 12:06:46 -0500 (Fri, 18 Sep 2009) \| 4 lines branches/zip: Fix typo. r5935 \| calvin \| 2009-09-18 16:08:02 -0500 (Fri, 18 Sep 2009) \| 6 lines 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. r5938 \| calvin \| 2009-09-19 02:14:25 -0500 (Sat, 19 Sep 2009) \| 41 lines 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 ------------------------------------------------------------------------ r5940 \| vasil \| 2009-09-21 00:26:04 -0500 (Mon, 21 Sep 2009) \| 4 lines branches/zip: Add ChangeLog entries for c5938.	16 years ago
Satya B	ef6fcca5b1	Applying InnoDB Plugin 1.0.5 snapshot , part 9 r5888 - plug.in related changes skipped r5889 - skipped(plug.in related changes) r5916 - innodb_bug4600.test and innodb_bug44369.test already exists in main suite Detailed revision comments: r5875 \| vasil \| 2009-09-12 07:11:25 -0500 (Sat, 12 Sep 2009) \| 4 lines branches/zip: Remove unnecessary macro. r5888 \| vasil \| 2009-09-14 03:38:45 -0500 (Mon, 14 Sep 2009) \| 40 lines 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. r5910 \| marko \| 2009-09-16 03:07:21 -0500 (Wed, 16 Sep 2009) \| 9 lines 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. r5916 \| marko \| 2009-09-16 04:54:43 -0500 (Wed, 16 Sep 2009) \| 128 lines 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 <satya.bn@sun.com> 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. ------------------------------------------------------------------------	16 years ago
Satya B	7532ad1975	Applying InnoDB Plugin 1.0.5 snapshot, part 7 From revisions r5792 to r5864 Detailed revision comments: r5792 \| vasil \| 2009-09-09 08:35:58 -0500 (Wed, 09 Sep 2009) \| 32 lines 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) r5798 \| calvin \| 2009-09-09 10:28:10 -0500 (Wed, 09 Sep 2009) \| 5 lines 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. r5804 \| marko \| 2009-09-10 00:29:31 -0500 (Thu, 10 Sep 2009) \| 1 line branches/zip: trx_cleanup_at_db_startup(): Fix a typo in comment. r5822 \| marko \| 2009-09-10 05:10:20 -0500 (Thu, 10 Sep 2009) \| 1 line branches/zip: buf_page_release(): De-stutter the function comment. r5825 \| marko \| 2009-09-10 05:47:09 -0500 (Thu, 10 Sep 2009) \| 20 lines 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 r5826 \| marko \| 2009-09-10 06:29:46 -0500 (Thu, 10 Sep 2009) \| 12 lines 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 r5858 \| vasil \| 2009-09-11 12:46:47 -0500 (Fri, 11 Sep 2009) \| 4 lines branches/zip: Fix the indentation of the closing bracket. r5863 \| vasil \| 2009-09-12 02:07:08 -0500 (Sat, 12 Sep 2009) \| 10 lines 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. r5864 \| vasil \| 2009-09-12 02:22:55 -0500 (Sat, 12 Sep 2009) \| 4 lines branches/zip: Include string.h which is needed for memset().	16 years ago
Satya B	abfdf76bbf	Applying InnoDB Plugin 1.0.5 snapshot, part 4 From revision r5703 to r5716 Detailed revision comments: r5703 \| marko \| 2009-08-27 02:25:00 -0500 (Thu, 27 Aug 2009) \| 41 lines 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 1003/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. r5704 \| marko \| 2009-08-27 03:31:17 -0500 (Thu, 27 Aug 2009) \| 32 lines 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 2N. 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. r5705 \| marko \| 2009-08-27 06:56:24 -0500 (Thu, 27 Aug 2009) \| 11 lines 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. r5706 \| inaam \| 2009-08-27 11:00:27 -0500 (Thu, 27 Aug 2009) \| 20 lines 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 r5707 \| inaam \| 2009-08-27 11:20:35 -0500 (Thu, 27 Aug 2009) \| 6 lines branches/zip Remove unused macros as we erased the random readahead code in r5703. Also fixed some comments. r5708 \| inaam \| 2009-08-27 17:43:32 -0500 (Thu, 27 Aug 2009) \| 4 lines branches/zip Remove redundant TRUE : FALSE from the return statement r5709 \| inaam \| 2009-08-28 01:22:46 -0500 (Fri, 28 Aug 2009) \| 5 lines branches/zip rb://152 Disable display of deprecated parameter innodb_file_io_threads in 'show variables'. r5714 \| marko \| 2009-08-31 01:10:10 -0500 (Mon, 31 Aug 2009) \| 5 lines 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. r5716 \| vasil \| 2009-08-31 02:47:49 -0500 (Mon, 31 Aug 2009) \| 9 lines 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)	16 years ago
Satya B	76c1ae946f	Applying InnoDB Plugin 1.0.5 snapshot, part 3 From revision r5686 to r5702 r5696 is already applied Detailed revision comments: r5686 \| vasil \| 2009-08-20 04:15:05 -0500 (Thu, 20 Aug 2009) \| 4 lines branches/zip: White-space fixup. r5687 \| vasil \| 2009-08-20 04:20:22 -0500 (Thu, 20 Aug 2009) \| 8 lines 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. r5694 \| marko \| 2009-08-26 06:25:26 -0500 (Wed, 26 Aug 2009) \| 2 lines branches/zip: buf_page_t: Clarify that bpage->list may contain garbage. This comment was provoked by Inaam. r5695 \| marko \| 2009-08-26 08:14:59 -0500 (Wed, 26 Aug 2009) \| 1 line branches/zip: UNIV_DEBUG_LOCK_VALIDATE: Move the definition to univ.i. r5697 \| vasil \| 2009-08-26 08:44:40 -0500 (Wed, 26 Aug 2009) \| 4 lines branches/zip: Fix typo. r5698 \| inaam \| 2009-08-26 09:34:35 -0500 (Wed, 26 Aug 2009) \| 13 lines 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 r5701 \| marko \| 2009-08-27 02:01:42 -0500 (Thu, 27 Aug 2009) \| 1 line branches/zip: Document r5698 in the ChangeLog. r5702 \| marko \| 2009-08-27 02:03:15 -0500 (Thu, 27 Aug 2009) \| 1 line branches/zip: Document also the files affected by r5698 in the ChangeLog.	16 years ago
Satya B	a907756d21	Applying InnoDB Plugin 1.0.5 snapshot, part 2 From r5639 to r5685 Detailed revision comments: r5639 \| marko \| 2009-08-06 05:39:34 -0500 (Thu, 06 Aug 2009) \| 3 lines 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. r5642 \| calvin \| 2009-08-06 18:04:03 -0500 (Thu, 06 Aug 2009) \| 2 lines branches/zip: remove duplicate "the" in comments. r5662 \| marko \| 2009-08-11 04:54:16 -0500 (Tue, 11 Aug 2009) \| 1 line branches/zip: Bump the version number to 1.0.5 after releasing 1.0.4. r5663 \| marko \| 2009-08-11 06:42:37 -0500 (Tue, 11 Aug 2009) \| 2 lines branches/zip: trx_general_rollback_for_mysql(): Remove the redundant parameter partial. If savept==NULL, partial==FALSE. r5670 \| marko \| 2009-08-12 08:16:37 -0500 (Wed, 12 Aug 2009) \| 2 lines branches/zip: trx_undo_rec_copy(): Add const qualifier to undo_rec. This is a non-functional change. r5671 \| marko \| 2009-08-13 03:46:33 -0500 (Thu, 13 Aug 2009) \| 5 lines 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. r5681 \| sunny \| 2009-08-14 01:16:24 -0500 (Fri, 14 Aug 2009) \| 3 lines branches/zip: When building HotBackup srv_use_sys_malloc is #ifdef out. We move access to the this variable within a !UNIV_HOTBACKUP block. r5684 \| sunny \| 2009-08-20 03:05:30 -0500 (Thu, 20 Aug 2009) \| 10 lines 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. r5685 \| sunny \| 2009-08-20 03:18:29 -0500 (Thu, 20 Aug 2009) \| 2 lines branches/zip: Update the ChangeLog with r5684 change.	16 years ago
Luis Soares	9ae9f84ef4	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. sql/sql_base.cc: Changed the check on decide_logging_format to take into account whether statement is filtered or not in SBR. sql/sql_class.cc: Added the thd_binlog_filter_ok to INNODB_COMPATIBILITY_HOOKS set. storage/innobase/handler/ha_innodb.cc: Extended check in external_lock to take into consideration the filtering when deciding to throw an error. storage/innobase/handler/ha_innodb.h: Added declaration of new hook. storage/innodb_plugin/handler/ha_innodb.cc: Extended check in external_lock to take into consideration the filtering when deciding to throw an error. storage/innodb_plugin/handler/ha_innodb.h: Added declaration of new hook.	16 years ago
Jonathan Perkin	a162954858	Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.	17 years ago
Sergey Vojtovich	94efc1c6b0	Fixed build failure on Win. Reverted lost in the merge line.	17 years ago
Sergey Vojtovich	bae6276d45	Update to innoplug-1.0.4.	17 years ago
Vladislav Vaintroub	768bbae90e	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. storage/innodb_plugin/handler/ha_innodb.cc: Remove a Win32 workaround for current_thd. The original problem that innodb plugin used value of TLS variable across DLL boundaries is solved in MySQL server (current_thd is a function not TLS variable now) storage/innodb_plugin/handler/handler0alter.cc: Remove custom delay loader storage/innodb_plugin/handler/handler0vars.h: Remove custom delay loader storage/innodb_plugin/handler/i_s.cc: Remove custom delay loader storage/innodb_plugin/handler/win_delay_loader.cc: Remove custom delay loader storage/innodb_plugin/plug.in: Remove commented out MYSQL_PLUGIN_STATIC, CMake would not parse that correctly	17 years ago
Satya B	797cc5a739	Compile the Innodb plugin so that it can be installed as dynamic plugin only for now. The Innodb plugin 1.0.4 can be installed dynamically using the 'INSTALL PLUGIN' syntax If mysqld is already statically linked with the inbuilt innodb, it is not possible to install the innodb plugin 1.0.4 dynamically. Doing so would throw this error - Function 'innodb' already exists. storage/innodb_plugin/Makefile.am: Remove references of 'storage/innobase' and use $(srcdir) instead. Renamed the dynamic plugin library name to 'ha_innodb_plugin' so that it can be installed along with inbuilt plugin. storage/innodb_plugin/Makefile.in: Remove this file as it can be generated automatically by automake using the Makefile.am storage/innodb_plugin/handler/ha_innodb.cc: Remove refernces to "storage/innobase" and the headers can be included directly. Declare the plugin with the new name innodb_plugin storage/innodb_plugin/plug.in: Rename the plugin innobase as innodb_plugin	17 years ago
Satya B	3945d5e554	Adding innodb_plugin-1.0.4 as storage/innodb_plugin.	17 years ago

49 Commits (41e5a2fb78d8102ef1fd0650e112e5b1813f313c)