mariadb

Commit Graph

Author	SHA1	Message	Date
Marko Mäkelä	aed761ced5	WIP: MDEV-17603 REPLACE and INSERT…ON DUPLICATE KEY UPDATE are deadlock-prone Implement an alternative fix for the bug whose original fix mysql/mysql-server@c93b0d9a972cb6f98fd445f2b69d924350f9128a in MySQL 5.7.4 caused problems. This is based on mysql/mysql-server@e0e4bacddf421550baca3578bc0db13693874fdb in MySQL 5.7.26. When performing a rollback to the start of the current row operation in REPLACE or INSERT...ON DUPLICATE KEY UPDATE we were not maintaining serializability, because we would release implicit locks that could already have been acquired for some of the indexes. lock_rec_convert_impl_to_expl_for_trx(): Declare globally. undo_node_t::convert_impl_to_expl(): Convert an implicit lock to an explicit one during a partial rollback. row_insert_for_mysql(): Set trx->duplicates=ULINT_UNDEFINED for rolling back the current row operation. This will allow undo_node_t::convert_impl_to_expl() to be effective only for this use case, not for other scenarios, such as rolling back to the start of the statement, or ROLLBACK TO SAVEPOINT. FIXME: Neither innodb.auto_increment_dup,log-bin nor the upstream fix (which we did not add) innodb.iodku pass. While the undo_node_t::convert_impl_to_expl() is working as intended, what happens in innodb.auto_increment_dup,log-bin is that the newly created explicit record lock for the record heap number 6 on the PRIMARY key root page (3) will be released when that record is deleted moments later, with the following stack trace: lock_rec_reset_nth_bit lock_rec_reset_and_release_wait_low lock_rec_reset_and_release_wait lock_update_delete btr_cur_optimistic_delete_func row_undo_ins_remove_clust_rec row_undo_ins row_undo row_undo_step que_thr_step que_run_threads_low que_run_threads trx_rollback_to_savepoint_low trx_rollback_to_savepoint row_mysql_handle_errors row_insert_for_mysql The idea might work with predicate locks, which we do not have. This entire scenario could also be fixed by MDEV-16232, which could allow the entire operation to be protected with page latches.	7 years ago
Marko Mäkelä	ff88e4bb8a	Remove many redundant #include from InnoDB	7 years ago
Marko Mäkelä	8eff803a1b	Revert "MDEV-14705: Do not rollback on InnoDB shutdown" This reverts commit `76ec37f522`. This behaviour change will be done separately in: MDEV-15832 With innodb_fast_shutdown=3, skip the rollback of connected transactions	8 years ago
Marko Mäkelä	76ec37f522	MDEV-14705: Do not rollback on InnoDB shutdown row_undo_step(): If fast shutdown has been requested, abort the rollback of any non-DDL transactions. Starting with MDEV-12323, we aborted the rollback of recovered transactions. These transactions would be rolled back on subsequent server startup. trx_roll_report_progress(): Renamed from trx_roll_must_shutdown(), now that the shutdown check has been moved to the only caller.	8 years ago
Marko Mäkelä	0ba6aaf030	MDEV-11415 Remove excessive undo logging during ALTER TABLE…ALGORITHM=COPY If a crash occurs during ALTER TABLE…ALGORITHM=COPY, InnoDB would spend a lot of time rolling back writes to the intermediate copy of the table. To reduce the amount of busy work done, a work-around was introduced in commit `fd069e2bb3` in MySQL 4.1.8 and 5.0.2, to commit the transaction after every 10,000 inserted rows. A proper fix would have been to disable the undo logging altogether and to simply drop the intermediate copy of the table on subsequent server startup. This is what happens in MariaDB 10.3 with MDEV-14717,MDEV-14585. In MariaDB 10.2, the intermediate copy of the table would be left behind with a name starting with the string #sql. This is a backport of a bug fix from MySQL 8.0.0 to MariaDB, contributed by jixianliang <271365745@qq.com>. Unlike recent MySQL, MariaDB supports ALTER IGNORE. For that operation InnoDB must for now keep the undo logging enabled, so that the latest row can be rolled back in case of an error. In Galera cluster, the LOAD DATA statement will retain the existing behaviour and commit the transaction after every 10,000 rows if the parameter wsrep_load_data_splitting=ON is set. The logic to do so (the wsrep_load_data_split() function and the call handler::extra(HA_EXTRA_FAKE_START_STMT)) are joint work by Ji Xianliang and Marko Mäkelä. The original fix: Author: Thirunarayanan Balathandayuthapani <thirunarayanan.balathandayuth@oracle.com> Date: Wed Dec 2 16:09:15 2015 +0530 Bug#17479594 AVOID INTERMEDIATE COMMIT WHILE DOING ALTER TABLE ALGORITHM=COPY Problem: During ALTER TABLE, we commit and restart the transaction for every 10,000 rows, so that the rollback after recovery would not take so long. Fix: Suppress the undo logging during copy alter operation. If fts_index is present then insert directly into fts auxiliary table rather than doing at commit time. ha_innobase::num_write_row: Remove the variable. ha_innobase::write_row(): Remove the hack for committing every 10000 rows. row_lock_table_for_mysql(): Remove the extra 2 parameters. lock_get_src_table(), lock_is_table_exclusive(): Remove. Reviewed-by: Marko Mäkelä <marko.makela@oracle.com> Reviewed-by: Shaohua Wang <shaohua.wang@oracle.com> Reviewed-by: Jon Olav Hauglid <jon.hauglid@oracle.com>	8 years ago
Marko Mäkelä	b1977a39de	MDEV-12323 Rollback progress log messages during crash recovery are intermixed with unrelated log messages trx_roll_must_shutdown(): During the rollback of recovered transactions, report progress and check if the rollback should be interrupted because of a pending shutdown. trx_roll_max_undo_no, trx_roll_progress_printed_pct: Remove, along with the messages that were interleaved with other messages.	8 years ago
Marko Mäkelä	b46fa627ca	MDEV-12352 InnoDB shutdown should not be blocked by a large transaction rollback row_undo_step(), trx_rollback_active(): Abort the rollback of a recovered ordinary transaction if fast shutdown has been initiated. trx_rollback_resurrected(): Convert an aborted-rollback transaction into a fake XA PREPARE transaction, so that fast shutdown can proceed.	8 years ago
Marko Mäkelä	770231f355	Remove dict_disable_redo_if_temporary() The function dict_disable_redo_if_temporary() was supposed to disable redo logging for temporary tables. It was invoked unnecessarily for two read-only operations: row_undo_search_clust_to_pcur() and dict_stats_update_transient_for_index(). When a table is not temporary and not in the system tablespace, the tablespace should be flagged for MLOG_FILE_NAME logging. We do not need this overhead for temporary tables. Therefore, either mtr_t::set_log_mode() or mtr_t::set_named_space() should be invoked. dict_table_t::is_temporary(): Determine if a table is temporary. dict_table_is_temporary(): Redefined as a macro wrapper for dict_table_t::is_temporary(). dict_disable_redo_if_temporary(): Remove.	8 years ago
Marko Mäkelä	48192f963a	Add the parameter bool leaf to rec_get_offsets() This should affect debug builds only. Debug builds will check that the status bits of ROW_FORMAT!=REDUNDANT records match the is_leaf parameter. The only observable change to non-debug should be the addition of the is_leaf parameter to the function rec_copy_prefix_to_dtuple(), and the removal of some calls to update the adaptive hash index (it is only built for the leaf pages). This change should have been made in MySQL 5.0.3, instead of introducing the status flags in the ROW_FORMAT=COMPACT record header.	8 years ago
Marko Mäkelä	4e1116b2c6	MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL Also, remove empty .ic files that were not removed by my MySQL commit. Problem: InnoDB used to support a compilation mode that allowed to choose whether the function definitions in .ic files are to be inlined or not. This stopped making sense when InnoDB moved to C++ in MySQL 5.6 (and ha_innodb.cc started to #include .ic files), and more so in MySQL 5.7 when inline methods and functions were introduced in .h files. Solution: Remove all references to UNIV_NONINL and UNIV_MUST_NOT_INLINE from all files, assuming that the symbols are never defined. Remove the files fut0fut.cc and ut0byte.cc which only mattered when UNIV_NONINL was defined.	10 years ago
Marko Mäkelä	13e5c9de80	MDEV-12219 Discard temporary undo logs at transaction commit Starting with MySQL 5.7, temporary tables in InnoDB are handled differently from persistent tables. Because temporary tables are private to a connection, concurrency control and multi-versioning (MVCC) are not applicable. For performance reasons, purge is disabled as well. Rollback is supported for temporary tables; that is why we have the temporary undo logs in the first place. Because MVCC and purge are disabled for temporary tables, we should discard all temporary undo logs already at transaction commit, just like we discard the persistent insert_undo logs. Before this change, update_undo logs were being preserved. trx_temp_undo_t: A wrapper for temporary undo logs, comprising a rollback segment and a single temporary undo log. trx_rsegs_t::m_noredo: Use trx_temp_undo_t. (Instead of insert_undo, update_undo, there will be a single undo.) trx_is_noredo_rseg_updated(), trx_is_rseg_assigned(): Remove. trx_undo_add_page(): Remove the parameter undo_ptr. Acquire and release the rollback segment mutex inside the function. trx_undo_free_last_page(): Remove the parameter trx. trx_undo_truncate_end(): Remove the parameter trx, and add the parameter is_temp. Clean up the code a bit. trx_undo_assign_undo(): Split the parameter undo_ptr into rseg, undo. trx_undo_commit_cleanup(): Renamed from trx_undo_insert_cleanup(). Replace the parameter undo_ptr with undo. This will discard the temporary undo or insert_undo log at commit/rollback. trx_purge_add_update_undo_to_history(), trx_undo_update_cleanup(): Remove 3 parameters. Always operate on the persistent update_undo. trx_serialise(): Renamed from trx_serialisation_number_get(). trx_write_serialisation_history(): Simplify the code flow. If there are no persistent changes, do not update MONITOR_TRX_COMMIT_UNDO. trx_commit_in_memory(): Simplify the logic, and add assertions. trx_undo_page_report_modify(): Keep a direct reference to the persistent update_undo log. trx_undo_report_row_operation(): Simplify some code. Always assign TRX_UNDO_INSERT for temporary undo logs. trx_prepare_low(): Keep only one parameter. Prepare all 3 undo logs. trx_roll_try_truncate(): Remove the parameter undo_ptr. Try to truncate all 3 undo logs of the transaction. trx_roll_pop_top_rec_of_trx_low(): Remove. trx_roll_pop_top_rec_of_trx(): Remove the redundant parameter trx->roll_limit. Clear roll_limit when exhausting the undo logs. Consider all 3 undo logs at once, prioritizing the persistent undo logs. row_undo(): Minor cleanup. Let trx_roll_pop_top_rec_of_trx() reset the trx->roll_limit.	9 years ago
Marko Mäkelä	d50cf42bc0	MDEV-9282 Debian: the Lintian complains about "shlib-calls-exit" in ha_innodb.so Replace all exit() calls in InnoDB with abort() [possibly via ut_a()]. Calling exit() in a multi-threaded program is problematic also for the reason that other threads could see corrupted data structures while some data structures are being cleaned up by atexit() handlers or similar. In the long term, all these calls should be replaced with something that returns an error all the way up the call stack.	9 years ago
Jan Lindström	fec844aca8	Merge InnoDB 5.7 from mysql-5.7.14. Contains also: MDEV-10549 mysqld: sql/handler.cc:2692: int handler::ha_index_first(uchar*): Assertion `table_share->tmp_table != NO_TMP_TABLE \|\| m_lock_type != 2' failed. (branch bb-10.2-jan) Unlike MySQL, InnoDB still uses THR_LOCK in MariaDB MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan) enable tests that were fixed in MDEV-10549 MDEV-10548 Some of the debug sync waits do not work with InnoDB 5.7 (branch bb-10.2-jan) fix main.innodb_mysql_sync - re-enable online alter for partitioned innodb tables	9 years ago
Jan Lindström	2e814d4702	Merge InnoDB 5.7 from mysql-5.7.9. Contains also MDEV-10547: Test multi_update_innodb fails with InnoDB 5.7 The failure happened because 5.7 has changed the signature of the bool handler::primary_key_is_clustered() const virtual function ("const" was added). InnoDB was using the old signature which caused the function not to be used. MDEV-10550: Parallel replication lock waits/deadlock handling does not work with InnoDB 5.7 Fixed mutexing problem on lock_trx_handle_wait. Note that rpl_parallel and rpl_optimistic_parallel tests still fail. MDEV-10156 : Group commit tests fail on 10.2 InnoDB (branch bb-10.2-jan) Reason: incorrect merge MDEV-10550: Parallel replication can't sync with master in InnoDB 5.7 (branch bb-10.2-jan) Reason: incorrect merge	9 years ago
Sergei Golubchik	720e04ff67	5.6.31	9 years ago
Sergei Golubchik	6d06fbbd1d	move to storage/innobase	11 years ago
Sergei Golubchik	14a142fca6	move to storage/xtradb	11 years ago
Sergei Golubchik	0175860925	initial commit into innodb-5.6 mergetree	12 years ago
Sergei Golubchik	52c26f7a1f	Percona-Server-5.6.14-rel62.0.tar.gz	12 years ago
Sergei Golubchik	63efc652b5	rename .c -> .cc	12 years ago
Sergei Golubchik	dbd009d661	Percona-Server-5.5.33-rel31.1.tar.gz	12 years ago
Sergei Golubchik	086b54c281	Percona-Server-5.5.30-rel30.1.tar.gz	13 years ago
Sergei Golubchik	a9f12c27c3	Percona-Server-5.5.29-rel30.0.tar.gz	13 years ago
Sergei Golubchik	54ab9ea20f	xtradb 5.5.13	14 years ago
unknown	4f907dc75b	Updated with changes from lp:percona-server/release-5.1.51-12 as of October 19, 2010	15 years ago
unknown	9ec2d5b6e5	Updated with changes from lp:percona-server/release-5.1.49-12 as of September 3, 2010	15 years ago
sbains	af1478e044	branches/innodb+: Factor out srv_threads_mutex from the kernel mutex. Splitting the kernel mutex at once is a complex task, several mutexes will be factored out of it. This is one of the easier ones. This mutex sits below the kernel mutex and is used by the threads infra-structure. It is important for the multi-threaded purge because for multi-threaded purge we will need to activate and use InnoDB task queue and query thread scheduling code. rb://285	16 years ago
sbains	02de8ecfbc	branches/innodb+: Factor out srv_threads_mutex from the kernel mutex. Splitting the kernel mutex at once is a complex task, several mutexes will be factored out of it. This is one of the easier ones. This mutex sits below the kernel mutex and is used by the threads infra-structure. It is important for the multi-threaded purge because for multi-threaded purge we will need to activate and use InnoDB task queue and query thread scheduling code. rb://285	16 years ago
Vasil Dimov	410e23a6af	Move everything into a subdirectory in order to circumvent a bzr merge bug.	16 years ago
Vasil Dimov	3d4ef17d6a	Move everything into a subdirectory in order to circumvent a bzr merge bug.	16 years ago
Vasil Dimov	d587bd4b15	Move everything into a subdirectory xyz/	16 years ago
Vasil Dimov	167b68fecb	Move everything into a subdirectory xyz/	16 years ago
Vasil Dimov	5107604b02	Move everything into a subdir in order to workaround a bzr merge bug: https://bugs.launchpad.net/bzr/+bug/375898	16 years ago
Vasil Dimov	c75d70fdc4	Move everything into a subdir in order to workaround a bzr merge bug: https://bugs.launchpad.net/bzr/+bug/375898	16 years ago
Aleksandr Kuzminsky	222507900c	sync with rev.96	16 years ago
marko	1601bdc38a	branches/innodb+: Merge revisions 5091:5143 from branches/zip: ------------------------------------------------------------------------ r5092 \| marko \| 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Adjust some function comments after r5091. ------------------------------------------------------------------------ r5100 \| marko \| 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Split some long lines that were introduced in r5091. ------------------------------------------------------------------------ r5101 \| marko \| 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR. This is to avoid triggering an error in Doxygen. ------------------------------------------------------------------------ r5102 \| marko \| 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Add missing file comments. ------------------------------------------------------------------------ r5103 \| marko \| 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) \| 10 lines 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(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /[ch] include/univ.i ------------------------------------------------------------------------ r5104 \| marko \| 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Revert ut0auxconf_ to r5102, that is, make Doxygen ignore these test programs. ------------------------------------------------------------------------ r5105 \| marko \| 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Enclose some #error checks inside #ifndef DOXYGEN to prevent bogus Doxygen errors. ------------------------------------------------------------------------ r5106 \| marko \| 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Add some Doxygen comments, mainly to structs, typedefs, macros and global variables. Many more to go. ------------------------------------------------------------------------ r5108 \| marko \| 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) \| 2 lines branches/zip: lexyy.c: Remove the inadvertently added @file directive. There is nothing for Doxygen to see in this file, move along. ------------------------------------------------------------------------ r5125 \| marko \| 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) \| 3 lines branches/zip: Add some Doxygen comments for many structs, typedefs, #defines and global variables. Many are still missing. ------------------------------------------------------------------------ r5134 \| marko \| 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add some Doxygen @return comments. ------------------------------------------------------------------------ r5139 \| marko \| 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add Doxyfile. ------------------------------------------------------------------------ r5143 \| marko \| 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) \| 3 lines 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. ------------------------------------------------------------------------	17 years ago
marko	41b29de7ac	branches/innodb+: Merge revisions 5091:5143 from branches/zip: ------------------------------------------------------------------------ r5092 \| marko \| 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Adjust some function comments after r5091. ------------------------------------------------------------------------ r5100 \| marko \| 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Split some long lines that were introduced in r5091. ------------------------------------------------------------------------ r5101 \| marko \| 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR. This is to avoid triggering an error in Doxygen. ------------------------------------------------------------------------ r5102 \| marko \| 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) \| 1 line branches/zip: Add missing file comments. ------------------------------------------------------------------------ r5103 \| marko \| 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) \| 10 lines 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(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /[ch] include/univ.i ------------------------------------------------------------------------ r5104 \| marko \| 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Revert ut0auxconf_ to r5102, that is, make Doxygen ignore these test programs. ------------------------------------------------------------------------ r5105 \| marko \| 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Enclose some #error checks inside #ifndef DOXYGEN to prevent bogus Doxygen errors. ------------------------------------------------------------------------ r5106 \| marko \| 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) \| 2 lines branches/zip: Add some Doxygen comments, mainly to structs, typedefs, macros and global variables. Many more to go. ------------------------------------------------------------------------ r5108 \| marko \| 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) \| 2 lines branches/zip: lexyy.c: Remove the inadvertently added @file directive. There is nothing for Doxygen to see in this file, move along. ------------------------------------------------------------------------ r5125 \| marko \| 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) \| 3 lines branches/zip: Add some Doxygen comments for many structs, typedefs, #defines and global variables. Many are still missing. ------------------------------------------------------------------------ r5134 \| marko \| 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add some Doxygen @return comments. ------------------------------------------------------------------------ r5139 \| marko \| 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) \| 1 line branches/zip: Add Doxyfile. ------------------------------------------------------------------------ r5143 \| marko \| 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) \| 3 lines 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. ------------------------------------------------------------------------	17 years ago
marko	5727d980b6	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(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /*[ch] include/univ.i	17 years ago
marko	11ff89d994	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(<ARGV>){if (m\|^/\{30}\$\|) { s\|\{4}$\|//*\| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2} print; if(eof){$.=0;undef $com}}' /*[ch] include/univ.i	17 years ago
marko	5f1c5429d7	branches/zip: Split some long lines that were introduced in r5091.	17 years ago
marko	d075e80c49	branches/zip: Split some long lines that were introduced in r5091.	17 years ago
marko	61bddcc89b	branches/innodb+: Merge revisions 5090:5091 from branches/zip: (Ran doxygenify.pl conversion locally, then merged and checked consistency.) ------------------------------------------------------------------------ r5091 \| marko \| 2009-05-25 09:30:14 +0300 (Mon, 25 May 2009) \| 33 lines 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(<ARGV>){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(<ARGV>){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. ------------------------------------------------------------------------	17 years ago
marko	e6c01608be	branches/innodb+: Merge revisions 5090:5091 from branches/zip: (Ran doxygenify.pl conversion locally, then merged and checked consistency.) ------------------------------------------------------------------------ r5091 \| marko \| 2009-05-25 09:30:14 +0300 (Mon, 25 May 2009) \| 33 lines 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(<ARGV>){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(<ARGV>){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. ------------------------------------------------------------------------	17 years ago
marko	e76b873f24	branches/innodb+: Merge revisions 4660:5090 from branches/zip: ------------------------------------------------------------------------ r4670 \| vasil \| 2009-04-07 09:35:23 +0300 (Tue, 07 Apr 2009) \| 11 lines 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) ------------------------------------------------------------------------ r4671 \| vasil \| 2009-04-07 09:37:31 +0300 (Tue, 07 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4670. ------------------------------------------------------------------------ r4673 \| marko \| 2009-04-07 15:45:28 +0300 (Tue, 07 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4677 \| marko \| 2009-04-07 16:19:31 +0300 (Tue, 07 Apr 2009) \| 1 line branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676. ------------------------------------------------------------------------ r4678 \| inaam \| 2009-04-07 18:45:37 +0300 (Tue, 07 Apr 2009) \| 12 lines 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 ------------------------------------------------------------------------ r4687 \| vasil \| 2009-04-08 13:08:59 +0300 (Wed, 08 Apr 2009) \| 4 lines branches/zip: Whitespace fixup in the ChangeLog ------------------------------------------------------------------------ r4688 \| vasil \| 2009-04-08 13:11:15 +0300 (Wed, 08 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4678. ------------------------------------------------------------------------ r4689 \| marko \| 2009-04-08 14:24:49 +0300 (Wed, 08 Apr 2009) \| 5 lines 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. ------------------------------------------------------------------------ r4700 \| calvin \| 2009-04-11 00:37:10 +0300 (Sat, 11 Apr 2009) \| 9 lines 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 ------------------------------------------------------------------------ r4702 \| calvin \| 2009-04-13 18:16:44 +0300 (Mon, 13 Apr 2009) \| 3 lines branches/zip: delete the original CMakeLists.txt A new version will be committed, suggested by Ken. ------------------------------------------------------------------------ r4703 \| calvin \| 2009-04-13 18:20:45 +0300 (Mon, 13 Apr 2009) \| 9 lines 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. ------------------------------------------------------------------------ r4706 \| vasil \| 2009-04-14 14:32:11 +0300 (Tue, 14 Apr 2009) \| 5 lines branches/zip: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------------------ r4707 \| calvin \| 2009-04-14 17:47:31 +0300 (Tue, 14 Apr 2009) \| 13 lines 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 ------------------------------------------------------------------------ r4712 \| vasil \| 2009-04-15 12:26:32 +0300 (Wed, 15 Apr 2009) \| 157 lines 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 <holyfoot@mysql.com> 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4713 \| vasil \| 2009-04-15 12:36:16 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Add missing ChangeLog entries ------------------------------------------------------------------------ r4714 \| vasil \| 2009-04-15 12:36:57 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Fix typo in the ChangeLog ------------------------------------------------------------------------ r4715 \| vasil \| 2009-04-15 12:39:04 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Whitespace cleanup in ChangeLog ------------------------------------------------------------------------ r4716 \| vasil \| 2009-04-15 21:36:06 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4543. ------------------------------------------------------------------------ r4717 \| calvin \| 2009-04-16 01:22:35 +0300 (Thu, 16 Apr 2009) \| 18 lines 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 ------------------------------------------------------------------------ r4720 \| vasil \| 2009-04-16 09:44:48 +0300 (Thu, 16 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4717. ------------------------------------------------------------------------ r4721 \| marko \| 2009-04-16 10:32:09 +0300 (Thu, 16 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Initialize prebuilt->index_usable. This should have been done in r4631. Spotted by Michael. ------------------------------------------------------------------------ r4728 \| marko \| 2009-04-16 16:02:27 +0300 (Thu, 16 Apr 2009) \| 3 lines 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. ------------------------------------------------------------------------ r4733 \| calvin \| 2009-04-17 08:13:20 +0300 (Fri, 17 Apr 2009) \| 6 lines 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. ------------------------------------------------------------------------ r4748 \| vasil \| 2009-04-18 00:50:09 +0300 (Sat, 18 Apr 2009) \| 118 lines 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 <iggy@mysql.com> 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 ------------------------------------------------------------------------ r4749 \| vasil \| 2009-04-18 00:58:08 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for t4748. ------------------------------------------------------------------------ r4751 \| vasil \| 2009-04-18 01:29:16 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Silence warning about unused variables. ------------------------------------------------------------------------ r4752 \| vasil \| 2009-04-18 01:30:37 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Include the needed header for memset(). ------------------------------------------------------------------------ r4753 \| vasil \| 2009-04-18 01:31:34 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Silence a compiler warning. ------------------------------------------------------------------------ r4756 \| vasil \| 2009-04-18 02:19:03 +0300 (Sat, 18 Apr 2009) \| 5 lines branches/zip: Rename the aux config program and give it a more specific name because more are coming. ------------------------------------------------------------------------ r4757 \| vasil \| 2009-04-18 02:22:33 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Add comment and copyright notice to the aux config program. ------------------------------------------------------------------------ r4758 \| vasil \| 2009-04-18 02:40:47 +0300 (Sat, 18 Apr 2009) \| 5 lines branches/zip: Add aux config programs to emulate the newly added checks in plug.in (from r4678). ------------------------------------------------------------------------ r4830 \| marko \| 2009-04-20 16:11:38 +0300 (Mon, 20 Apr 2009) \| 6 lines 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. ------------------------------------------------------------------------ r4893 \| marko \| 2009-04-23 09:32:36 +0300 (Thu, 23 Apr 2009) \| 11 lines 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 ------------------------------------------------------------------------ r4894 \| marko \| 2009-04-23 10:21:07 +0300 (Thu, 23 Apr 2009) \| 1 line branches/zip: ChangeLog: Document r4893. ------------------------------------------------------------------------ r4895 \| marko \| 2009-04-23 10:22:06 +0300 (Thu, 23 Apr 2009) \| 1 line branches/zip: ChangeLog: Add the missing include/ to two files. ------------------------------------------------------------------------ r4896 \| marko \| 2009-04-23 10:37:40 +0300 (Thu, 23 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4897 \| marko \| 2009-04-23 10:40:34 +0300 (Thu, 23 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Check row_merge_is_index_usable() earlier, to make the logic clearer. ------------------------------------------------------------------------ r4898 \| marko \| 2009-04-23 15:15:07 +0300 (Thu, 23 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4915 \| marko \| 2009-04-27 13:40:20 +0300 (Mon, 27 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Add some comments on prebuilt->index_usable, as suggested by Michael. ------------------------------------------------------------------------ r4921 \| marko \| 2009-04-29 11:51:25 +0300 (Wed, 29 Apr 2009) \| 2 lines branches/zip: btr_cur_optimistic_insert(): Remove a redundant condition. The insert buffer tree is a clustered index. ------------------------------------------------------------------------ r4922 \| marko \| 2009-04-29 23:23:27 +0300 (Wed, 29 Apr 2009) \| 22 lines 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 ------------------------------------------------------------------------ r4977 \| marko \| 2009-05-13 15:49:38 +0300 (Wed, 13 May 2009) \| 12 lines 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4978 \| vasil \| 2009-05-13 16:21:55 +0300 (Wed, 13 May 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4977. ------------------------------------------------------------------------ r4995 \| marko \| 2009-05-14 15:31:43 +0300 (Thu, 14 May 2009) \| 24 lines 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5000 \| vasil \| 2009-05-14 20:13:41 +0300 (Thu, 14 May 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4994. ------------------------------------------------------------------------ r5026 \| marko \| 2009-05-18 16:29:51 +0300 (Mon, 18 May 2009) \| 1 line branches/zip: buf_validate(): Add missing out: comment. ------------------------------------------------------------------------ r5027 \| marko \| 2009-05-18 16:36:10 +0300 (Mon, 18 May 2009) \| 1 line branches/zip: Add some missing out: comments to buf0buf.h, buf0buf.c. ------------------------------------------------------------------------ r5028 \| marko \| 2009-05-18 16:40:07 +0300 (Mon, 18 May 2009) \| 11 lines 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 ------------------------------------------------------------------------ r5030 \| marko \| 2009-05-19 10:04:04 +0300 (Tue, 19 May 2009) \| 2 lines branches/zip: os_thread_get_curr_id(), os_thread_get_curr(): Add missing out: comments. ------------------------------------------------------------------------ r5031 \| marko \| 2009-05-19 10:30:02 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Add missing out: comments to nullary functions. ------------------------------------------------------------------------ r5033 \| marko \| 2009-05-19 11:00:51 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Remove bogus out: comments of functions returning void. ------------------------------------------------------------------------ r5034 \| marko \| 2009-05-19 12:41:32 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: row_update_prebuilt_trx(): Correct bogus comment. ------------------------------------------------------------------------ r5035 \| marko \| 2009-05-19 13:04:58 +0300 (Tue, 19 May 2009) \| 3 lines branches/zip: ut0auxconf_have_solaris_atomics.c: Get the function declarations from <atomic.h>. Call the functions with proper arguments. ------------------------------------------------------------------------ r5036 \| marko \| 2009-05-19 13:05:50 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Add proper comments to some file page accessors. ------------------------------------------------------------------------ r5037 \| marko \| 2009-05-19 13:08:16 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Fix a typo that was introduced in r5036. ------------------------------------------------------------------------ r5038 \| marko \| 2009-05-19 22:59:07 +0300 (Tue, 19 May 2009) \| 30 lines 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 ------------------------------------------------------------------------ r5039 \| marko \| 2009-05-19 23:13:12 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: ib_wqueue_wait(): Add decorative comment. ------------------------------------------------------------------------ r5041 \| marko \| 2009-05-20 08:42:12 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Add missing function comments. ------------------------------------------------------------------------ r5042 \| marko \| 2009-05-20 08:46:01 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: sync0rw.ic: Remove an extra ; that was added in r5041. ------------------------------------------------------------------------ r5044 \| marko \| 2009-05-20 11:11:58 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: mlog_parse_index(): Correct a parameter comment and add a const qualifier that was missing. ------------------------------------------------------------------------ r5045 \| marko \| 2009-05-20 11:37:08 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: fil0fil.c: Correct some comments. ------------------------------------------------------------------------ r5046 \| marko \| 2009-05-20 12:19:40 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5047 \| marko \| 2009-05-20 12:26:49 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ut_snprintf(): Fix the function comments. ------------------------------------------------------------------------ r5048 \| marko \| 2009-05-20 12:28:44 +0300 (Wed, 20 May 2009) \| 3 lines branches/zip: inno_bcmp(): Remove this memcmp replacement. srv0start.c does not (any longer) call memcmp. srv_parse_megabytes(): Add a function comment. ------------------------------------------------------------------------ r5052 \| marko \| 2009-05-20 12:32:37 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ib_vector_is_empty(): Fix the function comment. ------------------------------------------------------------------------ r5054 \| marko \| 2009-05-20 12:35:33 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: page_cur_lcg_prng(): Add missing parameter list. ------------------------------------------------------------------------ r5057 \| marko \| 2009-05-20 12:45:17 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Remove bogus in: comments from struct members. ------------------------------------------------------------------------ r5058 \| marko \| 2009-05-20 13:06:03 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Clean up some function comments. ------------------------------------------------------------------------ r5060 \| marko \| 2009-05-20 14:06:59 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Clean up some comments. ------------------------------------------------------------------------ r5061 \| marko \| 2009-05-20 14:07:49 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: innodb_export_status(): Remove the return(0), now that the function was declared void in r5060. ------------------------------------------------------------------------ r5062 \| marko \| 2009-05-20 14:45:03 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ha_innodb.cc: Clean up some comments. ------------------------------------------------------------------------ r5063 \| marko \| 2009-05-20 16:10:17 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ut_dulint_sort(): Write proper comments. ------------------------------------------------------------------------ r5064 \| marko \| 2009-05-20 16:17:26 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: innobase_end(), innobase_flush_logs(): Document the function parameters. ------------------------------------------------------------------------ r5065 \| marko \| 2009-05-20 23:17:43 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ha_innodb.cc: Add some missing function comments. ------------------------------------------------------------------------ r5066 \| marko \| 2009-05-21 00:51:23 +0300 (Thu, 21 May 2009) \| 2 lines branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5070 \| vasil \| 2009-05-21 08:27:00 +0300 (Thu, 21 May 2009) \| 4 lines branches/zip: Whitespace fixup. ------------------------------------------------------------------------	17 years ago
marko	509e761f06	branches/innodb+: Merge revisions 4660:5090 from branches/zip: ------------------------------------------------------------------------ r4670 \| vasil \| 2009-04-07 09:35:23 +0300 (Tue, 07 Apr 2009) \| 11 lines 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) ------------------------------------------------------------------------ r4671 \| vasil \| 2009-04-07 09:37:31 +0300 (Tue, 07 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4670. ------------------------------------------------------------------------ r4673 \| marko \| 2009-04-07 15:45:28 +0300 (Tue, 07 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4677 \| marko \| 2009-04-07 16:19:31 +0300 (Tue, 07 Apr 2009) \| 1 line branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676. ------------------------------------------------------------------------ r4678 \| inaam \| 2009-04-07 18:45:37 +0300 (Tue, 07 Apr 2009) \| 12 lines 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 ------------------------------------------------------------------------ r4687 \| vasil \| 2009-04-08 13:08:59 +0300 (Wed, 08 Apr 2009) \| 4 lines branches/zip: Whitespace fixup in the ChangeLog ------------------------------------------------------------------------ r4688 \| vasil \| 2009-04-08 13:11:15 +0300 (Wed, 08 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4678. ------------------------------------------------------------------------ r4689 \| marko \| 2009-04-08 14:24:49 +0300 (Wed, 08 Apr 2009) \| 5 lines 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. ------------------------------------------------------------------------ r4700 \| calvin \| 2009-04-11 00:37:10 +0300 (Sat, 11 Apr 2009) \| 9 lines 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 ------------------------------------------------------------------------ r4702 \| calvin \| 2009-04-13 18:16:44 +0300 (Mon, 13 Apr 2009) \| 3 lines branches/zip: delete the original CMakeLists.txt A new version will be committed, suggested by Ken. ------------------------------------------------------------------------ r4703 \| calvin \| 2009-04-13 18:20:45 +0300 (Mon, 13 Apr 2009) \| 9 lines 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. ------------------------------------------------------------------------ r4706 \| vasil \| 2009-04-14 14:32:11 +0300 (Tue, 14 Apr 2009) \| 5 lines branches/zip: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------------------ r4707 \| calvin \| 2009-04-14 17:47:31 +0300 (Tue, 14 Apr 2009) \| 13 lines 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 ------------------------------------------------------------------------ r4712 \| vasil \| 2009-04-15 12:26:32 +0300 (Wed, 15 Apr 2009) \| 157 lines 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 <holyfoot@mysql.com> 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4713 \| vasil \| 2009-04-15 12:36:16 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Add missing ChangeLog entries ------------------------------------------------------------------------ r4714 \| vasil \| 2009-04-15 12:36:57 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Fix typo in the ChangeLog ------------------------------------------------------------------------ r4715 \| vasil \| 2009-04-15 12:39:04 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Whitespace cleanup in ChangeLog ------------------------------------------------------------------------ r4716 \| vasil \| 2009-04-15 21:36:06 +0300 (Wed, 15 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4543. ------------------------------------------------------------------------ r4717 \| calvin \| 2009-04-16 01:22:35 +0300 (Thu, 16 Apr 2009) \| 18 lines 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 ------------------------------------------------------------------------ r4720 \| vasil \| 2009-04-16 09:44:48 +0300 (Thu, 16 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4717. ------------------------------------------------------------------------ r4721 \| marko \| 2009-04-16 10:32:09 +0300 (Thu, 16 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Initialize prebuilt->index_usable. This should have been done in r4631. Spotted by Michael. ------------------------------------------------------------------------ r4728 \| marko \| 2009-04-16 16:02:27 +0300 (Thu, 16 Apr 2009) \| 3 lines 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. ------------------------------------------------------------------------ r4733 \| calvin \| 2009-04-17 08:13:20 +0300 (Fri, 17 Apr 2009) \| 6 lines 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. ------------------------------------------------------------------------ r4748 \| vasil \| 2009-04-18 00:50:09 +0300 (Sat, 18 Apr 2009) \| 118 lines 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 <iggy@mysql.com> 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 ------------------------------------------------------------------------ r4749 \| vasil \| 2009-04-18 00:58:08 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Add ChangeLog entry for t4748. ------------------------------------------------------------------------ r4751 \| vasil \| 2009-04-18 01:29:16 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Silence warning about unused variables. ------------------------------------------------------------------------ r4752 \| vasil \| 2009-04-18 01:30:37 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Include the needed header for memset(). ------------------------------------------------------------------------ r4753 \| vasil \| 2009-04-18 01:31:34 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Silence a compiler warning. ------------------------------------------------------------------------ r4756 \| vasil \| 2009-04-18 02:19:03 +0300 (Sat, 18 Apr 2009) \| 5 lines branches/zip: Rename the aux config program and give it a more specific name because more are coming. ------------------------------------------------------------------------ r4757 \| vasil \| 2009-04-18 02:22:33 +0300 (Sat, 18 Apr 2009) \| 4 lines branches/zip: Add comment and copyright notice to the aux config program. ------------------------------------------------------------------------ r4758 \| vasil \| 2009-04-18 02:40:47 +0300 (Sat, 18 Apr 2009) \| 5 lines branches/zip: Add aux config programs to emulate the newly added checks in plug.in (from r4678). ------------------------------------------------------------------------ r4830 \| marko \| 2009-04-20 16:11:38 +0300 (Mon, 20 Apr 2009) \| 6 lines 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. ------------------------------------------------------------------------ r4893 \| marko \| 2009-04-23 09:32:36 +0300 (Thu, 23 Apr 2009) \| 11 lines 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 ------------------------------------------------------------------------ r4894 \| marko \| 2009-04-23 10:21:07 +0300 (Thu, 23 Apr 2009) \| 1 line branches/zip: ChangeLog: Document r4893. ------------------------------------------------------------------------ r4895 \| marko \| 2009-04-23 10:22:06 +0300 (Thu, 23 Apr 2009) \| 1 line branches/zip: ChangeLog: Add the missing include/ to two files. ------------------------------------------------------------------------ r4896 \| marko \| 2009-04-23 10:37:40 +0300 (Thu, 23 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4897 \| marko \| 2009-04-23 10:40:34 +0300 (Thu, 23 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Check row_merge_is_index_usable() earlier, to make the logic clearer. ------------------------------------------------------------------------ r4898 \| marko \| 2009-04-23 15:15:07 +0300 (Thu, 23 Apr 2009) \| 4 lines 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. ------------------------------------------------------------------------ r4915 \| marko \| 2009-04-27 13:40:20 +0300 (Mon, 27 Apr 2009) \| 2 lines branches/zip: row_scan_and_check_index(): Add some comments on prebuilt->index_usable, as suggested by Michael. ------------------------------------------------------------------------ r4921 \| marko \| 2009-04-29 11:51:25 +0300 (Wed, 29 Apr 2009) \| 2 lines branches/zip: btr_cur_optimistic_insert(): Remove a redundant condition. The insert buffer tree is a clustered index. ------------------------------------------------------------------------ r4922 \| marko \| 2009-04-29 23:23:27 +0300 (Wed, 29 Apr 2009) \| 22 lines 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 ------------------------------------------------------------------------ r4977 \| marko \| 2009-05-13 15:49:38 +0300 (Wed, 13 May 2009) \| 12 lines 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4978 \| vasil \| 2009-05-13 16:21:55 +0300 (Wed, 13 May 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4977. ------------------------------------------------------------------------ r4995 \| marko \| 2009-05-14 15:31:43 +0300 (Thu, 14 May 2009) \| 24 lines 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 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5000 \| vasil \| 2009-05-14 20:13:41 +0300 (Thu, 14 May 2009) \| 4 lines branches/zip: Add ChangeLog entry for r4994. ------------------------------------------------------------------------ r5026 \| marko \| 2009-05-18 16:29:51 +0300 (Mon, 18 May 2009) \| 1 line branches/zip: buf_validate(): Add missing out: comment. ------------------------------------------------------------------------ r5027 \| marko \| 2009-05-18 16:36:10 +0300 (Mon, 18 May 2009) \| 1 line branches/zip: Add some missing out: comments to buf0buf.h, buf0buf.c. ------------------------------------------------------------------------ r5028 \| marko \| 2009-05-18 16:40:07 +0300 (Mon, 18 May 2009) \| 11 lines 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 ------------------------------------------------------------------------ r5030 \| marko \| 2009-05-19 10:04:04 +0300 (Tue, 19 May 2009) \| 2 lines branches/zip: os_thread_get_curr_id(), os_thread_get_curr(): Add missing out: comments. ------------------------------------------------------------------------ r5031 \| marko \| 2009-05-19 10:30:02 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Add missing out: comments to nullary functions. ------------------------------------------------------------------------ r5033 \| marko \| 2009-05-19 11:00:51 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Remove bogus out: comments of functions returning void. ------------------------------------------------------------------------ r5034 \| marko \| 2009-05-19 12:41:32 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: row_update_prebuilt_trx(): Correct bogus comment. ------------------------------------------------------------------------ r5035 \| marko \| 2009-05-19 13:04:58 +0300 (Tue, 19 May 2009) \| 3 lines branches/zip: ut0auxconf_have_solaris_atomics.c: Get the function declarations from <atomic.h>. Call the functions with proper arguments. ------------------------------------------------------------------------ r5036 \| marko \| 2009-05-19 13:05:50 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Add proper comments to some file page accessors. ------------------------------------------------------------------------ r5037 \| marko \| 2009-05-19 13:08:16 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: Fix a typo that was introduced in r5036. ------------------------------------------------------------------------ r5038 \| marko \| 2009-05-19 22:59:07 +0300 (Tue, 19 May 2009) \| 30 lines 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 ------------------------------------------------------------------------ r5039 \| marko \| 2009-05-19 23:13:12 +0300 (Tue, 19 May 2009) \| 1 line branches/zip: ib_wqueue_wait(): Add decorative comment. ------------------------------------------------------------------------ r5041 \| marko \| 2009-05-20 08:42:12 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Add missing function comments. ------------------------------------------------------------------------ r5042 \| marko \| 2009-05-20 08:46:01 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: sync0rw.ic: Remove an extra ; that was added in r5041. ------------------------------------------------------------------------ r5044 \| marko \| 2009-05-20 11:11:58 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: mlog_parse_index(): Correct a parameter comment and add a const qualifier that was missing. ------------------------------------------------------------------------ r5045 \| marko \| 2009-05-20 11:37:08 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: fil0fil.c: Correct some comments. ------------------------------------------------------------------------ r5046 \| marko \| 2009-05-20 12:19:40 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5047 \| marko \| 2009-05-20 12:26:49 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ut_snprintf(): Fix the function comments. ------------------------------------------------------------------------ r5048 \| marko \| 2009-05-20 12:28:44 +0300 (Wed, 20 May 2009) \| 3 lines branches/zip: inno_bcmp(): Remove this memcmp replacement. srv0start.c does not (any longer) call memcmp. srv_parse_megabytes(): Add a function comment. ------------------------------------------------------------------------ r5052 \| marko \| 2009-05-20 12:32:37 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ib_vector_is_empty(): Fix the function comment. ------------------------------------------------------------------------ r5054 \| marko \| 2009-05-20 12:35:33 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: page_cur_lcg_prng(): Add missing parameter list. ------------------------------------------------------------------------ r5057 \| marko \| 2009-05-20 12:45:17 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Remove bogus in: comments from struct members. ------------------------------------------------------------------------ r5058 \| marko \| 2009-05-20 13:06:03 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Clean up some function comments. ------------------------------------------------------------------------ r5060 \| marko \| 2009-05-20 14:06:59 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: Clean up some comments. ------------------------------------------------------------------------ r5061 \| marko \| 2009-05-20 14:07:49 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: innodb_export_status(): Remove the return(0), now that the function was declared void in r5060. ------------------------------------------------------------------------ r5062 \| marko \| 2009-05-20 14:45:03 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ha_innodb.cc: Clean up some comments. ------------------------------------------------------------------------ r5063 \| marko \| 2009-05-20 16:10:17 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ut_dulint_sort(): Write proper comments. ------------------------------------------------------------------------ r5064 \| marko \| 2009-05-20 16:17:26 +0300 (Wed, 20 May 2009) \| 2 lines branches/zip: innobase_end(), innobase_flush_logs(): Document the function parameters. ------------------------------------------------------------------------ r5065 \| marko \| 2009-05-20 23:17:43 +0300 (Wed, 20 May 2009) \| 1 line branches/zip: ha_innodb.cc: Add some missing function comments. ------------------------------------------------------------------------ r5066 \| marko \| 2009-05-21 00:51:23 +0300 (Thu, 21 May 2009) \| 2 lines branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5070 \| vasil \| 2009-05-21 08:27:00 +0300 (Thu, 21 May 2009) \| 4 lines branches/zip: Whitespace fixup. ------------------------------------------------------------------------	17 years ago
marko	8ab5601eea	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(<ARGV>){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(<ARGV>){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.	17 years ago
marko	e49dee377b	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(<ARGV>){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(<ARGV>){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.	17 years ago
marko	6bcd59e3b2	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	17 years ago
marko	e9a3aa18c8	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	17 years ago
Vadim Tkachenko	107072563d	porting to 1.0.3	17 years ago

19 Commits (aed761ced539bf5481f8358dfd7ca599da39273b)