mirror of
https://github.com/MariaDB/server.git
synced 2025-01-27 01:04:19 +01:00
4f1d044053
------------------------------------------------------------------------ r4152 | marko | 2009-02-10 12:52:27 +0200 (Tue, 10 Feb 2009) | 12 lines branches/zip: When innodb_use_sys_malloc is set, ignore innodb_additional_mem_pool_size, because nothing will be allocated from mem_comm_pool. mem_pool_create(): Remove the assertion about size. The function will work with any size. However, an assertion would fail in ut_malloc_low() when size==0. mem_init(): When srv_use_sys_malloc is set, pass size=1 to mem_pool_create(). mem0mem.c: Add #include "srv0srv.h" that is needed by mem0dbg.c. ------------------------------------------------------------------------ r4153 | vasil | 2009-02-10 22:58:17 +0200 (Tue, 10 Feb 2009) | 14 lines branches/zip: (followup to r4145) Non-functional change: Change the os_atomic_increment() and os_compare_and_swap() functions to macros to avoid artificial limitations on the types of those functions' arguments. As a consequence typecasts from the source code can be removed. Also remove Google's copyright from os0sync.ic because that file no longer contains code from Google. Approved by: Marko (rb://88), also ok from Inaam via IM ------------------------------------------------------------------------ r4163 | marko | 2009-02-12 00:14:19 +0200 (Thu, 12 Feb 2009) | 4 lines branches/zip: Make innodb_thread_concurrency=0 the default. The old default was 8. ------------------------------------------------------------------------ r4169 | calvin | 2009-02-12 10:37:10 +0200 (Thu, 12 Feb 2009) | 3 lines branches/zip: Adjust the result file of innodb_thread_concurrency_basic test. The default value of innodb_thread_concurrency is changed to 0 (from 8) via r4163. ------------------------------------------------------------------------ r4174 | vasil | 2009-02-12 17:38:27 +0200 (Thu, 12 Feb 2009) | 4 lines branches/zip: Fix pathname of the file to patch. ------------------------------------------------------------------------ r4176 | vasil | 2009-02-13 10:06:31 +0200 (Fri, 13 Feb 2009) | 7 lines branches/zip: Fix the failing mysql-test partition_innodb, which failed only if run after innodb_trx_weight (or other test that would leave LATEST DEADLOCK ERROR into the output of SHOW ENGINE INNODB STATUS). Find further explanation for the failure at the top of the added patch partition_innodb.diff. ------------------------------------------------------------------------ r4198 | vasil | 2009-02-17 09:06:07 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: Add the full text of the GPLv2 license into the root directory of the plugin. In previous releases this file was copied from an external source (https://svn.innodb.com/svn/plugin/trunk/support/COPYING) "manually" when creating the source and binary archives. It is less confusing to have this present in the root directory of the SVN branch. ------------------------------------------------------------------------ r4199 | vasil | 2009-02-17 09:11:58 +0200 (Tue, 17 Feb 2009) | 4 lines branches/zip: Add Google's license into COPYING.Google. ------------------------------------------------------------------------ r4200 | vasil | 2009-02-17 09:56:33 +0200 (Tue, 17 Feb 2009) | 11 lines branches/zip: To the files touched by the Google patch from c4144 (excluding include/os0sync.ic because later we removed Google code from that file): * Remove the Google license * Remove old Innobase copyright lines * Add a reference to the Google license and to the GPLv2 license at the top, as recommended by the lawyers at Oracle Legal. ------------------------------------------------------------------------ r4201 | vasil | 2009-02-17 10:12:02 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 1/28] ------------------------------------------------------------------------ r4202 | vasil | 2009-02-17 10:15:06 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 2/28] ------------------------------------------------------------------------ r4203 | vasil | 2009-02-17 10:25:45 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 3/28] ------------------------------------------------------------------------ r4204 | vasil | 2009-02-17 10:55:41 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 4/28] ------------------------------------------------------------------------ r4205 | vasil | 2009-02-17 10:59:22 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 5/28] ------------------------------------------------------------------------ r4206 | vasil | 2009-02-17 11:02:27 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 6/28] ------------------------------------------------------------------------ r4207 | vasil | 2009-02-17 11:04:28 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 7/28] ------------------------------------------------------------------------ r4208 | vasil | 2009-02-17 11:06:49 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 8/28] ------------------------------------------------------------------------ r4209 | vasil | 2009-02-17 11:10:18 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 9/28] ------------------------------------------------------------------------ r4210 | vasil | 2009-02-17 11:12:41 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 10/28] ------------------------------------------------------------------------ r4211 | vasil | 2009-02-17 11:14:40 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 11/28] ------------------------------------------------------------------------ r4212 | vasil | 2009-02-17 11:18:35 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 12/28] ------------------------------------------------------------------------ r4213 | vasil | 2009-02-17 11:24:40 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 13/28] ------------------------------------------------------------------------ r4214 | vasil | 2009-02-17 11:27:31 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 13/28] ------------------------------------------------------------------------ r4215 | vasil | 2009-02-17 11:29:55 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 15/28] ------------------------------------------------------------------------ r4216 | vasil | 2009-02-17 11:33:38 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 16/28] ------------------------------------------------------------------------ r4217 | vasil | 2009-02-17 11:36:44 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 17/28] ------------------------------------------------------------------------ r4218 | vasil | 2009-02-17 11:39:11 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 18/28] ------------------------------------------------------------------------ r4219 | vasil | 2009-02-17 11:41:24 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 19/28] ------------------------------------------------------------------------ r4220 | vasil | 2009-02-17 11:43:50 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 20/28] ------------------------------------------------------------------------ r4221 | vasil | 2009-02-17 11:46:52 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 21/28] ------------------------------------------------------------------------ r4222 | vasil | 2009-02-17 11:50:12 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 22/28] ------------------------------------------------------------------------ r4223 | vasil | 2009-02-17 11:53:58 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 23/28] ------------------------------------------------------------------------ r4224 | vasil | 2009-02-17 12:01:41 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 24/28] ------------------------------------------------------------------------ r4225 | vasil | 2009-02-17 12:05:45 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 25/28] ------------------------------------------------------------------------ r4226 | vasil | 2009-02-17 12:09:16 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 26/28] ------------------------------------------------------------------------ r4227 | vasil | 2009-02-17 12:12:56 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 27/28] ------------------------------------------------------------------------ r4228 | vasil | 2009-02-17 12:14:04 +0200 (Tue, 17 Feb 2009) | 8 lines branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 28/28] ------------------------------------------------------------------------ r4229 | vasil | 2009-02-17 12:30:55 +0200 (Tue, 17 Feb 2009) | 4 lines branches/zip: Add the copyright notice to the non C files. ------------------------------------------------------------------------ r4231 | marko | 2009-02-17 14:26:53 +0200 (Tue, 17 Feb 2009) | 12 lines Minor cleanup of the Google SMP patch. sync_array_object_signalled(): Add a (void) cast to eliminate a gcc warning about the return value of os_atomic_increment() being ignored. rw_lock_create_func(): Properly indent the preprocessor directives. rw_lock_x_lock_low(), rw_lock_x_lock_func_nowait(): Split lines correctly. rw_lock_set_writer_id_and_recursion_flag(): Silence a Valgrind warning. Do not mix statements and variable declarations. ------------------------------------------------------------------------ r4232 | marko | 2009-02-17 14:59:54 +0200 (Tue, 17 Feb 2009) | 3 lines branches/zip: When assigning lock->recursive = FALSE, also flag lock->writer_thread invalid, so that Valgrind will catch more errors. This is related to Issue #175. ------------------------------------------------------------------------ r4242 | marko | 2009-02-18 17:01:09 +0200 (Wed, 18 Feb 2009) | 2 lines branches/zip: UT_DBG_STOP: Use do{} while(0) to silence a g++-4.3.2 warning about a while(0); statement. This should fix (part of) Issue #176. ------------------------------------------------------------------------ r4243 | marko | 2009-02-18 17:04:03 +0200 (Wed, 18 Feb 2009) | 3 lines branches/zip: buf_buddy_get_slot(): Fix a gcc 4.3.2 warning about an empty body of a "for" statement. This fixes part of Issue #176. ------------------------------------------------------------------------ r4244 | marko | 2009-02-18 17:25:45 +0200 (Wed, 18 Feb 2009) | 11 lines branches/zip: Protect ut_total_allocated_memory with ut_list_mutex. Unprotected updates to ut_total_allocated_memory in os_mem_alloc_large() and os_mem_free_large(), called during fast index creation, may corrupt the variable and cause assertion failures. Also, add UNIV_MEM_ALLOC() and UNIV_MEM_FREE() instrumentation around os_mem_alloc_large() and os_mem_free_large(), so that Valgrind can detect more errors. rb://90 approved by Heikki Tuuri. This addresses Issue #177. ------------------------------------------------------------------------ r4248 | marko | 2009-02-19 11:52:39 +0200 (Thu, 19 Feb 2009) | 2 lines branches/zip: page_zip_set_size(): Fix a g++ 4.3.2 warning about an empty body in a "for" statement. This closes Issue #176. ------------------------------------------------------------------------ r4251 | inaam | 2009-02-19 15:46:27 +0200 (Thu, 19 Feb 2009) | 8 lines branches/zip: Issue #178 rb://91 Change plug.in to have same CXXFLAGS as CFLAGS. This is to ensure that both .c and .cc files get compiled with same flags. To fix the issue where UNIV_LINUX was defined only in .c files. Approved by: Marko ------------------------------------------------------------------------ r4258 | vasil | 2009-02-20 11:52:19 +0200 (Fri, 20 Feb 2009) | 7 lines branches/zip: Cleanup in ChangeLog: * Wrap lines at 78 characters * Changed files are listed alphabetically * White-space cleanup ------------------------------------------------------------------------ r4259 | vasil | 2009-02-20 11:59:42 +0200 (Fri, 20 Feb 2009) | 6 lines branches/zip: ChangeLog: Remove include/os0sync.ic from the entry about the google patch, this file was modified later to not include Google's code. ------------------------------------------------------------------------ r4262 | vasil | 2009-02-20 14:56:59 +0200 (Fri, 20 Feb 2009) | 373 lines branches/zip: Merge revisions 4035:4261 from branches/5.1: ------------------------------------------------------------------------ r4065 | sunny | 2009-01-29 16:01:36 +0200 (Thu, 29 Jan 2009) | 8 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: In the last round of AUTOINC cleanup we assumed that AUTOINC is only defined for integer columns. This caused an assertion failure when we checked for the maximum value of a column type. We now calculate the max value for floating-point autoinc columns too. Fix Bug#42400 - InnoDB autoinc code can't handle floating-point columns rb://84 and Mantis issue://162 ------------------------------------------------------------------------ r4111 | sunny | 2009-02-03 22:06:52 +0200 (Tue, 03 Feb 2009) | 2 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Add the ULL suffix otherwise there is an overflow. ------------------------------------------------------------------------ r4128 | vasil | 2009-02-08 21:36:45 +0200 (Sun, 08 Feb 2009) | 18 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2709.20.31 committer: Timothy Smith <timothy.smith@sun.com> branch nick: 51 timestamp: Fri 2008-12-19 01:28:51 +0100 message: Disable part of innodb-autoinc.test, because the MySQL server asserts when compiled --with-debug, due to bug 39828, "autoinc wraps around when offset and increment > 1". This change should be reverted when that bug is fixed (and a a few other minor changes to the test as described in comments). modified: mysql-test/r/innodb-autoinc.result mysql-test/t/innodb-autoinc.test ------------------------------------------------------------------------ r4129 | vasil | 2009-02-08 21:54:25 +0200 (Sun, 08 Feb 2009) | 310 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Merge a change from MySQL: [looks like the changes to innodb-autoinc.test were made as part of the following huge merge, but we are merging only changes to that file] ------------------------------------------------------------ revno: 2546.47.1 committer: Luis Soares <luis.soares@sun.com> branch nick: 5.1-rpl timestamp: Fri 2009-01-23 13:22:05 +0100 message: merge: 5.1 -> 5.1-rpl conflicts: Text conflict in client/mysqltest.cc Text conflict in mysql-test/include/wait_until_connected_again.inc Text conflict in mysql-test/lib/mtr_report.pm Text conflict in mysql-test/mysql-test-run.pl Text conflict in mysql-test/r/events_bugs.result Text conflict in mysql-test/r/log_state.result Text conflict in mysql-test/r/myisam_data_pointer_size_func.result Text conflict in mysql-test/r/mysqlcheck.result Text conflict in mysql-test/r/query_cache.result Text conflict in mysql-test/r/status.result Text conflict in mysql-test/suite/binlog/r/binlog_index.result Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result Text conflict in mysql-test/suite/rpl/r/rpl_packet.result Text conflict in mysql-test/suite/rpl/t/rpl_packet.test Text conflict in mysql-test/t/disabled.def Text conflict in mysql-test/t/events_bugs.test Text conflict in mysql-test/t/log_state.test Text conflict in mysql-test/t/myisam_data_pointer_size_func.test Text conflict in mysql-test/t/mysqlcheck.test Text conflict in mysql-test/t/query_cache.test Text conflict in mysql-test/t/rpl_init_slave_func.test Text conflict in mysql-test/t/status.test removed: mysql-test/suite/parts/r/partition_bit_ndb.result mysql-test/suite/parts/t/partition_bit_ndb.test mysql-test/suite/parts/t/partition_sessions.test mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test mysql-test/t/log_bin_trust_function_creators_func-master.opt mysql-test/t/rpl_init_slave_func-slave.opt added: mysql-test/include/check_events_off.inc mysql-test/include/cleanup_fake_relay_log.inc mysql-test/include/have_simple_parser.inc mysql-test/include/no_running_event_scheduler.inc mysql-test/include/no_running_events.inc mysql-test/include/running_event_scheduler.inc mysql-test/include/setup_fake_relay_log.inc mysql-test/include/wait_condition_sp.inc mysql-test/r/fulltext_plugin.result mysql-test/r/have_simple_parser.require mysql-test/r/innodb_bug38231.result mysql-test/r/innodb_bug39438.result mysql-test/r/innodb_mysql_rbk.result mysql-test/r/partition_innodb_semi_consistent.result mysql-test/r/query_cache_28249.result mysql-test/r/status2.result mysql-test/std_data/bug40482-bin.000001 mysql-test/suite/binlog/r/binlog_innodb_row.result mysql-test/suite/binlog/t/binlog_innodb_row.test mysql-test/suite/rpl/r/rpl_binlog_corruption.result mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt mysql-test/suite/rpl/t/rpl_binlog_corruption.test mysql-test/suite/sys_vars/r/tmp_table_size_basic.result mysql-test/suite/sys_vars/t/tmp_table_size_basic.test mysql-test/t/fulltext_plugin-master.opt mysql-test/t/fulltext_plugin.test mysql-test/t/innodb_bug38231.test mysql-test/t/innodb_bug39438-master.opt mysql-test/t/innodb_bug39438.test mysql-test/t/innodb_mysql_rbk-master.opt mysql-test/t/innodb_mysql_rbk.test mysql-test/t/partition_innodb_semi_consistent-master.opt mysql-test/t/partition_innodb_semi_consistent.test mysql-test/t/query_cache_28249.test mysql-test/t/status2.test renamed: mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test modified: .bzr-mysql/default.conf CMakeLists.txt client/mysql.cc client/mysql_upgrade.c client/mysqlcheck.c client/mysqltest.cc configure.in extra/resolve_stack_dump.c extra/yassl/include/openssl/ssl.h include/config-win.h include/m_ctype.h include/my_global.h mysql-test/extra/binlog_tests/database.test mysql-test/extra/rpl_tests/rpl_auto_increment.test mysql-test/include/commit.inc mysql-test/include/have_32bit.inc mysql-test/include/have_64bit.inc mysql-test/include/index_merge1.inc mysql-test/include/linux_sys_vars.inc mysql-test/include/windows_sys_vars.inc mysql-test/lib/mtr_report.pm mysql-test/mysql-test-run.pl mysql-test/r/alter_table.result mysql-test/r/commit_1innodb.result mysql-test/r/create.result mysql-test/r/csv.result mysql-test/r/ctype_ucs.result mysql-test/r/date_formats.result mysql-test/r/events_bugs.result mysql-test/r/events_scheduling.result mysql-test/r/fulltext.result mysql-test/r/func_if.result mysql-test/r/func_in.result mysql-test/r/func_str.result mysql-test/r/func_time.result mysql-test/r/grant.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/innodb-autoinc.result mysql-test/r/innodb.result mysql-test/r/innodb_mysql.result mysql-test/r/log_bin_trust_function_creators_func.result mysql-test/r/log_state.result mysql-test/r/myisampack.result mysql-test/r/mysql.result mysql-test/r/mysqlcheck.result mysql-test/r/partition_datatype.result mysql-test/r/partition_mgm.result mysql-test/r/partition_pruning.result mysql-test/r/query_cache.result mysql-test/r/read_buffer_size_basic.result mysql-test/r/read_rnd_buffer_size_basic.result mysql-test/r/rpl_init_slave_func.result mysql-test/r/select.result mysql-test/r/status.result mysql-test/r/strict.result mysql-test/r/temp_table.result mysql-test/r/type_bit.result mysql-test/r/type_date.result mysql-test/r/type_float.result mysql-test/r/warnings_engine_disabled.result mysql-test/r/xml.result mysql-test/suite/binlog/r/binlog_database.result mysql-test/suite/binlog/r/binlog_index.result mysql-test/suite/binlog/r/binlog_innodb.result mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result mysql-test/suite/binlog/t/binlog_innodb.test mysql-test/suite/funcs_1/r/is_columns_is.result mysql-test/suite/funcs_1/r/is_engines.result mysql-test/suite/funcs_1/r/storedproc.result mysql-test/suite/funcs_1/storedproc/param_check.inc mysql-test/suite/funcs_2/t/disabled.def mysql-test/suite/ndb/t/disabled.def mysql-test/suite/parts/r/partition_bit_innodb.result mysql-test/suite/parts/r/partition_bit_myisam.result mysql-test/suite/parts/r/partition_special_innodb.result mysql-test/suite/parts/t/disabled.def mysql-test/suite/parts/t/partition_special_innodb.test mysql-test/suite/parts/t/partition_value_innodb.test mysql-test/suite/parts/t/partition_value_myisam.test mysql-test/suite/parts/t/partition_value_ndb.test mysql-test/suite/rpl/r/rpl_auto_increment.result mysql-test/suite/rpl/r/rpl_packet.result mysql-test/suite/rpl/r/rpl_row_create_table.result mysql-test/suite/rpl/r/rpl_slave_skip.result mysql-test/suite/rpl/r/rpl_trigger.result mysql-test/suite/rpl/t/disabled.def mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_row_create_table.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_trigger.test mysql-test/suite/rpl_ndb/t/disabled.def mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result mysql-test/t/alter_table.test mysql-test/t/create.test mysql-test/t/csv.test mysql-test/t/ctype_ucs.test mysql-test/t/date_formats.test mysql-test/t/disabled.def mysql-test/t/events_bugs.test mysql-test/t/events_scheduling.test mysql-test/t/fulltext.test mysql-test/t/func_if.test mysql-test/t/func_in.test mysql-test/t/func_str.test mysql-test/t/func_time.test mysql-test/t/grant.test mysql-test/t/information_schema.test mysql-test/t/innodb-autoinc.test mysql-test/t/innodb.test mysql-test/t/innodb_mysql.test mysql-test/t/log_bin_trust_function_creators_func.test mysql-test/t/log_state.test mysql-test/t/myisam_data_pointer_size_func.test mysql-test/t/myisampack.test mysql-test/t/mysql.test mysql-test/t/mysqlcheck.test mysql-test/t/partition_innodb_stmt.test mysql-test/t/partition_mgm.test mysql-test/t/partition_pruning.test mysql-test/t/query_cache.test mysql-test/t/rpl_init_slave_func.test mysql-test/t/select.test mysql-test/t/status.test mysql-test/t/strict.test mysql-test/t/temp_table.test mysql-test/t/type_bit.test mysql-test/t/type_date.test mysql-test/t/type_float.test mysql-test/t/warnings_engine_disabled.test mysql-test/t/xml.test mysys/my_getopt.c mysys/my_init.c scripts/mysql_install_db.sh sql-common/my_time.c sql/field.cc sql/field.h sql/filesort.cc sql/ha_partition.cc sql/ha_partition.h sql/item.cc sql/item_cmpfunc.cc sql/item_func.h sql/item_strfunc.cc sql/item_sum.cc sql/item_timefunc.cc sql/item_timefunc.h sql/log.cc sql/log.h sql/log_event.cc sql/log_event.h sql/mysql_priv.h sql/mysqld.cc sql/opt_range.cc sql/partition_info.cc sql/repl_failsafe.cc sql/rpl_constants.h sql/set_var.cc sql/slave.cc sql/spatial.h sql/sql_acl.cc sql/sql_base.cc sql/sql_binlog.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_delete.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_locale.cc sql/sql_parse.cc sql/sql_partition.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_profile.cc sql/sql_repl.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_trigger.h sql/table.cc sql/table.h sql/unireg.cc storage/csv/ha_tina.cc storage/federated/ha_federated.cc storage/heap/ha_heap.cc storage/innobase/Makefile.am storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0mem.c storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/innobase/include/btr0sea.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0mem.h storage/innobase/include/ha_prototypes.h storage/innobase/include/lock0lock.h storage/innobase/include/row0mysql.h storage/innobase/include/sync0sync.ic storage/innobase/include/ut0ut.h storage/innobase/lock/lock0lock.c storage/innobase/os/os0file.c storage/innobase/plug.in storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/ut/ut0ut.c storage/myisam/ft_boolean_search.c strings/ctype.c strings/xml.c tests/mysql_client_test.c win/configure.js mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test ------------------------------------------------------------------------ r4165 | calvin | 2009-02-12 01:34:27 +0200 (Thu, 12 Feb 2009) | 1 line Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: minor non-functional changes. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4263 | vasil | 2009-02-20 15:00:46 +0200 (Fri, 20 Feb 2009) | 4 lines branches/zip: Add a ChangeLog entry for a change in r4262. ------------------------------------------------------------------------ r4265 | marko | 2009-02-20 22:31:03 +0200 (Fri, 20 Feb 2009) | 5 lines branches/zip: Make innodb_use_sys_malloc=ON the default. Replace srv_use_sys_malloc with UNIV_LIKELY(srv_use_sys_malloc) to improve branch prediction in the default case. Approved by Ken over the IM. ------------------------------------------------------------------------ r4266 | vasil | 2009-02-20 23:29:32 +0200 (Fri, 20 Feb 2009) | 7 lines branches/zip: Add a sentence at the top of COPYING.Google to clarify that this license does not apply to the whole InnoDB. Suggested by: Ken ------------------------------------------------------------------------ r4268 | marko | 2009-02-23 12:43:51 +0200 (Mon, 23 Feb 2009) | 9 lines branches/zip: Initialize ut_list_mutex at startup. Without this fix, ut_list_mutex would be used uninitialized when innodb_use_sys_malloc=1. This fix addresses Issue #181. ut_mem_block_list_init(): Rename to ut_mem_init() and make public. ut_malloc_low(), ut_free_all_mem(): Add ut_a(ut_mem_block_list_inited). mem_init(): Call ut_mem_init(). ------------------------------------------------------------------------ r4269 | marko | 2009-02-23 15:09:49 +0200 (Mon, 23 Feb 2009) | 7 lines branches/zip: When freeing an uncompressed BLOB page, tolerate garbage in FIL_PAGE_TYPE. (Bug #43043, Issue #182) btr_check_blob_fil_page_type(): New function. btr_free_externally_stored_field(), btr_copy_blob_prefix(): Call btr_check_blob_fil_page_type() to check FIL_PAGE_TYPE. ------------------------------------------------------------------------ r4272 | marko | 2009-02-23 23:10:18 +0200 (Mon, 23 Feb 2009) | 8 lines branches/zip: Adjust the fix of Issue #182 in r4269 per Inaam's suggestion. btr_check_blob_fil_page_type(): Replace the parameter const char* op with ibool read. Do not print anything about page type mismatch when reading a BLOB page in Antelope format. Print space id before page number. ------------------------------------------------------------------------ r4273 | marko | 2009-02-24 00:11:11 +0200 (Tue, 24 Feb 2009) | 1 line branches/zip: ut_mem_init(): Add the assertion !ut_mem_block_list_inited. ------------------------------------------------------------------------ r4274 | marko | 2009-02-24 00:14:38 +0200 (Tue, 24 Feb 2009) | 12 lines branches/zip: Fix bugs in the fix of Issue #181. Tested inside and outside Valgrind, with innodb_use_sys_malloc set to 0 and 1. mem_init(): Invoke ut_mem_init() before mem_pool_create(), because the latter one will invoke ut_malloc(). srv_general_init(): Do not initialize the memory subsystem (mem_init()). innobase_init(): Initialize the memory subsystem (mem_init()) before calling srv_parse_data_file_paths_and_sizes(), which needs ut_malloc(). Call ut_free_all_mem() in error handling to clean up after the mem_init(). ------------------------------------------------------------------------ r4280 | marko | 2009-02-24 15:14:59 +0200 (Tue, 24 Feb 2009) | 1 line branches/zip: Remove unused function os_mem_alloc_nocache(). ------------------------------------------------------------------------ r4281 | marko | 2009-02-24 16:02:48 +0200 (Tue, 24 Feb 2009) | 1 line branches/zip: Remove the unused function dict_index_get_type(). ------------------------------------------------------------------------ r4283 | marko | 2009-02-24 23:06:56 +0200 (Tue, 24 Feb 2009) | 1 line branches/zip: srv0start.c: Remove unnecessary #include "mem0pool.h". ------------------------------------------------------------------------ r4284 | marko | 2009-02-24 23:26:38 +0200 (Tue, 24 Feb 2009) | 1 line branches/zip: mem0mem.c: Remove unnecessary #include "mach0data.h". ------------------------------------------------------------------------ r4288 | vasil | 2009-02-25 10:48:07 +0200 (Wed, 25 Feb 2009) | 21 lines branches/zip: Merge revisions 4261:4287 from branches/5.1: ------------------------------------------------------------------------ r4287 | sunny | 2009-02-25 05:32:01 +0200 (Wed, 25 Feb 2009) | 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Fix Bug#42714 AUTO_INCREMENT errors in 5.1.31. There are two changes to the autoinc handling. 1. To fix the immediate problem from the bug report, we must ensure that the value written to the table is always less than the max value stored in dict_table_t. 2. The second related change is that according to MySQL documentation when the offset is greater than the increment, we should ignore the offset. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4289 | vasil | 2009-02-25 10:53:51 +0200 (Wed, 25 Feb 2009) | 4 lines branches/zip: Add ChangeLog entry for the fix in r4288. ------------------------------------------------------------------------ r4290 | vasil | 2009-02-25 11:05:44 +0200 (Wed, 25 Feb 2009) | 11 lines branches/zip: Make ChangeLog entries for bugs in bugs.mysql.com in the form: Fix Bug#12345 bug title (for bugs after 1.0.2 was released and the ChangeLog published) There is no need to bloat the ChangeLog with information that is available via bugs.mysql.com. Discussed with: Marko ------------------------------------------------------------------------ r4291 | vasil | 2009-02-25 11:08:32 +0200 (Wed, 25 Feb 2009) | 4 lines branches/zip: Fix Bug synopsis and remove explanation ------------------------------------------------------------------------ r4292 | marko | 2009-02-25 12:09:15 +0200 (Wed, 25 Feb 2009) | 25 lines branches/zip: Correct the initialization of the memory subsystem once again, to finally put Issue #181 to rest. Revert some parts of r4274. It is best not to call ut_malloc() before srv_general_init(). mem_init(): Do not call ut_mem_init(). srv_general_init(): Initialize the memory subsystem in two phases: first ut_mem_init(), then mem_init(). This is because os_sync_init() and sync_init() depend on ut_mem_init() and mem_init() depends on os_sync_init() or sync_init(). srv_parse_data_file_paths_and_sizes(), srv_parse_log_group_home_dirs(): Remove the output parameters. Assign to the global variables directly. Allocate memory with malloc() instead of ut_malloc(), because these functions will be called before srv_general_init(). srv_free_paths_and_sizes(): New function, for cleaning up after srv_parse_data_file_paths_and_sizes() and srv_parse_log_group_home_dirs(). rb://92 approved by Sunny Bains ------------------------------------------------------------------------ r4297 | vasil | 2009-02-25 17:19:19 +0200 (Wed, 25 Feb 2009) | 4 lines branches/zip: White-space cleanup in the ChangeLog ------------------------------------------------------------------------ r4301 | vasil | 2009-02-25 21:33:32 +0200 (Wed, 25 Feb 2009) | 5 lines branches/zip: Do not output the commands that restore the environment because they depend on the state of the environment before the test starts executing. ------------------------------------------------------------------------ r4315 | vasil | 2009-02-26 09:21:20 +0200 (Thu, 26 Feb 2009) | 5 lines branches/zip: Apply any necessary patches to the mysql tree at the end of setup.sh This step was previously done manually (and sometimes forgotten). ------------------------------------------------------------------------ r4319 | marko | 2009-02-26 23:27:51 +0200 (Thu, 26 Feb 2009) | 6 lines branches/zip: btr_check_blob_fil_page_type(): Do not report FIL_PAGE_TYPE mismatch even when purging a BLOB. Heavy users may have large data files created with MySQL 5.0 or earlier, and they don not want to have the error log flooded with such messages. This fixes Issue #182. ------------------------------------------------------------------------ r4320 | inaam | 2009-02-27 02:13:19 +0200 (Fri, 27 Feb 2009) | 8 lines branches/zip This is to revert the changes made to the plug.in (r4251) as a fix for issue# 178. Changes to plug.in will not propogate to a plugin installation unless autotools are rerun which is unacceptable. A fix for issue# 178 will be committed in a separate commit. ------------------------------------------------------------------------ r4321 | inaam | 2009-02-27 02:16:46 +0200 (Fri, 27 Feb 2009) | 6 lines branches/zip This is a fix for issue#178. Instead of using UNIV_LINUX which is defined through CFLAGS we use compiler generated define __linux__ that is effective for both .c and .cc files. ------------------------------------------------------------------------ r4324 | vasil | 2009-02-27 13:27:18 +0200 (Fri, 27 Feb 2009) | 39 lines branches/zip: Add FreeBSD to the list of the operating systems that have sizeof(pthread_t) == sizeof(void*) (i.e. word size). On FreeBSD pthread_t is defined like: /usr/include/sys/_pthreadtypes.h: typedef struct pthread *pthread_t; I did the following tests (per Inaam's recommendation): a) appropriate version of GCC is available on that platform (4.1.2 or higher for atomics to be available) On FreeBSD 6.x the default compiler is 3.4.6, on FreeBSD 7.x the default one is 4.2.1. One can always install the version of choice from the ports collection. If gcc 3.x is used then HAVE_GCC_ATOMIC_BUILTINS will not be defined and thus the change I am committing will make no difference. b) find out if sizeof(pthread_t) == sizeof(long) On 32 bit both are 4 bytes, on 64 bit both are 8 bytes. c) find out the compiler generated platform define (e.g.: __aix, __sunos__ etc.) The macro is __FreeBSD__. d) patch univ.i with the appropriate platform define e) build the mysql f) ensure it is using atomic builtins (look at the err.log message at system startup. It should say we are using atomics for both mutexes and rw-locks) g) do sanity testing (keeping in view the smp changes) I ran the mysql-test suite. All tests pass. ------------------------------------------------------------------------ r4353 | vasil | 2009-03-05 09:27:29 +0200 (Thu, 05 Mar 2009) | 6 lines branches/zip: As suggested by Ken, print a message that says that the Google SMP patch (GCC atomics) is disabled if it is. Also extend the message when the patch is partially enabled to make it clear that it is partially enabled. ------------------------------------------------------------------------ r4356 | vasil | 2009-03-05 13:49:51 +0200 (Thu, 05 Mar 2009) | 4 lines branches/zip: Fix typo made in r4353. ------------------------------------------------------------------------ r4357 | vasil | 2009-03-05 16:38:59 +0200 (Thu, 05 Mar 2009) | 23 lines branches/zip: Implement a check whether pthread_t objects can be used by GCC atomic builtin functions. This check is implemented in plug.in and defines the macro HAVE_ATOMIC_PTHREAD_T. This macro is checked in univ.i and the relevant part of the code enabled (the one that uses GCC atomics against pthread_t objects). In addition to this, the same program that is compiled as part of the plug.in check is added in ut/ut0auxconf.c. In the InnoDB Plugin source archives that are shipped to the users, a generated Makefile.in is added. That Makefile.in will be modified to compile ut/ut0auxconf.c and define the macro HAVE_ATOMIC_PTHREAD_T if the compilation succeeds. I.e. Makefile.in will emulate the work that is done by plug.in. This is done in order to make the check happen and HAVE_ATOMIC_PTHREAD_T eventually defined without regenerating MySQL's ./configure from ./storage/innobase/plug.in. The point is not to ask users to install the autotools and regenerate ./configure. rb://95 Approved by: Marko ------------------------------------------------------------------------ r4360 | vasil | 2009-03-05 22:23:17 +0200 (Thu, 05 Mar 2009) | 21 lines branches/zip: Merge revisions 4287:4357 from branches/5.1: ------------------------------------------------------------------------ r4325 | sunny | 2009-03-02 02:28:52 +0200 (Mon, 02 Mar 2009) | 10 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Bug#43203: Overflow from auto incrementing causes server segv It was not a SIGSEGV but an assertion failure. The assertion was checking the invariant that *first_value passed in by MySQL doesn't contain a value that is greater than the max value for that type. The assertion has been changed to a check and if the value is greater than the max we report a generic AUTOINC failure. rb://93 Approved by Heikki ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4361 | vasil | 2009-03-05 22:27:54 +0200 (Thu, 05 Mar 2009) | 30 lines branches/zip: Merge revision 4358 from branches/5.1 (resolving a conflict): ------------------------------------------------------------------------ r4358 | vasil | 2009-03-05 21:21:10 +0200 (Thu, 05 Mar 2009) | 21 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2728.19.1 committer: Alfranio Correia <alfranio.correia@sun.com> branch nick: mysql-5.1-bugteam timestamp: Tue 2009-02-03 11:36:46 +0000 message: BUG#42445 Warning messages in innobase/handler/ha_innodb.cc There was a type casting problem in the storage/innobase/handler/ha_innodb.cc, (int ha_innobase::write_row(...)). Innobase uses has an internal error variable of type 'ulint' while mysql uses an 'int'. To fix the problem the function manipulates an error variable of type 'ulint' and only casts it into 'int' when needs to return the value. modified: storage/innobase/handler/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4362 | vasil | 2009-03-05 22:29:07 +0200 (Thu, 05 Mar 2009) | 23 lines branches/zip: Merge revision 4359 from branches/5.1: ------------------------------------------------------------------------ r4359 | vasil | 2009-03-05 21:42:01 +0200 (Thu, 05 Mar 2009) | 14 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2747 committer: Timothy Smith <timothy.smith@sun.com> branch nick: 51 timestamp: Fri 2009-01-16 17:49:07 +0100 message: Add another cast to ignore int/ulong difference in error types, silence warning on Win64 modified: storage/innobase/handler/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4363 | vasil | 2009-03-05 22:31:37 +0200 (Thu, 05 Mar 2009) | 4 lines branches/zip: Add ChangeLog entry for the bugfix in c4360. ------------------------------------------------------------------------ r4378 | calvin | 2009-03-09 10:10:17 +0200 (Mon, 09 Mar 2009) | 7 lines branches/zip: remove compile flag MYSQL_SERVER for dynamic plugin The dynamic plugin on Windows used to be built with MYSQL_SERVER compile flag, while it is not the case for other platforms. r3797 assumed MYSQL_SERVER was not defined for dynamic plugin, which introduced the engine crash during dropping a database. ------------------------------------------------------------------------ r4396 | marko | 2009-03-12 09:22:27 +0200 (Thu, 12 Mar 2009) | 3 lines branches/zip: btr_store_big_rec_extern_fields(): Initialize FIL_PAGE_TYPE in a separate redo log entry. This will make ibbackup --apply-log debugging easier. ------------------------------------------------------------------------ r4397 | marko | 2009-03-12 09:26:11 +0200 (Thu, 12 Mar 2009) | 3 lines branches/zip: trx_sys_create_doublewrite_buf(): As the dummy change, initialize FIL_PAGE_TYPE. This will make it easier to write the debug assertions for ibbackup --apply-log. ------------------------------------------------------------------------ r4401 | marko | 2009-03-12 10:26:40 +0200 (Thu, 12 Mar 2009) | 19 lines branches/zip: Merge revisions 4359:4400 from branches/5.1: ------------------------------------------------------------------------ r4399 | marko | 2009-03-12 09:38:05 +0200 (Thu, 12 Mar 2009) | 2 lines branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position also for unlock_row(). (Bug #39320) ------------------------------------------------------------------------ r4400 | marko | 2009-03-12 10:06:44 +0200 (Thu, 12 Mar 2009) | 5 lines branches/5.1: Fix a bug in multi-table semi-consistent reads. Remember the acquired record locks per table handle (row_prebuilt_t) rather than per transaction (trx_t), so that unlock_row should successfully unlock all non-matching rows in multi-table operations. This deficiency was found while investigating Bug #39320. ------------------------------------------------------------------------ These were submitted as rb://94 and rb://96 and approved by Heikki Tuuri. ------------------------------------------------------------------------ r4455 | marko | 2009-03-16 11:43:34 +0200 (Mon, 16 Mar 2009) | 2 lines branches/zip: UT_LIST_VALIDATE(): Add the parameter ASSERTION and adjust all callers. ------------------------------------------------------------------------ r4456 | marko | 2009-03-16 12:59:25 +0200 (Mon, 16 Mar 2009) | 6 lines branches/zip: UT_LIST_VALIDATE(): Assert that the link is non-NULL before dereferencing it. In this way, ut_list_node_313 will be pointing to the last non-NULL list item at the time of the assertion failure. (gcc-4.3.2 -O3 seems to optimize the common subexpressions and make the variable NULL, though.) ------------------------------------------------------------------------ r4457 | marko | 2009-03-16 14:12:02 +0200 (Mon, 16 Mar 2009) | 2 lines branches/zip: sync_thread_add_level(): Make the assertions about level == SYNC_BUF_BLOCK more readable. ------------------------------------------------------------------------ r4461 | vasil | 2009-03-17 09:38:19 +0200 (Tue, 17 Mar 2009) | 6 lines branches/zip: Remove mysql-test/patches/bug32625.diff because that bug was fixed in the mysql repository (1 year and 4 months after sending them the simple patch!). See http://bugs.mysql.com/32625 ------------------------------------------------------------------------ r4465 | marko | 2009-03-17 12:34:19 +0200 (Tue, 17 Mar 2009) | 1 line branches/zip: buf0buddy.c: Add and adjust some debug assertions. ------------------------------------------------------------------------ r4473 | vasil | 2009-03-17 15:50:30 +0200 (Tue, 17 Mar 2009) | 5 lines branches/zip: Increment the InnoDB Plugin version from 1.0.3 to 1.0.4 now that 1.0.3 has been released. ------------------------------------------------------------------------ r4478 | vasil | 2009-03-18 11:53:53 +0200 (Wed, 18 Mar 2009) | 5 lines branches/zip: Remove mysql-test/patches/bug41893.diff because that bug has been fixed in the MySQL repository, see http://bugs.mysql.com/41893. ------------------------------------------------------------------------ r4479 | marko | 2009-03-18 12:43:54 +0200 (Wed, 18 Mar 2009) | 2 lines branches/zip: buf_LRU_block_remove_hashed_page(): Add some debug assertions. ------------------------------------------------------------------------ r4480 | marko | 2009-03-18 14:32:13 +0200 (Wed, 18 Mar 2009) | 1 line branches/zip: buf_buddy_free_low(): Correct the function comment. ------------------------------------------------------------------------ r4482 | marko | 2009-03-19 15:23:32 +0200 (Thu, 19 Mar 2009) | 12 lines branches/zip: Merge revisions 4400:4481 from branches/5.1: ------------------------------------------------------------------------ r4481 | marko | 2009-03-19 15:01:48 +0200 (Thu, 19 Mar 2009) | 6 lines branches/5.1: row_unlock_for_mysql(): Do not unlock records that were modified by the current transaction. This bug was introduced or unmasked in r4400. rb://97 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4490 | marko | 2009-03-20 12:33:33 +0200 (Fri, 20 Mar 2009) | 4 lines branches/zip: Non-functional change for reducing dependencies in InnoDB Hot Backup: Replace srv_sys->dummy_ind1 and srv_sys->dummy_ind2 with dict_ind_redundant and dict_ind_compact, initialized in dict_init(). ------------------------------------------------------------------------ r4491 | marko | 2009-03-20 12:45:18 +0200 (Fri, 20 Mar 2009) | 2 lines branches/zip: Add const qualifiers or in/out comments to some function parameters in log0log. ------------------------------------------------------------------------ r4492 | marko | 2009-03-20 12:52:14 +0200 (Fri, 20 Mar 2009) | 5 lines branches/zip: page_validate(): Always report the space id and the name of the index. In Hot Backup, do not invoke comparison functions, as MySQL collations will be unavailable. ------------------------------------------------------------------------ r4493 | marko | 2009-03-20 13:24:06 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: Replace fil_get_space_for_id_low() with fil_space_get_by_id(). ------------------------------------------------------------------------ r4494 | marko | 2009-03-20 13:51:35 +0200 (Fri, 20 Mar 2009) | 3 lines branches/zip: fil0fil.c: Refer to fil_system directly, not via local vars. This eliminates some "unused variable" warnings when building InnoDB Hot Backup in such a way that all mutex operations are no-ops. ------------------------------------------------------------------------ r4495 | marko | 2009-03-20 14:15:52 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: innobase_get_at_most_n_mbchars(): Declare in ha_prototypes.h. ------------------------------------------------------------------------ r4496 | marko | 2009-03-20 14:48:26 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: recv_recover_page(): Remove compile-time constant parameters. ------------------------------------------------------------------------ r4497 | marko | 2009-03-20 14:56:19 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: recv_sys_init(): Remove a compile-time constant parameter. ------------------------------------------------------------------------ r4498 | marko | 2009-03-20 15:08:05 +0200 (Fri, 20 Mar 2009) | 4 lines branches/zip: Non-functional change: Add const qualifiers. log_block_checksum_is_ok_or_old_format(), recv_sys_add_to_parsing_buf(): The log block is read-only. Make it const. ------------------------------------------------------------------------ r4499 | marko | 2009-03-20 15:10:25 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: recv_scan_log_recs(): Remove a compile-time constant parameter. ------------------------------------------------------------------------ r4500 | marko | 2009-03-20 15:47:17 +0200 (Fri, 20 Mar 2009) | 1 line branches/zip: fil_init(): Add the parameter hash_size. ------------------------------------------------------------------------ r4501 | vasil | 2009-03-20 16:50:41 +0200 (Fri, 20 Mar 2009) | 4 lines branches/zip: Add any entry about the release of 1.0.3 in the ChangeLog. ------------------------------------------------------------------------ r4515 | marko | 2009-03-23 10:49:53 +0200 (Mon, 23 Mar 2009) | 1 line branches/zip: hash_table_t: adaptive: Remove from UNIV_HOTBACKUP builds. ------------------------------------------------------------------------ r4516 | marko | 2009-03-23 10:57:16 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Define and use ASSERT_HASH_MUTEX_OWN. Make it a no-op in UNIV_HOTBACKUP builds. ------------------------------------------------------------------------ r4517 | marko | 2009-03-23 11:07:20 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Define and use PAGE_ZIP_MATCH. In UNIV_HOTBACKUP builds, assume fixed allocation. ------------------------------------------------------------------------ r4521 | marko | 2009-03-23 12:05:47 +0200 (Mon, 23 Mar 2009) | 1 line branches/zip: buf_page_print(): Clean up the code #ifdef UNIV_HOTBACKUP. ------------------------------------------------------------------------ r4522 | marko | 2009-03-23 12:20:50 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Exclude some operating system interface code from UNIV_HOTBACKUP builds. ------------------------------------------------------------------------ r4523 | marko | 2009-03-23 13:00:43 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Remove the remaining references to hash_table_t::adapive from UNIV_HOTBACKUP builds. This should have been done in r4515. ------------------------------------------------------------------------ r4524 | marko | 2009-03-23 14:05:18 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Enclose recv_recovery_from_backup_on and recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE. ------------------------------------------------------------------------ r4525 | marko | 2009-03-23 14:57:45 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: recv_parse_or_apply_log_rec_body(): Add debug assertions ensuring that FIL_PAGE_TYPE makes sense when applying log records. ------------------------------------------------------------------------ r4526 | marko | 2009-03-23 16:21:34 +0200 (Mon, 23 Mar 2009) | 2 lines branches/zip: Remove unneeded definitions and dependencies from UNIV_HOTBACKUP builds. ------------------------------------------------------------------------ r4527 | calvin | 2009-03-23 23:15:33 +0200 (Mon, 23 Mar 2009) | 5 lines branches/zip: adjust build files on Windows Adjust the patch positions based on the latest MySQL source. Also add the patches to the .bat files for vs9. ------------------------------------------------------------------------
2379 lines
62 KiB
C
2379 lines
62 KiB
C
/*****************************************************************************
|
|
|
|
Copyright (c) 2005, 2009, Innobase Oy. All Rights Reserved.
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*****************************************************************************/
|
|
|
|
/******************************************************
|
|
New index creation routines using a merge sort
|
|
|
|
Created 12/4/2005 Jan Lindstrom
|
|
Completed by Sunny Bains and Marko Makela
|
|
*******************************************************/
|
|
|
|
#include "row0merge.h"
|
|
#include "row0ext.h"
|
|
#include "row0row.h"
|
|
#include "row0upd.h"
|
|
#include "row0ins.h"
|
|
#include "row0sel.h"
|
|
#include "dict0dict.h"
|
|
#include "dict0mem.h"
|
|
#include "dict0boot.h"
|
|
#include "dict0crea.h"
|
|
#include "dict0load.h"
|
|
#include "btr0btr.h"
|
|
#include "mach0data.h"
|
|
#include "trx0rseg.h"
|
|
#include "trx0trx.h"
|
|
#include "trx0roll.h"
|
|
#include "trx0undo.h"
|
|
#include "trx0purge.h"
|
|
#include "trx0rec.h"
|
|
#include "que0que.h"
|
|
#include "rem0cmp.h"
|
|
#include "read0read.h"
|
|
#include "os0file.h"
|
|
#include "lock0lock.h"
|
|
#include "data0data.h"
|
|
#include "data0type.h"
|
|
#include "que0que.h"
|
|
#include "pars0pars.h"
|
|
#include "mem0mem.h"
|
|
#include "log0log.h"
|
|
#include "ut0sort.h"
|
|
#include "handler0alter.h"
|
|
|
|
/* Ignore posix_fadvise() on those platforms where it does not exist */
|
|
#if defined __WIN__
|
|
# define posix_fadvise(fd, offset, len, advice) /* nothing */
|
|
#endif /* __WIN__ */
|
|
|
|
#ifdef UNIV_DEBUG
|
|
/* Set these in order ot enable debug printout. */
|
|
static ibool row_merge_print_cmp;
|
|
static ibool row_merge_print_read;
|
|
static ibool row_merge_print_write;
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
/* Block size for I/O operations in merge sort. The minimum is
|
|
UNIV_PAGE_SIZE, or page_get_free_space_of_empty() rounded to a power of 2.
|
|
|
|
When not creating a PRIMARY KEY that contains column prefixes, this
|
|
can be set as small as UNIV_PAGE_SIZE / 2. See the comment above
|
|
ut_ad(data_size < sizeof(row_merge_block_t)). */
|
|
|
|
typedef byte row_merge_block_t[1048576];
|
|
|
|
/* Secondary buffer for I/O operations of merge records. This buffer
|
|
is used for writing or reading a record that spans two row_merge_block_t.
|
|
Thus, it must be able to hold one merge record, whose maximum size is
|
|
the same as the minimum size of row_merge_block_t. */
|
|
|
|
typedef byte mrec_buf_t[UNIV_PAGE_SIZE];
|
|
|
|
/* Merge record in row_merge_block_t. The format is the same as a
|
|
record in ROW_FORMAT=COMPACT with the exception that the
|
|
REC_N_NEW_EXTRA_BYTES are omitted. */
|
|
typedef byte mrec_t;
|
|
|
|
/* Buffer for sorting in main memory. */
|
|
struct row_merge_buf_struct {
|
|
mem_heap_t* heap; /* memory heap where allocated */
|
|
dict_index_t* index; /* the index the tuples belong to */
|
|
ulint total_size; /* total amount of data bytes */
|
|
ulint n_tuples; /* number of data tuples */
|
|
ulint max_tuples; /* maximum number of data tuples */
|
|
const dfield_t**tuples; /* array of pointers to
|
|
arrays of fields that form
|
|
the data tuples */
|
|
const dfield_t**tmp_tuples; /* temporary copy of tuples,
|
|
for sorting */
|
|
};
|
|
|
|
typedef struct row_merge_buf_struct row_merge_buf_t;
|
|
|
|
/* Information about temporary files used in merge sort are stored
|
|
to this structure */
|
|
|
|
struct merge_file_struct {
|
|
int fd; /* File descriptor */
|
|
ulint offset; /* File offset */
|
|
};
|
|
|
|
typedef struct merge_file_struct merge_file_t;
|
|
|
|
#ifdef UNIV_DEBUG
|
|
/**********************************************************
|
|
Display a merge tuple. */
|
|
static
|
|
void
|
|
row_merge_tuple_print(
|
|
/*==================*/
|
|
FILE* f, /* in: output stream */
|
|
const dfield_t* entry, /* in: tuple to print */
|
|
ulint n_fields)/* in: number of fields in the tuple */
|
|
{
|
|
ulint j;
|
|
|
|
for (j = 0; j < n_fields; j++) {
|
|
const dfield_t* field = &entry[j];
|
|
|
|
if (dfield_is_null(field)) {
|
|
fputs("\n NULL;", f);
|
|
} else {
|
|
ulint field_len = dfield_get_len(field);
|
|
ulint len = ut_min(field_len, 20);
|
|
if (dfield_is_ext(field)) {
|
|
fputs("\nE", f);
|
|
} else {
|
|
fputs("\n ", f);
|
|
}
|
|
ut_print_buf(f, dfield_get_data(field), len);
|
|
if (len != field_len) {
|
|
fprintf(f, " (total %lu bytes)", field_len);
|
|
}
|
|
}
|
|
}
|
|
putc('\n', f);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
/**********************************************************
|
|
Allocate a sort buffer. */
|
|
static
|
|
row_merge_buf_t*
|
|
row_merge_buf_create_low(
|
|
/*=====================*/
|
|
/* out,own: sort buffer */
|
|
mem_heap_t* heap, /* in: heap where allocated */
|
|
dict_index_t* index, /* in: secondary index */
|
|
ulint max_tuples, /* in: maximum number of data tuples */
|
|
ulint buf_size) /* in: size of the buffer, in bytes */
|
|
{
|
|
row_merge_buf_t* buf;
|
|
|
|
ut_ad(max_tuples > 0);
|
|
ut_ad(max_tuples <= sizeof(row_merge_block_t));
|
|
ut_ad(max_tuples < buf_size);
|
|
|
|
buf = mem_heap_zalloc(heap, buf_size);
|
|
buf->heap = heap;
|
|
buf->index = index;
|
|
buf->max_tuples = max_tuples;
|
|
buf->tuples = mem_heap_alloc(heap,
|
|
2 * max_tuples * sizeof *buf->tuples);
|
|
buf->tmp_tuples = buf->tuples + max_tuples;
|
|
|
|
return(buf);
|
|
}
|
|
|
|
/**********************************************************
|
|
Allocate a sort buffer. */
|
|
static
|
|
row_merge_buf_t*
|
|
row_merge_buf_create(
|
|
/*=================*/
|
|
/* out,own: sort buffer */
|
|
dict_index_t* index) /* in: secondary index */
|
|
{
|
|
row_merge_buf_t* buf;
|
|
ulint max_tuples;
|
|
ulint buf_size;
|
|
mem_heap_t* heap;
|
|
|
|
max_tuples = sizeof(row_merge_block_t)
|
|
/ ut_max(1, dict_index_get_min_size(index));
|
|
|
|
buf_size = (sizeof *buf) + (max_tuples - 1) * sizeof *buf->tuples;
|
|
|
|
heap = mem_heap_create(buf_size + sizeof(row_merge_block_t));
|
|
|
|
buf = row_merge_buf_create_low(heap, index, max_tuples, buf_size);
|
|
|
|
return(buf);
|
|
}
|
|
|
|
/**********************************************************
|
|
Empty a sort buffer. */
|
|
static
|
|
row_merge_buf_t*
|
|
row_merge_buf_empty(
|
|
/*================*/
|
|
/* out: sort buffer */
|
|
row_merge_buf_t* buf) /* in,own: sort buffer */
|
|
{
|
|
ulint buf_size;
|
|
ulint max_tuples = buf->max_tuples;
|
|
mem_heap_t* heap = buf->heap;
|
|
dict_index_t* index = buf->index;
|
|
|
|
buf_size = (sizeof *buf) + (max_tuples - 1) * sizeof *buf->tuples;
|
|
|
|
mem_heap_empty(heap);
|
|
|
|
return(row_merge_buf_create_low(heap, index, max_tuples, buf_size));
|
|
}
|
|
|
|
/**********************************************************
|
|
Deallocate a sort buffer. */
|
|
static
|
|
void
|
|
row_merge_buf_free(
|
|
/*===============*/
|
|
row_merge_buf_t* buf) /* in,own: sort buffer, to be freed */
|
|
{
|
|
mem_heap_free(buf->heap);
|
|
}
|
|
|
|
/**********************************************************
|
|
Insert a data tuple into a sort buffer. */
|
|
static
|
|
ibool
|
|
row_merge_buf_add(
|
|
/*==============*/
|
|
/* out: TRUE if added,
|
|
FALSE if out of space */
|
|
row_merge_buf_t* buf, /* in/out: sort buffer */
|
|
const dtuple_t* row, /* in: row in clustered index */
|
|
const row_ext_t* ext) /* in: cache of externally stored
|
|
column prefixes, or NULL */
|
|
{
|
|
ulint i;
|
|
ulint n_fields;
|
|
ulint data_size;
|
|
ulint extra_size;
|
|
const dict_index_t* index;
|
|
dfield_t* entry;
|
|
dfield_t* field;
|
|
|
|
if (buf->n_tuples >= buf->max_tuples) {
|
|
return(FALSE);
|
|
}
|
|
|
|
UNIV_PREFETCH_R(row->fields);
|
|
|
|
index = buf->index;
|
|
|
|
n_fields = dict_index_get_n_fields(index);
|
|
|
|
entry = mem_heap_alloc(buf->heap, n_fields * sizeof *entry);
|
|
buf->tuples[buf->n_tuples] = entry;
|
|
field = entry;
|
|
|
|
data_size = 0;
|
|
extra_size = UT_BITS_IN_BYTES(index->n_nullable);
|
|
|
|
for (i = 0; i < n_fields; i++, field++) {
|
|
const dict_field_t* ifield;
|
|
const dict_col_t* col;
|
|
ulint col_no;
|
|
const dfield_t* row_field;
|
|
ulint len;
|
|
|
|
ifield = dict_index_get_nth_field(index, i);
|
|
col = ifield->col;
|
|
col_no = dict_col_get_no(col);
|
|
row_field = dtuple_get_nth_field(row, col_no);
|
|
dfield_copy(field, row_field);
|
|
len = dfield_get_len(field);
|
|
|
|
if (dfield_is_null(field)) {
|
|
ut_ad(!(col->prtype & DATA_NOT_NULL));
|
|
continue;
|
|
} else if (UNIV_LIKELY(!ext)) {
|
|
} else if (dict_index_is_clust(index)) {
|
|
/* Flag externally stored fields. */
|
|
const byte* buf = row_ext_lookup(ext, col_no,
|
|
&len);
|
|
if (UNIV_LIKELY_NULL(buf)) {
|
|
ut_a(buf != field_ref_zero);
|
|
if (i < dict_index_get_n_unique(index)) {
|
|
dfield_set_data(field, buf, len);
|
|
} else {
|
|
dfield_set_ext(field);
|
|
len = dfield_get_len(field);
|
|
}
|
|
}
|
|
} else {
|
|
const byte* buf = row_ext_lookup(ext, col_no,
|
|
&len);
|
|
if (UNIV_LIKELY_NULL(buf)) {
|
|
ut_a(buf != field_ref_zero);
|
|
dfield_set_data(field, buf, len);
|
|
}
|
|
}
|
|
|
|
/* If a column prefix index, take only the prefix */
|
|
|
|
if (ifield->prefix_len) {
|
|
len = dtype_get_at_most_n_mbchars(
|
|
col->prtype,
|
|
col->mbminlen, col->mbmaxlen,
|
|
ifield->prefix_len,
|
|
len, dfield_get_data(field));
|
|
dfield_set_len(field, len);
|
|
}
|
|
|
|
ut_ad(len <= col->len || col->mtype == DATA_BLOB);
|
|
|
|
if (ifield->fixed_len) {
|
|
ut_ad(len == ifield->fixed_len);
|
|
ut_ad(!dfield_is_ext(field));
|
|
} else if (dfield_is_ext(field)) {
|
|
extra_size += 2;
|
|
} else if (len < 128
|
|
|| (col->len < 256 && col->mtype != DATA_BLOB)) {
|
|
extra_size++;
|
|
} else {
|
|
/* For variable-length columns, we look up the
|
|
maximum length from the column itself. If this
|
|
is a prefix index column shorter than 256 bytes,
|
|
this will waste one byte. */
|
|
extra_size += 2;
|
|
}
|
|
data_size += len;
|
|
}
|
|
|
|
#ifdef UNIV_DEBUG
|
|
{
|
|
ulint size;
|
|
ulint extra;
|
|
|
|
size = rec_get_converted_size_comp(index,
|
|
REC_STATUS_ORDINARY,
|
|
entry, n_fields, &extra);
|
|
|
|
ut_ad(data_size + extra_size + REC_N_NEW_EXTRA_BYTES == size);
|
|
ut_ad(extra_size + REC_N_NEW_EXTRA_BYTES == extra);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
/* Add to the total size of the record in row_merge_block_t
|
|
the encoded length of extra_size and the extra bytes (extra_size).
|
|
See row_merge_buf_write() for the variable-length encoding
|
|
of extra_size. */
|
|
data_size += (extra_size + 1) + ((extra_size + 1) >= 0x80);
|
|
|
|
/* The following assertion may fail if row_merge_block_t is
|
|
declared very small and a PRIMARY KEY is being created with
|
|
many prefix columns. In that case, the record may exceed the
|
|
page_zip_rec_needs_ext() limit. However, no further columns
|
|
will be moved to external storage until the record is inserted
|
|
to the clustered index B-tree. */
|
|
ut_ad(data_size < sizeof(row_merge_block_t));
|
|
|
|
/* Reserve one byte for the end marker of row_merge_block_t. */
|
|
if (buf->total_size + data_size >= sizeof(row_merge_block_t) - 1) {
|
|
return(FALSE);
|
|
}
|
|
|
|
buf->total_size += data_size;
|
|
buf->n_tuples++;
|
|
|
|
field = entry;
|
|
|
|
/* Copy the data fields. */
|
|
|
|
do {
|
|
dfield_dup(field++, buf->heap);
|
|
} while (--n_fields);
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/* Structure for reporting duplicate records. */
|
|
struct row_merge_dup_struct {
|
|
const dict_index_t* index; /* index being sorted */
|
|
TABLE* table; /* MySQL table object */
|
|
ulint n_dup; /* number of duplicates */
|
|
};
|
|
|
|
typedef struct row_merge_dup_struct row_merge_dup_t;
|
|
|
|
/*****************************************************************
|
|
Report a duplicate key. */
|
|
static
|
|
void
|
|
row_merge_dup_report(
|
|
/*=================*/
|
|
row_merge_dup_t* dup, /* in/out: for reporting duplicates */
|
|
const dfield_t* entry) /* in: duplicate index entry */
|
|
{
|
|
mrec_buf_t buf;
|
|
const dtuple_t* tuple;
|
|
dtuple_t tuple_store;
|
|
const rec_t* rec;
|
|
const dict_index_t* index = dup->index;
|
|
ulint n_fields= dict_index_get_n_fields(index);
|
|
mem_heap_t* heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
ulint* offsets;
|
|
ulint n_ext;
|
|
|
|
if (dup->n_dup++) {
|
|
/* Only report the first duplicate record,
|
|
but count all duplicate records. */
|
|
return;
|
|
}
|
|
|
|
rec_offs_init(offsets_);
|
|
|
|
/* Convert the tuple to a record and then to MySQL format. */
|
|
|
|
tuple = dtuple_from_fields(&tuple_store, entry, n_fields);
|
|
n_ext = dict_index_is_clust(index) ? dtuple_get_n_ext(tuple) : 0;
|
|
|
|
rec = rec_convert_dtuple_to_rec(buf, index, tuple, n_ext);
|
|
offsets = rec_get_offsets(rec, index, offsets_, ULINT_UNDEFINED,
|
|
&heap);
|
|
|
|
innobase_rec_to_mysql(dup->table, rec, index, offsets);
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
mem_heap_free(heap);
|
|
}
|
|
}
|
|
|
|
/*****************************************************************
|
|
Compare two tuples. */
|
|
static
|
|
int
|
|
row_merge_tuple_cmp(
|
|
/*================*/
|
|
/* out: 1, 0, -1 if a is greater,
|
|
equal, less, respectively, than b */
|
|
ulint n_field,/* in: number of fields */
|
|
const dfield_t* a, /* in: first tuple to be compared */
|
|
const dfield_t* b, /* in: second tuple to be compared */
|
|
row_merge_dup_t* dup) /* in/out: for reporting duplicates */
|
|
{
|
|
int cmp;
|
|
const dfield_t* field = a;
|
|
|
|
/* Compare the fields of the tuples until a difference is
|
|
found or we run out of fields to compare. If !cmp at the
|
|
end, the tuples are equal. */
|
|
do {
|
|
cmp = cmp_dfield_dfield(a++, b++);
|
|
} while (!cmp && --n_field);
|
|
|
|
if (UNIV_UNLIKELY(!cmp) && UNIV_LIKELY_NULL(dup)) {
|
|
/* Report a duplicate value error if the tuples are
|
|
logically equal. NULL columns are logically inequal,
|
|
although they are equal in the sorting order. Find
|
|
out if any of the fields are NULL. */
|
|
for (b = field; b != a; b++) {
|
|
if (dfield_is_null(b)) {
|
|
|
|
goto func_exit;
|
|
}
|
|
}
|
|
|
|
row_merge_dup_report(dup, field);
|
|
}
|
|
|
|
func_exit:
|
|
return(cmp);
|
|
}
|
|
|
|
/**************************************************************************
|
|
Merge sort the tuple buffer in main memory. */
|
|
static
|
|
void
|
|
row_merge_tuple_sort(
|
|
/*=================*/
|
|
ulint n_field,/* in: number of fields */
|
|
row_merge_dup_t* dup, /* in/out: for reporting duplicates */
|
|
const dfield_t** tuples, /* in/out: tuples */
|
|
const dfield_t** aux, /* in/out: work area */
|
|
ulint low, /* in: lower bound of the
|
|
sorting area, inclusive */
|
|
ulint high) /* in: upper bound of the
|
|
sorting area, exclusive */
|
|
{
|
|
#define row_merge_tuple_sort_ctx(a,b,c,d) \
|
|
row_merge_tuple_sort(n_field, dup, a, b, c, d)
|
|
#define row_merge_tuple_cmp_ctx(a,b) row_merge_tuple_cmp(n_field, a, b, dup)
|
|
|
|
UT_SORT_FUNCTION_BODY(row_merge_tuple_sort_ctx,
|
|
tuples, aux, low, high, row_merge_tuple_cmp_ctx);
|
|
}
|
|
|
|
/**********************************************************
|
|
Sort a buffer. */
|
|
static
|
|
void
|
|
row_merge_buf_sort(
|
|
/*===============*/
|
|
row_merge_buf_t* buf, /* in/out: sort buffer */
|
|
row_merge_dup_t* dup) /* in/out: for reporting duplicates */
|
|
{
|
|
row_merge_tuple_sort(dict_index_get_n_unique(buf->index), dup,
|
|
buf->tuples, buf->tmp_tuples, 0, buf->n_tuples);
|
|
}
|
|
|
|
/**********************************************************
|
|
Write a buffer to a block. */
|
|
static
|
|
void
|
|
row_merge_buf_write(
|
|
/*================*/
|
|
const row_merge_buf_t* buf, /* in: sorted buffer */
|
|
#ifdef UNIV_DEBUG
|
|
const merge_file_t* of, /* in: output file */
|
|
#endif /* UNIV_DEBUG */
|
|
row_merge_block_t* block) /* out: buffer for writing to file */
|
|
#ifndef UNIV_DEBUG
|
|
# define row_merge_buf_write(buf, of, block) row_merge_buf_write(buf, block)
|
|
#endif /* !UNIV_DEBUG */
|
|
{
|
|
const dict_index_t* index = buf->index;
|
|
ulint n_fields= dict_index_get_n_fields(index);
|
|
byte* b = &(*block)[0];
|
|
|
|
ulint i;
|
|
|
|
for (i = 0; i < buf->n_tuples; i++) {
|
|
ulint size;
|
|
ulint extra_size;
|
|
const dfield_t* entry = buf->tuples[i];
|
|
|
|
size = rec_get_converted_size_comp(index,
|
|
REC_STATUS_ORDINARY,
|
|
entry, n_fields,
|
|
&extra_size);
|
|
ut_ad(size > extra_size);
|
|
ut_ad(extra_size >= REC_N_NEW_EXTRA_BYTES);
|
|
extra_size -= REC_N_NEW_EXTRA_BYTES;
|
|
size -= REC_N_NEW_EXTRA_BYTES;
|
|
|
|
/* Encode extra_size + 1 */
|
|
if (extra_size + 1 < 0x80) {
|
|
*b++ = (byte) (extra_size + 1);
|
|
} else {
|
|
ut_ad((extra_size + 1) < 0x8000);
|
|
*b++ = (byte) (0x80 | ((extra_size + 1) >> 8));
|
|
*b++ = (byte) (extra_size + 1);
|
|
}
|
|
|
|
ut_ad(b + size < block[1]);
|
|
|
|
rec_convert_dtuple_to_rec_comp(b + extra_size, 0, index,
|
|
REC_STATUS_ORDINARY,
|
|
entry, n_fields);
|
|
|
|
b += size;
|
|
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_write) {
|
|
fprintf(stderr, "row_merge_buf_write %p,%d,%lu %lu",
|
|
(void*) b, of->fd, (ulong) of->offset,
|
|
(ulong) i);
|
|
row_merge_tuple_print(stderr, entry, n_fields);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
}
|
|
|
|
/* Write an "end-of-chunk" marker. */
|
|
ut_a(b < block[1]);
|
|
ut_a(b == block[0] + buf->total_size);
|
|
*b++ = 0;
|
|
#ifdef UNIV_DEBUG_VALGRIND
|
|
/* The rest of the block is uninitialized. Initialize it
|
|
to avoid bogus warnings. */
|
|
memset(b, 0xff, block[1] - b);
|
|
#endif /* UNIV_DEBUG_VALGRIND */
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_write) {
|
|
fprintf(stderr, "row_merge_buf_write %p,%d,%lu EOF\n",
|
|
(void*) b, of->fd, (ulong) of->offset);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
}
|
|
|
|
/**********************************************************
|
|
Create a memory heap and allocate space for row_merge_rec_offsets(). */
|
|
static
|
|
mem_heap_t*
|
|
row_merge_heap_create(
|
|
/*==================*/
|
|
/* out: memory heap */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint** offsets1, /* out: offsets */
|
|
ulint** offsets2) /* out: offsets */
|
|
{
|
|
ulint i = 1 + REC_OFFS_HEADER_SIZE
|
|
+ dict_index_get_n_fields(index);
|
|
mem_heap_t* heap = mem_heap_create(2 * i * sizeof *offsets1);
|
|
|
|
*offsets1 = mem_heap_alloc(heap, i * sizeof *offsets1);
|
|
*offsets2 = mem_heap_alloc(heap, i * sizeof *offsets2);
|
|
|
|
(*offsets1)[0] = (*offsets2)[0] = i;
|
|
(*offsets1)[1] = (*offsets2)[1] = dict_index_get_n_fields(index);
|
|
|
|
return(heap);
|
|
}
|
|
|
|
/**************************************************************************
|
|
Search an index object by name and column names. If several indexes match,
|
|
return the index with the max id. */
|
|
static
|
|
dict_index_t*
|
|
row_merge_dict_table_get_index(
|
|
/*===========================*/
|
|
/* out: matching index,
|
|
NULL if not found */
|
|
dict_table_t* table, /* in: table */
|
|
const merge_index_def_t*index_def) /* in: index definition */
|
|
{
|
|
ulint i;
|
|
dict_index_t* index;
|
|
const char** column_names;
|
|
|
|
column_names = mem_alloc(index_def->n_fields * sizeof *column_names);
|
|
|
|
for (i = 0; i < index_def->n_fields; ++i) {
|
|
column_names[i] = index_def->fields[i].field_name;
|
|
}
|
|
|
|
index = dict_table_get_index_by_max_id(
|
|
table, index_def->name, column_names, index_def->n_fields);
|
|
|
|
mem_free((void*) column_names);
|
|
|
|
return(index);
|
|
}
|
|
|
|
/************************************************************************
|
|
Read a merge block from the file system. */
|
|
static
|
|
ibool
|
|
row_merge_read(
|
|
/*===========*/
|
|
/* out: TRUE if request was
|
|
successful, FALSE if fail */
|
|
int fd, /* in: file descriptor */
|
|
ulint offset, /* in: offset where to read */
|
|
row_merge_block_t* buf) /* out: data */
|
|
{
|
|
ib_uint64_t ofs = ((ib_uint64_t) offset) * sizeof *buf;
|
|
ibool success;
|
|
|
|
success = os_file_read_no_error_handling(OS_FILE_FROM_FD(fd), buf,
|
|
(ulint) (ofs & 0xFFFFFFFF),
|
|
(ulint) (ofs >> 32),
|
|
sizeof *buf);
|
|
/* Each block is read exactly once. Free up the file cache. */
|
|
posix_fadvise(fd, ofs, sizeof *buf, POSIX_FADV_DONTNEED);
|
|
|
|
if (UNIV_UNLIKELY(!success)) {
|
|
ut_print_timestamp(stderr);
|
|
fprintf(stderr,
|
|
" InnoDB: failed to read merge block at %llu\n", ofs);
|
|
}
|
|
|
|
return(UNIV_LIKELY(success));
|
|
}
|
|
|
|
/************************************************************************
|
|
Read a merge block from the file system. */
|
|
static
|
|
ibool
|
|
row_merge_write(
|
|
/*============*/
|
|
/* out: TRUE if request was
|
|
successful, FALSE if fail */
|
|
int fd, /* in: file descriptor */
|
|
ulint offset, /* in: offset where to write */
|
|
const void* buf) /* in: data */
|
|
{
|
|
ib_uint64_t ofs = ((ib_uint64_t) offset)
|
|
* sizeof(row_merge_block_t);
|
|
ibool success;
|
|
|
|
success = os_file_write("(merge)", OS_FILE_FROM_FD(fd), buf,
|
|
(ulint) (ofs & 0xFFFFFFFF),
|
|
(ulint) (ofs >> 32),
|
|
sizeof(row_merge_block_t));
|
|
|
|
/* The block will be needed on the next merge pass,
|
|
but it can be evicted from the file cache meanwhile. */
|
|
posix_fadvise(fd, ofs, sizeof *buf, POSIX_FADV_DONTNEED);
|
|
|
|
return(UNIV_LIKELY(success));
|
|
}
|
|
|
|
/************************************************************************
|
|
Read a merge record. */
|
|
static
|
|
const byte*
|
|
row_merge_read_rec(
|
|
/*===============*/
|
|
/* out: pointer to next record,
|
|
or NULL on I/O error
|
|
or end of list */
|
|
row_merge_block_t* block, /* in/out: file buffer */
|
|
mrec_buf_t* buf, /* in/out: secondary buffer */
|
|
const byte* b, /* in: pointer to record */
|
|
const dict_index_t* index, /* in: index of the record */
|
|
int fd, /* in: file descriptor */
|
|
ulint* foffs, /* in/out: file offset */
|
|
const mrec_t** mrec, /* out: pointer to merge record,
|
|
or NULL on end of list
|
|
(non-NULL on I/O error) */
|
|
ulint* offsets)/* out: offsets of mrec */
|
|
{
|
|
ulint extra_size;
|
|
ulint data_size;
|
|
ulint avail_size;
|
|
|
|
ut_ad(block);
|
|
ut_ad(buf);
|
|
ut_ad(b >= block[0]);
|
|
ut_ad(b < block[1]);
|
|
ut_ad(index);
|
|
ut_ad(foffs);
|
|
ut_ad(mrec);
|
|
ut_ad(offsets);
|
|
|
|
ut_ad(*offsets == 1 + REC_OFFS_HEADER_SIZE
|
|
+ dict_index_get_n_fields(index));
|
|
|
|
extra_size = *b++;
|
|
|
|
if (UNIV_UNLIKELY(!extra_size)) {
|
|
/* End of list */
|
|
*mrec = NULL;
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_read) {
|
|
fprintf(stderr, "row_merge_read %p,%p,%d,%lu EOF\n",
|
|
(const void*) b, (const void*) block,
|
|
fd, (ulong) *foffs);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
return(NULL);
|
|
}
|
|
|
|
if (extra_size >= 0x80) {
|
|
/* Read another byte of extra_size. */
|
|
|
|
if (UNIV_UNLIKELY(b >= block[1])) {
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
|
err_exit:
|
|
/* Signal I/O error. */
|
|
*mrec = b;
|
|
return(NULL);
|
|
}
|
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
b = block[0];
|
|
}
|
|
|
|
extra_size = (extra_size & 0x7f) << 8;
|
|
extra_size |= *b++;
|
|
}
|
|
|
|
/* Normalize extra_size. Above, value 0 signals "end of list". */
|
|
extra_size--;
|
|
|
|
/* Read the extra bytes. */
|
|
|
|
if (UNIV_UNLIKELY(b + extra_size >= block[1])) {
|
|
/* The record spans two blocks. Copy the entire record
|
|
to the auxiliary buffer and handle this as a special
|
|
case. */
|
|
|
|
avail_size = block[1] - b;
|
|
|
|
memcpy(*buf, b, avail_size);
|
|
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
|
|
|
goto err_exit;
|
|
}
|
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
b = block[0];
|
|
|
|
/* Copy the record. */
|
|
memcpy(*buf + avail_size, b, extra_size - avail_size);
|
|
b += extra_size - avail_size;
|
|
|
|
*mrec = *buf + extra_size;
|
|
|
|
rec_init_offsets_comp_ordinary(*mrec, 0, index, offsets);
|
|
|
|
data_size = rec_offs_data_size(offsets);
|
|
|
|
/* These overflows should be impossible given that
|
|
records are much smaller than either buffer, and
|
|
the record starts near the beginning of each buffer. */
|
|
ut_a(extra_size + data_size < sizeof *buf);
|
|
ut_a(b + data_size < block[1]);
|
|
|
|
/* Copy the data bytes. */
|
|
memcpy(*buf + extra_size, b, data_size);
|
|
b += data_size;
|
|
|
|
goto func_exit;
|
|
}
|
|
|
|
*mrec = b + extra_size;
|
|
|
|
rec_init_offsets_comp_ordinary(*mrec, 0, index, offsets);
|
|
|
|
data_size = rec_offs_data_size(offsets);
|
|
ut_ad(extra_size + data_size < sizeof *buf);
|
|
|
|
b += extra_size + data_size;
|
|
|
|
if (UNIV_LIKELY(b < block[1])) {
|
|
/* The record fits entirely in the block.
|
|
This is the normal case. */
|
|
goto func_exit;
|
|
}
|
|
|
|
/* The record spans two blocks. Copy it to buf. */
|
|
|
|
b -= extra_size + data_size;
|
|
avail_size = block[1] - b;
|
|
memcpy(*buf, b, avail_size);
|
|
*mrec = *buf + extra_size;
|
|
rec_offs_make_valid(*mrec, index, offsets);
|
|
|
|
if (!row_merge_read(fd, ++(*foffs), block)) {
|
|
|
|
goto err_exit;
|
|
}
|
|
|
|
/* Wrap around to the beginning of the buffer. */
|
|
b = block[0];
|
|
|
|
/* Copy the rest of the record. */
|
|
memcpy(*buf + avail_size, b, extra_size + data_size - avail_size);
|
|
b += extra_size + data_size - avail_size;
|
|
|
|
func_exit:
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_read) {
|
|
fprintf(stderr, "row_merge_read %p,%p,%d,%lu ",
|
|
(const void*) b, (const void*) block,
|
|
fd, (ulong) *foffs);
|
|
rec_print_comp(stderr, *mrec, offsets);
|
|
putc('\n', stderr);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
return(b);
|
|
}
|
|
|
|
/************************************************************************
|
|
Write a merge record. */
|
|
static
|
|
void
|
|
row_merge_write_rec_low(
|
|
/*====================*/
|
|
byte* b, /* out: buffer */
|
|
ulint e, /* in: encoded extra_size */
|
|
#ifdef UNIV_DEBUG
|
|
ulint size, /* in: total size to write */
|
|
int fd, /* in: file descriptor */
|
|
ulint foffs, /* in: file offset */
|
|
#endif /* UNIV_DEBUG */
|
|
const mrec_t* mrec, /* in: record to write */
|
|
const ulint* offsets)/* in: offsets of mrec */
|
|
#ifndef UNIV_DEBUG
|
|
# define row_merge_write_rec_low(b, e, size, fd, foffs, mrec, offsets) \
|
|
row_merge_write_rec_low(b, e, mrec, offsets)
|
|
#endif /* !UNIV_DEBUG */
|
|
{
|
|
#ifdef UNIV_DEBUG
|
|
const byte* const end = b + size;
|
|
ut_ad(e == rec_offs_extra_size(offsets) + 1);
|
|
|
|
if (row_merge_print_write) {
|
|
fprintf(stderr, "row_merge_write %p,%d,%lu ",
|
|
(void*) b, fd, (ulong) foffs);
|
|
rec_print_comp(stderr, mrec, offsets);
|
|
putc('\n', stderr);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
if (e < 0x80) {
|
|
*b++ = (byte) e;
|
|
} else {
|
|
*b++ = (byte) (0x80 | (e >> 8));
|
|
*b++ = (byte) e;
|
|
}
|
|
|
|
memcpy(b, mrec - rec_offs_extra_size(offsets), rec_offs_size(offsets));
|
|
ut_ad(b + rec_offs_size(offsets) == end);
|
|
}
|
|
|
|
/************************************************************************
|
|
Write a merge record. */
|
|
static
|
|
byte*
|
|
row_merge_write_rec(
|
|
/*================*/
|
|
/* out: pointer to end of block,
|
|
or NULL on error */
|
|
row_merge_block_t* block, /* in/out: file buffer */
|
|
mrec_buf_t* buf, /* in/out: secondary buffer */
|
|
byte* b, /* in: pointer to end of block */
|
|
int fd, /* in: file descriptor */
|
|
ulint* foffs, /* in/out: file offset */
|
|
const mrec_t* mrec, /* in: record to write */
|
|
const ulint* offsets)/* in: offsets of mrec */
|
|
{
|
|
ulint extra_size;
|
|
ulint size;
|
|
ulint avail_size;
|
|
|
|
ut_ad(block);
|
|
ut_ad(buf);
|
|
ut_ad(b >= block[0]);
|
|
ut_ad(b < block[1]);
|
|
ut_ad(mrec);
|
|
ut_ad(foffs);
|
|
ut_ad(mrec < block[0] || mrec > block[1]);
|
|
ut_ad(mrec < buf[0] || mrec > buf[1]);
|
|
|
|
/* Normalize extra_size. Value 0 signals "end of list". */
|
|
extra_size = rec_offs_extra_size(offsets) + 1;
|
|
|
|
size = extra_size + (extra_size >= 0x80)
|
|
+ rec_offs_data_size(offsets);
|
|
|
|
if (UNIV_UNLIKELY(b + size >= block[1])) {
|
|
/* The record spans two blocks.
|
|
Copy it to the temporary buffer first. */
|
|
avail_size = block[1] - b;
|
|
|
|
row_merge_write_rec_low(buf[0],
|
|
extra_size, size, fd, *foffs,
|
|
mrec, offsets);
|
|
|
|
/* Copy the head of the temporary buffer, write
|
|
the completed block, and copy the tail of the
|
|
record to the head of the new block. */
|
|
memcpy(b, buf[0], avail_size);
|
|
|
|
if (!row_merge_write(fd, (*foffs)++, block)) {
|
|
return(NULL);
|
|
}
|
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
|
|
|
/* Copy the rest. */
|
|
b = block[0];
|
|
memcpy(b, buf[0] + avail_size, size - avail_size);
|
|
b += size - avail_size;
|
|
} else {
|
|
row_merge_write_rec_low(b, extra_size, size, fd, *foffs,
|
|
mrec, offsets);
|
|
b += size;
|
|
}
|
|
|
|
return(b);
|
|
}
|
|
|
|
/************************************************************************
|
|
Write an end-of-list marker. */
|
|
static
|
|
byte*
|
|
row_merge_write_eof(
|
|
/*================*/
|
|
/* out: pointer to end of block,
|
|
or NULL on error */
|
|
row_merge_block_t* block, /* in/out: file buffer */
|
|
byte* b, /* in: pointer to end of block */
|
|
int fd, /* in: file descriptor */
|
|
ulint* foffs) /* in/out: file offset */
|
|
{
|
|
ut_ad(block);
|
|
ut_ad(b >= block[0]);
|
|
ut_ad(b < block[1]);
|
|
ut_ad(foffs);
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_write) {
|
|
fprintf(stderr, "row_merge_write %p,%p,%d,%lu EOF\n",
|
|
(void*) b, (void*) block, fd, (ulong) *foffs);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
*b++ = 0;
|
|
UNIV_MEM_ASSERT_RW(block[0], b - block[0]);
|
|
UNIV_MEM_ASSERT_W(block[0], sizeof block[0]);
|
|
#ifdef UNIV_DEBUG_VALGRIND
|
|
/* The rest of the block is uninitialized. Initialize it
|
|
to avoid bogus warnings. */
|
|
memset(b, 0xff, block[1] - b);
|
|
#endif /* UNIV_DEBUG_VALGRIND */
|
|
|
|
if (!row_merge_write(fd, (*foffs)++, block)) {
|
|
return(NULL);
|
|
}
|
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
|
return(block[0]);
|
|
}
|
|
|
|
/*****************************************************************
|
|
Compare two merge records. */
|
|
static
|
|
int
|
|
row_merge_cmp(
|
|
/*==========*/
|
|
/* out: 1, 0, -1 if
|
|
mrec1 is greater, equal, less,
|
|
respectively, than mrec2 */
|
|
const mrec_t* mrec1, /* in: first merge
|
|
record to be compared */
|
|
const mrec_t* mrec2, /* in: second merge
|
|
record to be compared */
|
|
const ulint* offsets1, /* in: first record offsets */
|
|
const ulint* offsets2, /* in: second record offsets */
|
|
const dict_index_t* index) /* in: index */
|
|
{
|
|
int cmp;
|
|
|
|
cmp = cmp_rec_rec_simple(mrec1, mrec2, offsets1, offsets2, index);
|
|
|
|
#ifdef UNIV_DEBUG
|
|
if (row_merge_print_cmp) {
|
|
fputs("row_merge_cmp1 ", stderr);
|
|
rec_print_comp(stderr, mrec1, offsets1);
|
|
fputs("\nrow_merge_cmp2 ", stderr);
|
|
rec_print_comp(stderr, mrec2, offsets2);
|
|
fprintf(stderr, "\nrow_merge_cmp=%d\n", cmp);
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
return(cmp);
|
|
}
|
|
|
|
/************************************************************************
|
|
Reads clustered index of the table and create temporary files
|
|
containing the index entries for the indexes to be built. */
|
|
static
|
|
ulint
|
|
row_merge_read_clustered_index(
|
|
/*===========================*/
|
|
/* out: DB_SUCCESS or error */
|
|
trx_t* trx, /* in: transaction */
|
|
TABLE* table, /* in/out: MySQL table object,
|
|
for reporting erroneous records */
|
|
const dict_table_t* old_table,/* in: table where rows are
|
|
read from */
|
|
const dict_table_t* new_table,/* in: table where indexes are
|
|
created; identical to old_table
|
|
unless creating a PRIMARY KEY */
|
|
dict_index_t** index, /* in: indexes to be created */
|
|
merge_file_t* files, /* in: temporary files */
|
|
ulint n_index,/* in: number of indexes to create */
|
|
row_merge_block_t* block) /* in/out: file buffer */
|
|
{
|
|
dict_index_t* clust_index; /* Clustered index */
|
|
mem_heap_t* row_heap; /* Heap memory to create
|
|
clustered index records */
|
|
row_merge_buf_t** merge_buf; /* Temporary list for records*/
|
|
btr_pcur_t pcur; /* Persistent cursor on the
|
|
clustered index */
|
|
mtr_t mtr; /* Mini transaction */
|
|
ulint err = DB_SUCCESS;/* Return code */
|
|
ulint i;
|
|
ulint n_nonnull = 0; /* number of columns
|
|
changed to NOT NULL */
|
|
ulint* nonnull = NULL; /* NOT NULL columns */
|
|
|
|
trx->op_info = "reading clustered index";
|
|
|
|
ut_ad(trx);
|
|
ut_ad(old_table);
|
|
ut_ad(new_table);
|
|
ut_ad(index);
|
|
ut_ad(files);
|
|
|
|
/* Create and initialize memory for record buffers */
|
|
|
|
merge_buf = mem_alloc(n_index * sizeof *merge_buf);
|
|
|
|
for (i = 0; i < n_index; i++) {
|
|
merge_buf[i] = row_merge_buf_create(index[i]);
|
|
}
|
|
|
|
mtr_start(&mtr);
|
|
|
|
/* Find the clustered index and create a persistent cursor
|
|
based on that. */
|
|
|
|
clust_index = dict_table_get_first_index(old_table);
|
|
|
|
btr_pcur_open_at_index_side(
|
|
TRUE, clust_index, BTR_SEARCH_LEAF, &pcur, TRUE, &mtr);
|
|
|
|
if (UNIV_UNLIKELY(old_table != new_table)) {
|
|
ulint n_cols = dict_table_get_n_cols(old_table);
|
|
|
|
/* A primary key will be created. Identify the
|
|
columns that were flagged NOT NULL in the new table,
|
|
so that we can quickly check that the records in the
|
|
(old) clustered index do not violate the added NOT
|
|
NULL constraints. */
|
|
|
|
ut_a(n_cols == dict_table_get_n_cols(new_table));
|
|
|
|
nonnull = mem_alloc(n_cols * sizeof *nonnull);
|
|
|
|
for (i = 0; i < n_cols; i++) {
|
|
if (dict_table_get_nth_col(old_table, i)->prtype
|
|
& DATA_NOT_NULL) {
|
|
|
|
continue;
|
|
}
|
|
|
|
if (dict_table_get_nth_col(new_table, i)->prtype
|
|
& DATA_NOT_NULL) {
|
|
|
|
nonnull[n_nonnull++] = i;
|
|
}
|
|
}
|
|
|
|
if (!n_nonnull) {
|
|
mem_free(nonnull);
|
|
nonnull = NULL;
|
|
}
|
|
}
|
|
|
|
row_heap = mem_heap_create(sizeof(mrec_buf_t));
|
|
|
|
/* Scan the clustered index. */
|
|
for (;;) {
|
|
const rec_t* rec;
|
|
ulint* offsets;
|
|
dtuple_t* row = NULL;
|
|
row_ext_t* ext;
|
|
ibool has_next = TRUE;
|
|
|
|
btr_pcur_move_to_next_on_page(&pcur);
|
|
|
|
/* When switching pages, commit the mini-transaction
|
|
in order to release the latch on the old page. */
|
|
|
|
if (btr_pcur_is_after_last_on_page(&pcur)) {
|
|
btr_pcur_store_position(&pcur, &mtr);
|
|
mtr_commit(&mtr);
|
|
mtr_start(&mtr);
|
|
btr_pcur_restore_position(BTR_SEARCH_LEAF,
|
|
&pcur, &mtr);
|
|
has_next = btr_pcur_move_to_next_user_rec(&pcur, &mtr);
|
|
}
|
|
|
|
if (UNIV_LIKELY(has_next)) {
|
|
rec = btr_pcur_get_rec(&pcur);
|
|
offsets = rec_get_offsets(rec, clust_index, NULL,
|
|
ULINT_UNDEFINED, &row_heap);
|
|
|
|
/* Skip delete marked records. */
|
|
if (rec_get_deleted_flag(
|
|
rec, dict_table_is_comp(old_table))) {
|
|
continue;
|
|
}
|
|
|
|
srv_n_rows_inserted++;
|
|
|
|
/* Build a row based on the clustered index. */
|
|
|
|
row = row_build(ROW_COPY_POINTERS, clust_index,
|
|
rec, offsets,
|
|
new_table, &ext, row_heap);
|
|
|
|
if (UNIV_LIKELY_NULL(nonnull)) {
|
|
for (i = 0; i < n_nonnull; i++) {
|
|
dfield_t* field
|
|
= &row->fields[nonnull[i]];
|
|
dtype_t* field_type
|
|
= dfield_get_type(field);
|
|
|
|
ut_a(!(field_type->prtype
|
|
& DATA_NOT_NULL));
|
|
|
|
if (dfield_is_null(field)) {
|
|
err = DB_PRIMARY_KEY_IS_NULL;
|
|
i = 0;
|
|
goto err_exit;
|
|
}
|
|
|
|
field_type->prtype |= DATA_NOT_NULL;
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Build all entries for all the indexes to be created
|
|
in a single scan of the clustered index. */
|
|
|
|
for (i = 0; i < n_index; i++) {
|
|
row_merge_buf_t* buf = merge_buf[i];
|
|
merge_file_t* file = &files[i];
|
|
const dict_index_t* index = buf->index;
|
|
|
|
if (UNIV_LIKELY
|
|
(row && row_merge_buf_add(buf, row, ext))) {
|
|
continue;
|
|
}
|
|
|
|
/* The buffer must be sufficiently large
|
|
to hold at least one record. */
|
|
ut_ad(buf->n_tuples || !has_next);
|
|
|
|
/* We have enough data tuples to form a block.
|
|
Sort them and write to disk. */
|
|
|
|
if (buf->n_tuples) {
|
|
if (dict_index_is_unique(index)) {
|
|
row_merge_dup_t dup;
|
|
dup.index = buf->index;
|
|
dup.table = table;
|
|
dup.n_dup = 0;
|
|
|
|
row_merge_buf_sort(buf, &dup);
|
|
|
|
if (dup.n_dup) {
|
|
err = DB_DUPLICATE_KEY;
|
|
err_exit:
|
|
trx->error_key_num = i;
|
|
goto func_exit;
|
|
}
|
|
} else {
|
|
row_merge_buf_sort(buf, NULL);
|
|
}
|
|
}
|
|
|
|
row_merge_buf_write(buf, file, block);
|
|
|
|
if (!row_merge_write(file->fd, file->offset++,
|
|
block)) {
|
|
err = DB_OUT_OF_FILE_SPACE;
|
|
goto err_exit;
|
|
}
|
|
|
|
UNIV_MEM_INVALID(block[0], sizeof block[0]);
|
|
merge_buf[i] = row_merge_buf_empty(buf);
|
|
|
|
/* Try writing the record again, now that
|
|
the buffer has been written out and emptied. */
|
|
|
|
if (UNIV_UNLIKELY
|
|
(row && !row_merge_buf_add(buf, row, ext))) {
|
|
/* An empty buffer should have enough
|
|
room for at least one record. */
|
|
ut_error;
|
|
}
|
|
}
|
|
|
|
mem_heap_empty(row_heap);
|
|
|
|
if (UNIV_UNLIKELY(!has_next)) {
|
|
goto func_exit;
|
|
}
|
|
}
|
|
|
|
func_exit:
|
|
btr_pcur_close(&pcur);
|
|
mtr_commit(&mtr);
|
|
mem_heap_free(row_heap);
|
|
|
|
if (UNIV_LIKELY_NULL(nonnull)) {
|
|
mem_free(nonnull);
|
|
}
|
|
|
|
for (i = 0; i < n_index; i++) {
|
|
row_merge_buf_free(merge_buf[i]);
|
|
}
|
|
|
|
mem_free(merge_buf);
|
|
|
|
trx->op_info = "";
|
|
|
|
return(err);
|
|
}
|
|
|
|
/*****************************************************************
|
|
Merge two blocks of linked lists on disk and write a bigger block. */
|
|
static
|
|
ulint
|
|
row_merge_blocks(
|
|
/*=============*/
|
|
/* out: DB_SUCCESS or error code */
|
|
const dict_index_t* index, /* in: index being created */
|
|
merge_file_t* file, /* in/out: file containing
|
|
index entries */
|
|
row_merge_block_t* block, /* in/out: 3 buffers */
|
|
ulint* foffs0, /* in/out: offset of first
|
|
source list in the file */
|
|
ulint* foffs1, /* in/out: offset of second
|
|
source list in the file */
|
|
merge_file_t* of, /* in/out: output file */
|
|
TABLE* table) /* in/out: MySQL table, for
|
|
reporting erroneous key value
|
|
if applicable */
|
|
{
|
|
mem_heap_t* heap; /* memory heap for offsets0, offsets1 */
|
|
|
|
mrec_buf_t buf[3]; /* buffer for handling split mrec in block[] */
|
|
const byte* b0; /* pointer to block[0] */
|
|
const byte* b1; /* pointer to block[1] */
|
|
byte* b2; /* pointer to block[2] */
|
|
const mrec_t* mrec0; /* merge rec, points to block[0] or buf[0] */
|
|
const mrec_t* mrec1; /* merge rec, points to block[1] or buf[1] */
|
|
ulint* offsets0;/* offsets of mrec0 */
|
|
ulint* offsets1;/* offsets of mrec1 */
|
|
|
|
heap = row_merge_heap_create(index, &offsets0, &offsets1);
|
|
|
|
/* Write a record and read the next record. Split the output
|
|
file in two halves, which can be merged on the following pass. */
|
|
#define ROW_MERGE_WRITE_GET_NEXT(N, AT_END) \
|
|
do { \
|
|
b2 = row_merge_write_rec(&block[2], &buf[2], b2, \
|
|
of->fd, &of->offset, \
|
|
mrec##N, offsets##N); \
|
|
if (UNIV_UNLIKELY(!b2)) { \
|
|
goto corrupt; \
|
|
} \
|
|
b##N = row_merge_read_rec(&block[N], &buf[N], \
|
|
b##N, index, \
|
|
file->fd, foffs##N, \
|
|
&mrec##N, offsets##N); \
|
|
if (UNIV_UNLIKELY(!b##N)) { \
|
|
if (mrec##N) { \
|
|
goto corrupt; \
|
|
} \
|
|
AT_END; \
|
|
} \
|
|
} while (0)
|
|
|
|
if (!row_merge_read(file->fd, *foffs0, &block[0])
|
|
|| !row_merge_read(file->fd, *foffs1, &block[1])) {
|
|
corrupt:
|
|
mem_heap_free(heap);
|
|
return(DB_CORRUPTION);
|
|
}
|
|
|
|
b0 = block[0];
|
|
b1 = block[1];
|
|
b2 = block[2];
|
|
|
|
b0 = row_merge_read_rec(&block[0], &buf[0], b0, index, file->fd,
|
|
foffs0, &mrec0, offsets0);
|
|
b1 = row_merge_read_rec(&block[1], &buf[1], b1, index, file->fd,
|
|
foffs1, &mrec1, offsets1);
|
|
if (UNIV_UNLIKELY(!b0 && mrec0)
|
|
|| UNIV_UNLIKELY(!b1 && mrec1)) {
|
|
|
|
goto corrupt;
|
|
}
|
|
|
|
while (mrec0 && mrec1) {
|
|
switch (row_merge_cmp(mrec0, mrec1,
|
|
offsets0, offsets1, index)) {
|
|
case 0:
|
|
if (UNIV_UNLIKELY
|
|
(dict_index_is_unique(index))) {
|
|
innobase_rec_to_mysql(table, mrec0,
|
|
index, offsets0);
|
|
mem_heap_free(heap);
|
|
return(DB_DUPLICATE_KEY);
|
|
}
|
|
/* fall through */
|
|
case -1:
|
|
ROW_MERGE_WRITE_GET_NEXT(0, goto merged);
|
|
break;
|
|
case 1:
|
|
ROW_MERGE_WRITE_GET_NEXT(1, goto merged);
|
|
break;
|
|
default:
|
|
ut_error;
|
|
}
|
|
|
|
}
|
|
|
|
merged:
|
|
if (mrec0) {
|
|
/* append all mrec0 to output */
|
|
for (;;) {
|
|
ROW_MERGE_WRITE_GET_NEXT(0, goto done0);
|
|
}
|
|
}
|
|
done0:
|
|
if (mrec1) {
|
|
/* append all mrec1 to output */
|
|
for (;;) {
|
|
ROW_MERGE_WRITE_GET_NEXT(1, goto done1);
|
|
}
|
|
}
|
|
done1:
|
|
|
|
mem_heap_free(heap);
|
|
b2 = row_merge_write_eof(&block[2], b2, of->fd, &of->offset);
|
|
return(b2 ? DB_SUCCESS : DB_CORRUPTION);
|
|
}
|
|
|
|
/*****************************************************************
|
|
Merge disk files. */
|
|
static
|
|
ulint
|
|
row_merge(
|
|
/*======*/
|
|
/* out: DB_SUCCESS or error code */
|
|
const dict_index_t* index, /* in: index being created */
|
|
merge_file_t* file, /* in/out: file containing
|
|
index entries */
|
|
ulint half, /* in: half the file */
|
|
row_merge_block_t* block, /* in/out: 3 buffers */
|
|
int* tmpfd, /* in/out: temporary file handle */
|
|
TABLE* table) /* in/out: MySQL table, for
|
|
reporting erroneous key value
|
|
if applicable */
|
|
{
|
|
ulint foffs0; /* first input offset */
|
|
ulint foffs1; /* second input offset */
|
|
ulint error; /* error code */
|
|
merge_file_t of; /* output file */
|
|
|
|
UNIV_MEM_ASSERT_W(block[0], 3 * sizeof block[0]);
|
|
ut_ad(half > 0);
|
|
|
|
of.fd = *tmpfd;
|
|
of.offset = 0;
|
|
|
|
/* The input file will be read sequentially, starting from the
|
|
beginning and the middle. In Linux, the POSIX_FADV_SEQUENTIAL
|
|
affects the entire file. Each block will be read exactly once. */
|
|
posix_fadvise(file->fd, 0, 0,
|
|
POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
|
|
|
|
/* Merge blocks to the output file. */
|
|
foffs0 = 0;
|
|
foffs1 = half;
|
|
|
|
for (; foffs0 < half && foffs1 < file->offset; foffs0++, foffs1++) {
|
|
error = row_merge_blocks(index, file, block,
|
|
&foffs0, &foffs1, &of, table);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
return(error);
|
|
}
|
|
}
|
|
|
|
/* Copy the last block, if there is one. */
|
|
while (foffs0 < half) {
|
|
if (!row_merge_read(file->fd, foffs0++, block)
|
|
|| !row_merge_write(of.fd, of.offset++, block)) {
|
|
return(DB_CORRUPTION);
|
|
}
|
|
}
|
|
while (foffs1 < file->offset) {
|
|
if (!row_merge_read(file->fd, foffs1++, block)
|
|
|| !row_merge_write(of.fd, of.offset++, block)) {
|
|
return(DB_CORRUPTION);
|
|
}
|
|
}
|
|
|
|
/* Swap file descriptors for the next pass. */
|
|
*tmpfd = file->fd;
|
|
*file = of;
|
|
|
|
UNIV_MEM_INVALID(block[0], 3 * sizeof block[0]);
|
|
|
|
return(DB_SUCCESS);
|
|
}
|
|
|
|
/*****************************************************************
|
|
Merge disk files. */
|
|
static
|
|
ulint
|
|
row_merge_sort(
|
|
/*===========*/
|
|
/* out: DB_SUCCESS or error code */
|
|
const dict_index_t* index, /* in: index being created */
|
|
merge_file_t* file, /* in/out: file containing
|
|
index entries */
|
|
row_merge_block_t* block, /* in/out: 3 buffers */
|
|
int* tmpfd, /* in/out: temporary file handle */
|
|
TABLE* table) /* in/out: MySQL table, for
|
|
reporting erroneous key value
|
|
if applicable */
|
|
{
|
|
ulint blksz; /* block size */
|
|
|
|
for (blksz = 1; blksz < file->offset; blksz *= 2) {
|
|
ulint half;
|
|
ulint error;
|
|
|
|
ut_ad(ut_is_2pow(blksz));
|
|
half = ut_2pow_round((file->offset + (blksz - 1)) / 2, blksz);
|
|
error = row_merge(index, file, half, block, tmpfd, table);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
return(error);
|
|
}
|
|
}
|
|
|
|
return(DB_SUCCESS);
|
|
}
|
|
|
|
/*****************************************************************
|
|
Copy externally stored columns to the data tuple. */
|
|
static
|
|
void
|
|
row_merge_copy_blobs(
|
|
/*=================*/
|
|
const mrec_t* mrec, /* in: merge record */
|
|
const ulint* offsets,/* in: offsets of mrec */
|
|
ulint zip_size,/* in: compressed page size in bytes, or 0 */
|
|
dtuple_t* tuple, /* in/out: data tuple */
|
|
mem_heap_t* heap) /* in/out: memory heap */
|
|
{
|
|
ulint i;
|
|
ulint n_fields = dtuple_get_n_fields(tuple);
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
ulint len;
|
|
const void* data;
|
|
dfield_t* field = dtuple_get_nth_field(tuple, i);
|
|
|
|
if (!dfield_is_ext(field)) {
|
|
continue;
|
|
}
|
|
|
|
ut_ad(!dfield_is_null(field));
|
|
|
|
/* The table is locked during index creation.
|
|
Therefore, externally stored columns cannot possibly
|
|
be freed between the time the BLOB pointers are read
|
|
(row_merge_read_clustered_index()) and dereferenced
|
|
(below). */
|
|
data = btr_rec_copy_externally_stored_field(
|
|
mrec, offsets, zip_size, i, &len, heap);
|
|
|
|
dfield_set_data(field, data, len);
|
|
}
|
|
}
|
|
|
|
/************************************************************************
|
|
Read sorted file containing index data tuples and insert these data
|
|
tuples to the index */
|
|
static
|
|
ulint
|
|
row_merge_insert_index_tuples(
|
|
/*==========================*/
|
|
/* out: DB_SUCCESS or error number */
|
|
trx_t* trx, /* in: transaction */
|
|
dict_index_t* index, /* in: index */
|
|
dict_table_t* table, /* in: new table */
|
|
ulint zip_size,/* in: compressed page size of
|
|
the old table, or 0 if uncompressed */
|
|
int fd, /* in: file descriptor */
|
|
row_merge_block_t* block) /* in/out: file buffer */
|
|
{
|
|
mrec_buf_t buf;
|
|
const byte* b;
|
|
que_thr_t* thr;
|
|
ins_node_t* node;
|
|
mem_heap_t* tuple_heap;
|
|
mem_heap_t* graph_heap;
|
|
ulint error = DB_SUCCESS;
|
|
ulint foffs = 0;
|
|
ulint* offsets;
|
|
|
|
ut_ad(trx);
|
|
ut_ad(index);
|
|
ut_ad(table);
|
|
|
|
/* We use the insert query graph as the dummy graph
|
|
needed in the row module call */
|
|
|
|
trx->op_info = "inserting index entries";
|
|
|
|
graph_heap = mem_heap_create(500);
|
|
node = ins_node_create(INS_DIRECT, table, graph_heap);
|
|
|
|
thr = pars_complete_graph_for_exec(node, trx, graph_heap);
|
|
|
|
que_thr_move_to_run_state_for_mysql(thr, trx);
|
|
|
|
tuple_heap = mem_heap_create(1000);
|
|
|
|
{
|
|
ulint i = 1 + REC_OFFS_HEADER_SIZE
|
|
+ dict_index_get_n_fields(index);
|
|
offsets = mem_heap_alloc(graph_heap, i * sizeof *offsets);
|
|
offsets[0] = i;
|
|
offsets[1] = dict_index_get_n_fields(index);
|
|
}
|
|
|
|
b = *block;
|
|
|
|
if (!row_merge_read(fd, foffs, block)) {
|
|
error = DB_CORRUPTION;
|
|
} else {
|
|
for (;;) {
|
|
const mrec_t* mrec;
|
|
dtuple_t* dtuple;
|
|
ulint n_ext;
|
|
|
|
b = row_merge_read_rec(block, &buf, b, index,
|
|
fd, &foffs, &mrec, offsets);
|
|
if (UNIV_UNLIKELY(!b)) {
|
|
/* End of list, or I/O error */
|
|
if (mrec) {
|
|
error = DB_CORRUPTION;
|
|
}
|
|
break;
|
|
}
|
|
|
|
dtuple = row_rec_to_index_entry_low(
|
|
mrec, index, offsets, &n_ext, tuple_heap);
|
|
|
|
if (UNIV_UNLIKELY(n_ext)) {
|
|
row_merge_copy_blobs(mrec, offsets, zip_size,
|
|
dtuple, tuple_heap);
|
|
}
|
|
|
|
node->row = dtuple;
|
|
node->table = table;
|
|
node->trx_id = trx->id;
|
|
|
|
ut_ad(dtuple_validate(dtuple));
|
|
|
|
do {
|
|
thr->run_node = thr;
|
|
thr->prev_node = thr->common.parent;
|
|
|
|
error = row_ins_index_entry(index, dtuple,
|
|
0, FALSE, thr);
|
|
|
|
if (UNIV_LIKELY(error == DB_SUCCESS)) {
|
|
|
|
goto next_rec;
|
|
}
|
|
|
|
thr->lock_state = QUE_THR_LOCK_ROW;
|
|
trx->error_state = error;
|
|
que_thr_stop_for_mysql(thr);
|
|
thr->lock_state = QUE_THR_LOCK_NOLOCK;
|
|
} while (row_mysql_handle_errors(&error, trx,
|
|
thr, NULL));
|
|
|
|
goto err_exit;
|
|
next_rec:
|
|
mem_heap_empty(tuple_heap);
|
|
}
|
|
}
|
|
|
|
que_thr_stop_for_mysql_no_error(thr, trx);
|
|
err_exit:
|
|
que_graph_free(thr->graph);
|
|
|
|
trx->op_info = "";
|
|
|
|
mem_heap_free(tuple_heap);
|
|
|
|
return(error);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Sets an exclusive lock on a table, for the duration of creating indexes. */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_merge_lock_table(
|
|
/*=================*/
|
|
/* out: error code or DB_SUCCESS */
|
|
trx_t* trx, /* in/out: transaction */
|
|
dict_table_t* table, /* in: table to lock */
|
|
enum lock_mode mode) /* in: LOCK_X or LOCK_S */
|
|
{
|
|
mem_heap_t* heap;
|
|
que_thr_t* thr;
|
|
ulint err;
|
|
sel_node_t* node;
|
|
|
|
ut_ad(trx);
|
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
|
ut_ad(mode == LOCK_X || mode == LOCK_S);
|
|
|
|
heap = mem_heap_create(512);
|
|
|
|
trx->op_info = "setting table lock for creating or dropping index";
|
|
|
|
node = sel_node_create(heap);
|
|
thr = pars_complete_graph_for_exec(node, trx, heap);
|
|
thr->graph->state = QUE_FORK_ACTIVE;
|
|
|
|
/* We use the select query graph as the dummy graph needed
|
|
in the lock module call */
|
|
|
|
thr = que_fork_get_first_thr(que_node_get_parent(thr));
|
|
que_thr_move_to_run_state_for_mysql(thr, trx);
|
|
|
|
run_again:
|
|
thr->run_node = thr;
|
|
thr->prev_node = thr->common.parent;
|
|
|
|
err = lock_table(0, table, mode, thr);
|
|
|
|
trx->error_state = err;
|
|
|
|
if (UNIV_LIKELY(err == DB_SUCCESS)) {
|
|
que_thr_stop_for_mysql_no_error(thr, trx);
|
|
} else {
|
|
que_thr_stop_for_mysql(thr);
|
|
|
|
if (err != DB_QUE_THR_SUSPENDED) {
|
|
ibool was_lock_wait;
|
|
|
|
was_lock_wait = row_mysql_handle_errors(
|
|
&err, trx, thr, NULL);
|
|
|
|
if (was_lock_wait) {
|
|
goto run_again;
|
|
}
|
|
} else {
|
|
que_thr_t* run_thr;
|
|
que_node_t* parent;
|
|
|
|
parent = que_node_get_parent(thr);
|
|
run_thr = que_fork_start_command(parent);
|
|
|
|
ut_a(run_thr == thr);
|
|
|
|
/* There was a lock wait but the thread was not
|
|
in a ready to run or running state. */
|
|
trx->error_state = DB_LOCK_WAIT;
|
|
|
|
goto run_again;
|
|
}
|
|
}
|
|
|
|
que_graph_free(thr->graph);
|
|
trx->op_info = "";
|
|
|
|
return(err);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Drop an index from the InnoDB system tables. The data dictionary must
|
|
have been locked exclusively by the caller, because the transaction
|
|
will not be committed. */
|
|
UNIV_INTERN
|
|
void
|
|
row_merge_drop_index(
|
|
/*=================*/
|
|
dict_index_t* index, /* in: index to be removed */
|
|
dict_table_t* table, /* in: table */
|
|
trx_t* trx) /* in: transaction handle */
|
|
{
|
|
ulint err;
|
|
pars_info_t* info = pars_info_create();
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
|
query graphs needed in deleting the dictionary data from system
|
|
tables in Innobase. Deleting a row from SYS_INDEXES table also
|
|
frees the file segments of the B-tree associated with the index. */
|
|
|
|
static const char str1[] =
|
|
"PROCEDURE DROP_INDEX_PROC () IS\n"
|
|
"BEGIN\n"
|
|
"DELETE FROM SYS_FIELDS WHERE INDEX_ID = :indexid;\n"
|
|
"DELETE FROM SYS_INDEXES WHERE ID = :indexid\n"
|
|
" AND TABLE_ID = :tableid;\n"
|
|
"END;\n";
|
|
|
|
ut_ad(index && table && trx);
|
|
|
|
pars_info_add_dulint_literal(info, "indexid", index->id);
|
|
pars_info_add_dulint_literal(info, "tableid", table->id);
|
|
|
|
trx_start_if_not_started(trx);
|
|
trx->op_info = "dropping index";
|
|
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
err = que_eval_sql(info, str1, FALSE, trx);
|
|
|
|
ut_a(err == DB_SUCCESS);
|
|
|
|
/* Replace this index with another equivalent index for all
|
|
foreign key constraints on this table where this index is used */
|
|
|
|
dict_table_replace_index_in_foreign_list(table, index);
|
|
dict_index_remove_from_cache(table, index);
|
|
|
|
trx->op_info = "";
|
|
}
|
|
|
|
/*************************************************************************
|
|
Drop those indexes which were created before an error occurred when
|
|
building an index. The data dictionary must have been locked
|
|
exclusively by the caller, because the transaction will not be
|
|
committed. */
|
|
UNIV_INTERN
|
|
void
|
|
row_merge_drop_indexes(
|
|
/*===================*/
|
|
trx_t* trx, /* in: transaction */
|
|
dict_table_t* table, /* in: table containing the indexes */
|
|
dict_index_t** index, /* in: indexes to drop */
|
|
ulint num_created) /* in: number of elements in index[] */
|
|
{
|
|
ulint key_num;
|
|
|
|
for (key_num = 0; key_num < num_created; key_num++) {
|
|
row_merge_drop_index(index[key_num], table, trx);
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
Drop all partially created indexes during crash recovery. */
|
|
UNIV_INTERN
|
|
void
|
|
row_merge_drop_temp_indexes(void)
|
|
/*=============================*/
|
|
{
|
|
trx_t* trx;
|
|
ulint err;
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
|
query graphs needed in deleting the dictionary data from system
|
|
tables in Innobase. Deleting a row from SYS_INDEXES table also
|
|
frees the file segments of the B-tree associated with the index. */
|
|
#if TEMP_INDEX_PREFIX != '\377'
|
|
# error "TEMP_INDEX_PREFIX != '\377'"
|
|
#endif
|
|
static const char drop_temp_indexes[] =
|
|
"PROCEDURE DROP_TEMP_INDEXES_PROC () IS\n"
|
|
"indexid CHAR;\n"
|
|
"DECLARE CURSOR c IS SELECT ID FROM SYS_INDEXES\n"
|
|
"WHERE SUBSTR(NAME,0,1)='\377';\n"
|
|
"BEGIN\n"
|
|
"\tOPEN c;\n"
|
|
"\tWHILE 1=1 LOOP\n"
|
|
"\t\tFETCH c INTO indexid;\n"
|
|
"\t\tIF (SQL % NOTFOUND) THEN\n"
|
|
"\t\t\tEXIT;\n"
|
|
"\t\tEND IF;\n"
|
|
"\t\tDELETE FROM SYS_FIELDS WHERE INDEX_ID = indexid;\n"
|
|
"\t\tDELETE FROM SYS_INDEXES WHERE ID = indexid;\n"
|
|
"\tEND LOOP;\n"
|
|
"\tCLOSE c;\n"
|
|
"\tCOMMIT WORK;\n"
|
|
"END;\n";
|
|
|
|
trx = trx_allocate_for_background();
|
|
trx->op_info = "dropping partially created indexes";
|
|
row_mysql_lock_data_dictionary(trx);
|
|
|
|
/* Incomplete transactions may be holding some locks on the
|
|
data dictionary tables. However, they should never have been
|
|
able to lock the records corresponding to the partially
|
|
created indexes that we are attempting to delete, because the
|
|
table was locked when the indexes were being created. We will
|
|
drop the partially created indexes before the rollback of
|
|
incomplete transactions is initiated. Thus, this should not
|
|
interfere with the incomplete transactions. */
|
|
trx->isolation_level = TRX_ISO_READ_UNCOMMITTED;
|
|
err = que_eval_sql(NULL, drop_temp_indexes, FALSE, trx);
|
|
ut_a(err == DB_SUCCESS);
|
|
|
|
row_mysql_unlock_data_dictionary(trx);
|
|
trx_free_for_background(trx);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Create a merge file. */
|
|
static
|
|
void
|
|
row_merge_file_create(
|
|
/*==================*/
|
|
merge_file_t* merge_file) /* out: merge file structure */
|
|
{
|
|
merge_file->fd = innobase_mysql_tmpfile();
|
|
merge_file->offset = 0;
|
|
}
|
|
|
|
/*************************************************************************
|
|
Destroy a merge file. */
|
|
static
|
|
void
|
|
row_merge_file_destroy(
|
|
/*===================*/
|
|
merge_file_t* merge_file) /* out: merge file structure */
|
|
{
|
|
if (merge_file->fd != -1) {
|
|
close(merge_file->fd);
|
|
merge_file->fd = -1;
|
|
}
|
|
}
|
|
|
|
/*************************************************************************
|
|
Determine the precise type of a column that is added to a tem
|
|
if a column must be constrained NOT NULL. */
|
|
UNIV_INLINE
|
|
ulint
|
|
row_merge_col_prtype(
|
|
/*=================*/
|
|
/* out: col->prtype, possibly
|
|
ORed with DATA_NOT_NULL */
|
|
const dict_col_t* col, /* in: column */
|
|
const char* col_name, /* in: name of the column */
|
|
const merge_index_def_t*index_def) /* in: the index definition
|
|
of the primary key */
|
|
{
|
|
ulint prtype = col->prtype;
|
|
ulint i;
|
|
|
|
ut_ad(index_def->ind_type & DICT_CLUSTERED);
|
|
|
|
if (prtype & DATA_NOT_NULL) {
|
|
|
|
return(prtype);
|
|
}
|
|
|
|
/* All columns that are included
|
|
in the PRIMARY KEY must be NOT NULL. */
|
|
|
|
for (i = 0; i < index_def->n_fields; i++) {
|
|
if (!strcmp(col_name, index_def->fields[i].field_name)) {
|
|
return(prtype | DATA_NOT_NULL);
|
|
}
|
|
}
|
|
|
|
return(prtype);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Create a temporary table for creating a primary key, using the definition
|
|
of an existing table. */
|
|
UNIV_INTERN
|
|
dict_table_t*
|
|
row_merge_create_temporary_table(
|
|
/*=============================*/
|
|
/* out: table,
|
|
or NULL on error */
|
|
const char* table_name, /* in: new table name */
|
|
const merge_index_def_t*index_def, /* in: the index definition
|
|
of the primary key */
|
|
const dict_table_t* table, /* in: old table definition */
|
|
trx_t* trx) /* in/out: transaction
|
|
(sets error_state) */
|
|
{
|
|
ulint i;
|
|
dict_table_t* new_table = NULL;
|
|
ulint n_cols = dict_table_get_n_user_cols(table);
|
|
ulint error;
|
|
mem_heap_t* heap = mem_heap_create(1000);
|
|
|
|
ut_ad(table_name);
|
|
ut_ad(index_def);
|
|
ut_ad(table);
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
new_table = dict_mem_table_create(table_name, 0, n_cols, table->flags);
|
|
|
|
for (i = 0; i < n_cols; i++) {
|
|
const dict_col_t* col;
|
|
const char* col_name;
|
|
|
|
col = dict_table_get_nth_col(table, i);
|
|
col_name = dict_table_get_col_name(table, i);
|
|
|
|
dict_mem_table_add_col(new_table, heap, col_name, col->mtype,
|
|
row_merge_col_prtype(col, col_name,
|
|
index_def),
|
|
col->len);
|
|
}
|
|
|
|
error = row_create_table_for_mysql(new_table, trx);
|
|
mem_heap_free(heap);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
trx->error_state = error;
|
|
new_table = NULL;
|
|
}
|
|
|
|
return(new_table);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Rename the temporary indexes in the dictionary to permanent ones. The
|
|
data dictionary must have been locked exclusively by the caller,
|
|
because the transaction will not be committed. */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_merge_rename_indexes(
|
|
/*=====================*/
|
|
/* out: DB_SUCCESS if all OK */
|
|
trx_t* trx, /* in/out: transaction */
|
|
dict_table_t* table) /* in/out: table with new indexes */
|
|
{
|
|
ulint err = DB_SUCCESS;
|
|
pars_info_t* info = pars_info_create();
|
|
|
|
/* We use the private SQL parser of Innobase to generate the
|
|
query graphs needed in renaming indexes. */
|
|
|
|
#if TEMP_INDEX_PREFIX != '\377'
|
|
# error "TEMP_INDEX_PREFIX != '\377'"
|
|
#endif
|
|
|
|
static const char rename_indexes[] =
|
|
"PROCEDURE RENAME_INDEXES_PROC () IS\n"
|
|
"BEGIN\n"
|
|
"UPDATE SYS_INDEXES SET NAME=SUBSTR(NAME,1,LENGTH(NAME)-1)\n"
|
|
"WHERE TABLE_ID = :tableid AND SUBSTR(NAME,0,1)='\377';\n"
|
|
"END;\n";
|
|
|
|
ut_ad(table);
|
|
ut_ad(trx);
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
trx->op_info = "renaming indexes";
|
|
|
|
pars_info_add_dulint_literal(info, "tableid", table->id);
|
|
|
|
err = que_eval_sql(info, rename_indexes, FALSE, trx);
|
|
|
|
if (err == DB_SUCCESS) {
|
|
dict_index_t* index = dict_table_get_first_index(table);
|
|
do {
|
|
if (*index->name == TEMP_INDEX_PREFIX) {
|
|
index->name++;
|
|
}
|
|
index = dict_table_get_next_index(index);
|
|
} while (index);
|
|
}
|
|
|
|
trx->op_info = "";
|
|
|
|
return(err);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Rename the tables in the data dictionary. The data dictionary must
|
|
have been locked exclusively by the caller, because the transaction
|
|
will not be committed. */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_merge_rename_tables(
|
|
/*====================*/
|
|
/* out: error code or DB_SUCCESS */
|
|
dict_table_t* old_table, /* in/out: old table, renamed to
|
|
tmp_name */
|
|
dict_table_t* new_table, /* in/out: new table, renamed to
|
|
old_table->name */
|
|
const char* tmp_name, /* in: new name for old_table */
|
|
trx_t* trx) /* in: transaction handle */
|
|
{
|
|
ulint err = DB_ERROR;
|
|
pars_info_t* info;
|
|
const char* old_name= old_table->name;
|
|
|
|
ut_ad(trx->mysql_thread_id == os_thread_get_curr_id());
|
|
ut_ad(old_table != new_table);
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
ut_a(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
trx->op_info = "renaming tables";
|
|
|
|
/* We use the private SQL parser of Innobase to generate the query
|
|
graphs needed in updating the dictionary data in system tables. */
|
|
|
|
info = pars_info_create();
|
|
|
|
pars_info_add_str_literal(info, "new_name", new_table->name);
|
|
pars_info_add_str_literal(info, "old_name", old_name);
|
|
pars_info_add_str_literal(info, "tmp_name", tmp_name);
|
|
|
|
err = que_eval_sql(info,
|
|
"PROCEDURE RENAME_TABLES () IS\n"
|
|
"BEGIN\n"
|
|
"UPDATE SYS_TABLES SET NAME = :tmp_name\n"
|
|
" WHERE NAME = :old_name;\n"
|
|
"UPDATE SYS_TABLES SET NAME = :old_name\n"
|
|
" WHERE NAME = :new_name;\n"
|
|
"END;\n", FALSE, trx);
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
goto err_exit;
|
|
}
|
|
|
|
/* The following calls will also rename the .ibd data files if
|
|
the tables are stored in a single-table tablespace */
|
|
|
|
if (!dict_table_rename_in_cache(old_table, tmp_name, FALSE)
|
|
|| !dict_table_rename_in_cache(new_table, old_name, FALSE)) {
|
|
|
|
err = DB_ERROR;
|
|
goto err_exit;
|
|
}
|
|
|
|
err = dict_load_foreigns(old_name, TRUE);
|
|
|
|
if (err != DB_SUCCESS) {
|
|
err_exit:
|
|
trx->error_state = DB_SUCCESS;
|
|
trx_general_rollback_for_mysql(trx, FALSE, NULL);
|
|
trx->error_state = DB_SUCCESS;
|
|
}
|
|
|
|
trx->op_info = "";
|
|
|
|
return(err);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Create and execute a query graph for creating an index. */
|
|
static
|
|
ulint
|
|
row_merge_create_index_graph(
|
|
/*=========================*/
|
|
/* out: DB_SUCCESS or error code */
|
|
trx_t* trx, /* in: trx */
|
|
dict_table_t* table, /* in: table */
|
|
dict_index_t* index) /* in: index */
|
|
{
|
|
ind_node_t* node; /* Index creation node */
|
|
mem_heap_t* heap; /* Memory heap */
|
|
que_thr_t* thr; /* Query thread */
|
|
ulint err;
|
|
|
|
ut_ad(trx);
|
|
ut_ad(table);
|
|
ut_ad(index);
|
|
|
|
heap = mem_heap_create(512);
|
|
|
|
index->table = table;
|
|
node = ind_create_graph_create(index, heap);
|
|
thr = pars_complete_graph_for_exec(node, trx, heap);
|
|
|
|
ut_a(thr == que_fork_start_command(que_node_get_parent(thr)));
|
|
|
|
que_run_threads(thr);
|
|
|
|
err = trx->error_state;
|
|
|
|
que_graph_free((que_t*) que_node_get_parent(thr));
|
|
|
|
return(err);
|
|
}
|
|
|
|
/*************************************************************************
|
|
Create the index and load in to the dictionary. */
|
|
UNIV_INTERN
|
|
dict_index_t*
|
|
row_merge_create_index(
|
|
/*===================*/
|
|
/* out: index, or NULL on error */
|
|
trx_t* trx, /* in/out: trx (sets error_state) */
|
|
dict_table_t* table, /* in: the index is on this table */
|
|
const merge_index_def_t* /* in: the index definition */
|
|
index_def)
|
|
{
|
|
dict_index_t* index;
|
|
ulint err;
|
|
ulint n_fields = index_def->n_fields;
|
|
ulint i;
|
|
|
|
/* Create the index prototype, using the passed in def, this is not
|
|
a persistent operation. We pass 0 as the space id, and determine at
|
|
a lower level the space id where to store the table. */
|
|
|
|
index = dict_mem_index_create(table->name, index_def->name,
|
|
0, index_def->ind_type, n_fields);
|
|
|
|
ut_a(index);
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
merge_index_field_t* ifield = &index_def->fields[i];
|
|
|
|
dict_mem_index_add_field(index, ifield->field_name,
|
|
ifield->prefix_len);
|
|
}
|
|
|
|
/* Add the index to SYS_INDEXES, using the index prototype. */
|
|
err = row_merge_create_index_graph(trx, table, index);
|
|
|
|
if (err == DB_SUCCESS) {
|
|
|
|
index = row_merge_dict_table_get_index(
|
|
table, index_def);
|
|
|
|
ut_a(index);
|
|
|
|
#ifdef ROW_MERGE_IS_INDEX_USABLE
|
|
/* Note the id of the transaction that created this
|
|
index, we use it to restrict readers from accessing
|
|
this index, to ensure read consistency. */
|
|
index->trx_id = trx->id;
|
|
#endif /* ROW_MERGE_IS_INDEX_USABLE */
|
|
} else {
|
|
index = NULL;
|
|
}
|
|
|
|
return(index);
|
|
}
|
|
|
|
#ifdef ROW_MERGE_IS_INDEX_USABLE
|
|
/*************************************************************************
|
|
Check if a transaction can use an index. */
|
|
UNIV_INTERN
|
|
ibool
|
|
row_merge_is_index_usable(
|
|
/*======================*/
|
|
const trx_t* trx, /* in: transaction */
|
|
const dict_index_t* index) /* in: index to check */
|
|
{
|
|
if (!trx->read_view) {
|
|
return(TRUE);
|
|
}
|
|
|
|
return(ut_dulint_cmp(index->trx_id, trx->read_view->low_limit_id) < 0);
|
|
}
|
|
#endif /* ROW_MERGE_IS_INDEX_USABLE */
|
|
|
|
/*************************************************************************
|
|
Drop the old table. */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_merge_drop_table(
|
|
/*=================*/
|
|
/* out: DB_SUCCESS or error code */
|
|
trx_t* trx, /* in: transaction */
|
|
dict_table_t* table) /* in: table to drop */
|
|
{
|
|
/* There must be no open transactions on the table. */
|
|
ut_a(table->n_mysql_handles_opened == 0);
|
|
|
|
return(row_drop_table_for_mysql(table->name, trx, FALSE));
|
|
}
|
|
|
|
/*************************************************************************
|
|
Build indexes on a table by reading a clustered index,
|
|
creating a temporary file containing index entries, merge sorting
|
|
these index entries and inserting sorted index entries to indexes. */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_merge_build_indexes(
|
|
/*====================*/
|
|
/* out: DB_SUCCESS or error code */
|
|
trx_t* trx, /* in: transaction */
|
|
dict_table_t* old_table, /* in: table where rows are
|
|
read from */
|
|
dict_table_t* new_table, /* in: table where indexes are
|
|
created; identical to old_table
|
|
unless creating a PRIMARY KEY */
|
|
dict_index_t** indexes, /* in: indexes to be created */
|
|
ulint n_indexes, /* in: size of indexes[] */
|
|
TABLE* table) /* in/out: MySQL table, for
|
|
reporting erroneous key value
|
|
if applicable */
|
|
{
|
|
merge_file_t* merge_files;
|
|
row_merge_block_t* block;
|
|
ulint block_size;
|
|
ulint i;
|
|
ulint error;
|
|
int tmpfd;
|
|
|
|
ut_ad(trx);
|
|
ut_ad(old_table);
|
|
ut_ad(new_table);
|
|
ut_ad(indexes);
|
|
ut_ad(n_indexes);
|
|
|
|
trx_start_if_not_started(trx);
|
|
|
|
/* Allocate memory for merge file data structure and initialize
|
|
fields */
|
|
|
|
merge_files = mem_alloc(n_indexes * sizeof *merge_files);
|
|
block_size = 3 * sizeof *block;
|
|
block = os_mem_alloc_large(&block_size);
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
|
|
row_merge_file_create(&merge_files[i]);
|
|
}
|
|
|
|
tmpfd = innobase_mysql_tmpfile();
|
|
|
|
/* Reset the MySQL row buffer that is used when reporting
|
|
duplicate keys. */
|
|
innobase_rec_reset(table);
|
|
|
|
/* Read clustered index of the table and create files for
|
|
secondary index entries for merge sort */
|
|
|
|
error = row_merge_read_clustered_index(
|
|
trx, table, old_table, new_table, indexes,
|
|
merge_files, n_indexes, block);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto func_exit;
|
|
}
|
|
|
|
/* Now we have files containing index entries ready for
|
|
sorting and inserting. */
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
error = row_merge_sort(indexes[i], &merge_files[i],
|
|
block, &tmpfd, table);
|
|
|
|
if (error == DB_SUCCESS) {
|
|
error = row_merge_insert_index_tuples(
|
|
trx, indexes[i], new_table,
|
|
dict_table_zip_size(old_table),
|
|
merge_files[i].fd, block);
|
|
}
|
|
|
|
/* Close the temporary file to free up space. */
|
|
row_merge_file_destroy(&merge_files[i]);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
trx->error_key_num = i;
|
|
goto func_exit;
|
|
}
|
|
}
|
|
|
|
func_exit:
|
|
close(tmpfd);
|
|
|
|
for (i = 0; i < n_indexes; i++) {
|
|
row_merge_file_destroy(&merge_files[i]);
|
|
}
|
|
|
|
mem_free(merge_files);
|
|
os_mem_free_large(block, block_size);
|
|
|
|
return(error);
|
|
}
|