branches/innodb+: Merge revisions 4150:4528 from branches/zip:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
2009-03-24 09:32:21 +01:00
|
|
|
/*****************************************************************************
|
|
|
|
|
2016-06-21 14:21:03 +02:00
|
|
|
Copyright (c) 2005, 2016, Oracle and/or its affiliates. All Rights Reserved.
|
branches/innodb+: Merge revisions 4150:4528 from branches/zip:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
2009-03-24 09:32:21 +01:00
|
|
|
|
|
|
|
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
|
2012-02-28 13:00:00 +01:00
|
|
|
this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
|
branches/innodb+: Merge revisions 4150:4528 from branches/zip:
------------------------------------------------------------------------
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.
------------------------------------------------------------------------
2009-03-24 09:32:21 +01:00
|
|
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/**************************************************//**
|
|
|
|
@file handler/handler0alter.cc
|
2007-09-13 11:31:54 +02:00
|
|
|
Smart ALTER TABLE
|
|
|
|
*******************************************************/
|
|
|
|
|
2014-09-30 19:31:14 +02:00
|
|
|
#include <my_global.h>
|
2010-04-13 17:26:27 +02:00
|
|
|
#include <unireg.h>
|
2007-09-13 11:31:54 +02:00
|
|
|
#include <mysqld_error.h>
|
2013-03-25 23:03:13 +01:00
|
|
|
#include <log.h>
|
|
|
|
#include <debug_sync.h>
|
2012-05-04 07:16:38 +02:00
|
|
|
#include <innodb_priv.h>
|
2013-03-25 23:03:13 +01:00
|
|
|
#include <sql_alter.h>
|
|
|
|
#include <sql_class.h>
|
2015-08-03 13:03:47 +02:00
|
|
|
#include <sql_table.h>
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
#include "dict0crea.h"
|
|
|
|
#include "dict0dict.h"
|
|
|
|
#include "dict0priv.h"
|
2012-08-01 16:27:34 +02:00
|
|
|
#include "dict0stats.h"
|
2013-03-25 23:03:13 +01:00
|
|
|
#include "dict0stats_bg.h"
|
2007-09-13 11:31:54 +02:00
|
|
|
#include "log0log.h"
|
2013-03-25 23:03:13 +01:00
|
|
|
#include "rem0types.h"
|
|
|
|
#include "row0log.h"
|
2007-09-13 11:31:54 +02:00
|
|
|
#include "row0merge.h"
|
|
|
|
#include "srv0srv.h"
|
|
|
|
#include "trx0trx.h"
|
|
|
|
#include "trx0roll.h"
|
|
|
|
#include "ha_prototypes.h"
|
|
|
|
#include "handler0alter.h"
|
2012-08-01 16:27:34 +02:00
|
|
|
#include "srv0mon.h"
|
|
|
|
#include "fts0priv.h"
|
2013-03-25 23:03:13 +01:00
|
|
|
#include "pars0pars.h"
|
2014-05-05 18:20:28 +02:00
|
|
|
#include "row0sel.h"
|
2007-11-01 16:00:44 +01:00
|
|
|
#include "ha_innodb.h"
|
2013-07-13 12:01:13 +02:00
|
|
|
#ifdef WITH_WSREP
|
|
|
|
//#include "wsrep_api.h"
|
|
|
|
#include <sql_acl.h> // PROCESS_ACL
|
|
|
|
#endif
|
2007-11-01 16:00:44 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Operations for creating secondary indexes (no rebuild needed) */
|
2013-03-25 23:03:13 +01:00
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ONLINE_CREATE
|
|
|
|
= Alter_inplace_info::ADD_INDEX
|
|
|
|
| Alter_inplace_info::ADD_UNIQUE_INDEX;
|
|
|
|
|
|
|
|
/** Operations for rebuilding a table in place */
|
2014-02-01 09:33:26 +01:00
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_REBUILD
|
2013-03-25 23:03:13 +01:00
|
|
|
= Alter_inplace_info::ADD_PK_INDEX
|
|
|
|
| Alter_inplace_info::DROP_PK_INDEX
|
|
|
|
| Alter_inplace_info::CHANGE_CREATE_OPTION
|
2014-02-01 09:33:26 +01:00
|
|
|
/* CHANGE_CREATE_OPTION needs to check innobase_need_rebuild() */
|
2013-03-25 23:03:13 +01:00
|
|
|
| Alter_inplace_info::ALTER_COLUMN_NULLABLE
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_NOT_NULLABLE
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_ORDER
|
|
|
|
| Alter_inplace_info::DROP_COLUMN
|
|
|
|
| Alter_inplace_info::ADD_COLUMN
|
2014-05-06 21:13:16 +02:00
|
|
|
| Alter_inplace_info::RECREATE_TABLE
|
2013-03-25 23:03:13 +01:00
|
|
|
/*
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_TYPE
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_EQUAL_PACK_LENGTH
|
|
|
|
*/
|
|
|
|
;
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Operations that require changes to data */
|
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_DATA
|
|
|
|
= INNOBASE_ONLINE_CREATE | INNOBASE_ALTER_REBUILD;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/** Operations for altering a table that InnoDB does not care about */
|
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_INPLACE_IGNORE
|
|
|
|
= Alter_inplace_info::ALTER_COLUMN_DEFAULT
|
2014-05-08 10:25:09 +02:00
|
|
|
| Alter_inplace_info::ALTER_PARTITIONED
|
2013-03-25 23:03:13 +01:00
|
|
|
| Alter_inplace_info::ALTER_COLUMN_COLUMN_FORMAT
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_STORAGE_TYPE
|
|
|
|
| Alter_inplace_info::ALTER_RENAME;
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Operations on foreign key definitions (changing the schema only) */
|
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_FOREIGN_OPERATIONS
|
|
|
|
= Alter_inplace_info::DROP_FOREIGN_KEY
|
|
|
|
| Alter_inplace_info::ADD_FOREIGN_KEY;
|
|
|
|
|
|
|
|
/** Operations that InnoDB cares about and can perform without rebuild */
|
|
|
|
static const Alter_inplace_info::HA_ALTER_FLAGS INNOBASE_ALTER_NOREBUILD
|
|
|
|
= INNOBASE_ONLINE_CREATE
|
|
|
|
| INNOBASE_FOREIGN_OPERATIONS
|
2013-03-25 23:03:13 +01:00
|
|
|
| Alter_inplace_info::DROP_INDEX
|
|
|
|
| Alter_inplace_info::DROP_UNIQUE_INDEX
|
2014-02-01 09:33:26 +01:00
|
|
|
| Alter_inplace_info::ALTER_COLUMN_NAME;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Report an InnoDB error to the client by invoking my_error(). */
|
2016-06-21 14:21:03 +02:00
|
|
|
static UNIV_COLD MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
|
|
|
my_error_innodb(
|
|
|
|
/*============*/
|
|
|
|
dberr_t error, /*!< in: InnoDB error code */
|
|
|
|
const char* table, /*!< in: table name */
|
|
|
|
ulint flags) /*!< in: table flags */
|
|
|
|
{
|
|
|
|
switch (error) {
|
|
|
|
case DB_MISSING_HISTORY:
|
|
|
|
my_error(ER_TABLE_DEF_CHANGED, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_RECORD_NOT_FOUND:
|
|
|
|
my_error(ER_KEY_NOT_FOUND, MYF(0), table);
|
|
|
|
break;
|
|
|
|
case DB_DEADLOCK:
|
|
|
|
my_error(ER_LOCK_DEADLOCK, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_LOCK_WAIT_TIMEOUT:
|
|
|
|
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_INTERRUPTED:
|
|
|
|
my_error(ER_QUERY_INTERRUPTED, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_OUT_OF_MEMORY:
|
|
|
|
my_error(ER_OUT_OF_RESOURCES, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_OUT_OF_FILE_SPACE:
|
|
|
|
my_error(ER_RECORD_FILE_FULL, MYF(0), table);
|
2015-03-09 17:21:48 +01:00
|
|
|
ut_error;
|
2013-03-25 23:03:13 +01:00
|
|
|
break;
|
2014-02-26 19:23:04 +01:00
|
|
|
case DB_TEMP_FILE_WRITE_FAILURE:
|
2014-02-26 19:36:33 +01:00
|
|
|
my_error(ER_GET_ERRMSG, MYF(0),
|
|
|
|
DB_TEMP_FILE_WRITE_FAILURE,
|
|
|
|
ut_strerr(DB_TEMP_FILE_WRITE_FAILURE),
|
|
|
|
"InnoDB");
|
2014-02-26 19:23:04 +01:00
|
|
|
break;
|
2013-03-25 23:03:13 +01:00
|
|
|
case DB_TOO_BIG_INDEX_COL:
|
|
|
|
my_error(ER_INDEX_COLUMN_TOO_LONG, MYF(0),
|
|
|
|
DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(flags));
|
|
|
|
break;
|
|
|
|
case DB_TOO_MANY_CONCURRENT_TRXS:
|
|
|
|
my_error(ER_TOO_MANY_CONCURRENT_TRXS, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_LOCK_TABLE_FULL:
|
|
|
|
my_error(ER_LOCK_TABLE_FULL, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_UNDO_RECORD_TOO_BIG:
|
|
|
|
my_error(ER_UNDO_RECORD_TOO_BIG, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_CORRUPTION:
|
|
|
|
my_error(ER_NOT_KEYFILE, MYF(0), table);
|
|
|
|
break;
|
|
|
|
case DB_TOO_BIG_RECORD:
|
|
|
|
my_error(ER_TOO_BIG_ROWSIZE, MYF(0),
|
|
|
|
page_get_free_space_of_empty(
|
|
|
|
flags & DICT_TF_COMPACT) / 2);
|
|
|
|
break;
|
|
|
|
case DB_INVALID_NULL:
|
|
|
|
/* TODO: report the row, as we do for DB_DUPLICATE_KEY */
|
|
|
|
my_error(ER_INVALID_USE_OF_NULL, MYF(0));
|
|
|
|
break;
|
2015-12-13 10:11:49 +01:00
|
|
|
case DB_TABLESPACE_EXISTS:
|
|
|
|
my_error(ER_TABLESPACE_EXISTS, MYF(0), table);
|
|
|
|
break;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
case DB_SUCCESS:
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
case DB_ONLINE_LOG_TOO_BIG:
|
|
|
|
/* These codes should not be passed here. */
|
|
|
|
ut_error;
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
default:
|
2013-07-21 19:24:20 +02:00
|
|
|
my_error(ER_GET_ERRNO, MYF(0), error, "InnoDB");
|
2013-03-25 23:03:13 +01:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determine if fulltext indexes exist in a given table.
|
2014-02-01 09:33:26 +01:00
|
|
|
@param table MySQL table
|
2013-03-25 23:03:13 +01:00
|
|
|
@return whether fulltext indexes exist on the table */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
innobase_fulltext_exist(
|
|
|
|
/*====================*/
|
2014-02-01 09:33:26 +01:00
|
|
|
const TABLE* table)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
for (uint i = 0; i < table->s->keys; i++) {
|
|
|
|
if (table->key_info[i].flags & HA_FULLTEXT) {
|
2013-03-25 23:03:13 +01:00
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*******************************************************************//**
|
|
|
|
Determine if ALTER TABLE needs to rebuild the table.
|
|
|
|
@param ha_alter_info the DDL operation
|
2016-02-15 13:43:42 +01:00
|
|
|
@param altered_table MySQL original table
|
2013-03-25 23:03:13 +01:00
|
|
|
@return whether it is necessary to rebuild the table */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_need_rebuild(
|
|
|
|
/*==================*/
|
2016-02-15 13:43:42 +01:00
|
|
|
const Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* altered_table)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2016-09-27 17:56:00 +02:00
|
|
|
Alter_inplace_info::HA_ALTER_FLAGS alter_inplace_flags =
|
|
|
|
ha_alter_info->handler_flags & ~(INNOBASE_INPLACE_IGNORE);
|
|
|
|
|
|
|
|
if (alter_inplace_flags
|
2013-03-25 23:03:13 +01:00
|
|
|
== Alter_inplace_info::CHANGE_CREATE_OPTION
|
|
|
|
&& !(ha_alter_info->create_info->used_fields
|
|
|
|
& (HA_CREATE_USED_ROW_FORMAT
|
|
|
|
| HA_CREATE_USED_KEY_BLOCK_SIZE))) {
|
|
|
|
/* Any other CHANGE_CREATE_OPTION than changing
|
|
|
|
ROW_FORMAT or KEY_BLOCK_SIZE is ignored. */
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
2016-02-15 13:43:42 +01:00
|
|
|
/* If alter table changes column name and adds a new
|
|
|
|
index, we need to check is this new index created
|
|
|
|
to new column name. This is because column name
|
|
|
|
changes are done normally after creating indexes. */
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME) &&
|
|
|
|
((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_INDEX) ||
|
|
|
|
(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_FOREIGN_KEY))) {
|
2016-08-11 13:39:47 +02:00
|
|
|
for (ulint i = 0; i < ha_alter_info->index_add_count; i++) {
|
2016-02-15 13:43:42 +01:00
|
|
|
const KEY* key = &ha_alter_info->key_info_buffer[
|
|
|
|
ha_alter_info->index_add_buffer[i]];
|
|
|
|
|
|
|
|
for (ulint j = 0; j < key->user_defined_key_parts; j++) {
|
|
|
|
const KEY_PART_INFO* key_part = &(key->key_part[j]);
|
|
|
|
const Field* field = altered_table->field[key_part->fieldnr];
|
|
|
|
|
|
|
|
/* Field used on added index is renamed on
|
|
|
|
this same alter table. We need table
|
|
|
|
rebuild. */
|
2016-08-11 13:39:47 +02:00
|
|
|
if (field && field->flags & FIELD_IS_RENAMED) {
|
2016-02-15 13:43:42 +01:00
|
|
|
return (true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-08-11 13:39:47 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
return(!!(ha_alter_info->handler_flags & INNOBASE_ALTER_REBUILD));
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Check if InnoDB supports a particular alter table in-place
|
|
|
|
@param altered_table TABLE object for new version of table.
|
|
|
|
@param ha_alter_info Structure describing changes to be done
|
|
|
|
by ALTER TABLE and holding data used during in-place alter.
|
|
|
|
|
|
|
|
@retval HA_ALTER_INPLACE_NOT_SUPPORTED Not supported
|
|
|
|
@retval HA_ALTER_INPLACE_NO_LOCK Supported
|
|
|
|
@retval HA_ALTER_INPLACE_SHARED_LOCK_AFTER_PREPARE Supported, but requires
|
|
|
|
lock during main phase and exclusive lock during prepare phase.
|
|
|
|
@retval HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE Supported, prepare phase
|
|
|
|
requires exclusive lock (any transactions that have accessed the table
|
|
|
|
must commit or roll back first, and no transactions can access the table
|
|
|
|
while prepare_inplace_alter_table() is executing)
|
|
|
|
*/
|
|
|
|
UNIV_INTERN
|
|
|
|
enum_alter_inplace_result
|
|
|
|
ha_innobase::check_if_supported_inplace_alter(
|
|
|
|
/*==========================================*/
|
|
|
|
TABLE* altered_table,
|
|
|
|
Alter_inplace_info* ha_alter_info)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("check_if_supported_inplace_alter");
|
|
|
|
|
2015-10-09 17:21:46 +02:00
|
|
|
if (high_level_read_only) {
|
2013-03-25 23:03:13 +01:00
|
|
|
ha_alter_info->unsupported_reason =
|
|
|
|
innobase_get_err_msg(ER_READ_ONLY_MODE);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
} else if (srv_created_new_raw || srv_force_recovery) {
|
2014-05-05 18:20:28 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ha_alter_info->unsupported_reason =
|
|
|
|
innobase_get_err_msg(ER_READ_ONLY_MODE);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
if (altered_table->s->stored_fields > REC_MAX_N_USER_FIELDS) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Deny the inplace ALTER TABLE. MySQL will try to
|
|
|
|
re-create the table and ha_innobase::create() will
|
|
|
|
return an error too. This is how we effectively
|
|
|
|
deny adding too many columns to a table. */
|
|
|
|
ha_alter_info->unsupported_reason =
|
|
|
|
innobase_get_err_msg(ER_TOO_MANY_FIELDS);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
update_thd();
|
|
|
|
trx_search_latch_release_if_reserved(prebuilt->trx);
|
|
|
|
|
|
|
|
if (ha_alter_info->handler_flags
|
2014-02-01 09:33:26 +01:00
|
|
|
& ~(INNOBASE_INPLACE_IGNORE
|
|
|
|
| INNOBASE_ALTER_NOREBUILD
|
|
|
|
| INNOBASE_ALTER_REBUILD)) {
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& (Alter_inplace_info::ALTER_COLUMN_EQUAL_PACK_LENGTH
|
|
|
|
| Alter_inplace_info::ALTER_COLUMN_TYPE))
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_COLUMN_TYPE);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only support online add foreign key constraint when
|
|
|
|
check_foreigns is turned off */
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_FOREIGN_KEY)
|
|
|
|
&& prebuilt->trx->check_foreigns) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FK_CHECK);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NO_LOCK);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Only support NULL -> NOT NULL change if strict table sql_mode
|
|
|
|
is set. Fall back to COPY for conversion if not strict tables.
|
|
|
|
In-Place will fail with an error when trying to convert
|
|
|
|
NULL to a NOT NULL value. */
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NOT_NULLABLE)
|
|
|
|
&& !thd_is_strict_mode(user_thd)) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* InnoDB cannot IGNORE when creating unique indexes. IGNORE
|
|
|
|
should silently delete some duplicate rows. Our inplace_alter
|
|
|
|
code will not delete anything from existing indexes. */
|
|
|
|
if (ha_alter_info->ignore
|
|
|
|
&& (ha_alter_info->handler_flags
|
|
|
|
& (Alter_inplace_info::ADD_PK_INDEX
|
|
|
|
| Alter_inplace_info::ADD_UNIQUE_INDEX))) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_IGNORE);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* DROP PRIMARY KEY is only allowed in combination with ADD
|
|
|
|
PRIMARY KEY. */
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& (Alter_inplace_info::ADD_PK_INDEX
|
|
|
|
| Alter_inplace_info::DROP_PK_INDEX))
|
|
|
|
== Alter_inplace_info::DROP_PK_INDEX) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOPK);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If a column change from NOT NULL to NULL,
|
|
|
|
and there's a implict pk on this column. the
|
|
|
|
table should be rebuild. The change should
|
|
|
|
only go through the "Copy" method.*/
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NULLABLE)) {
|
|
|
|
uint primary_key = altered_table->s->primary_key;
|
|
|
|
|
|
|
|
/* See if MYSQL table has no pk but we do.*/
|
|
|
|
if (UNIV_UNLIKELY(primary_key >= MAX_KEY)
|
|
|
|
&& !row_table_got_default_clust_index(prebuilt->table)) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_PRIMARY_CANT_HAVE_NULL);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
}
|
2013-11-13 22:58:19 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
InnoDB in different MariaDB versions was generating different mtype
|
|
|
|
codes for certain types. In some cases the signed/unsigned bit was
|
|
|
|
generated differently too.
|
|
|
|
|
|
|
|
Online ALTER would change the mtype/unsigned_flag (to what the
|
|
|
|
current code generates) without changing the underlying data
|
|
|
|
represenation, and it might result in data corruption.
|
|
|
|
|
|
|
|
Don't do online ALTER if mtype/unsigned_flag are wrong.
|
|
|
|
*/
|
2014-06-03 14:57:29 +02:00
|
|
|
for (ulint i = 0, icol= 0; i < table->s->fields; i++) {
|
2013-11-13 22:58:19 +01:00
|
|
|
const Field* field = table->field[i];
|
2014-06-03 14:57:29 +02:00
|
|
|
const dict_col_t* col = dict_table_get_nth_col(prebuilt->table, icol);
|
2013-11-13 22:58:19 +01:00
|
|
|
ulint unsigned_flag;
|
2014-06-03 14:57:29 +02:00
|
|
|
if (!field->stored_in_db)
|
|
|
|
continue;
|
|
|
|
icol++;
|
|
|
|
|
2013-11-13 22:58:19 +01:00
|
|
|
if (col->mtype != get_innobase_type_from_mysql_type(&unsigned_flag, field)) {
|
|
|
|
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((col->prtype & DATA_UNSIGNED) != unsigned_flag) {
|
|
|
|
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2015-06-30 21:24:37 +02:00
|
|
|
/* If we have column that has changed from NULL -> NOT NULL
|
|
|
|
and column default has changed we need to do additional
|
|
|
|
check. */
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NOT_NULLABLE) &&
|
|
|
|
(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_DEFAULT)) {
|
|
|
|
Alter_info *alter_info = ha_alter_info->alter_info;
|
|
|
|
List_iterator<Create_field> def_it(alter_info->create_list);
|
|
|
|
Create_field *def;
|
|
|
|
while ((def=def_it++)) {
|
|
|
|
|
|
|
|
/* If this is first column definition whose SQL type
|
|
|
|
is TIMESTAMP and it is defined as NOT NULL and
|
|
|
|
it has either constant default or function default
|
|
|
|
we must use "Copy" method. */
|
|
|
|
if (is_timestamp_type(def->sql_type)) {
|
|
|
|
if ((def->flags & NOT_NULL_FLAG) != 0 && // NOT NULL
|
|
|
|
(def->def != NULL || // constant default ?
|
|
|
|
def->unireg_check != Field::NONE)) { // function default
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_NOT_NULL);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-04-21 09:52:52 +02:00
|
|
|
ulint n_indexes = UT_LIST_GET_LEN((prebuilt->table)->indexes);
|
|
|
|
|
|
|
|
/* If InnoDB dictionary and MySQL frm file are not consistent
|
|
|
|
use "Copy" method. */
|
|
|
|
if (prebuilt->table->dict_frm_mismatch) {
|
|
|
|
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_NO_SUCH_INDEX);
|
|
|
|
ib_push_frm_error(user_thd, prebuilt->table, altered_table,
|
|
|
|
n_indexes, true);
|
|
|
|
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* We should be able to do the operation in-place.
|
|
|
|
See if we can do it online (LOCK=NONE). */
|
|
|
|
bool online = true;
|
|
|
|
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
|
|
|
|
/* Fix the key parts. */
|
|
|
|
for (KEY* new_key = ha_alter_info->key_info_buffer;
|
|
|
|
new_key < ha_alter_info->key_info_buffer
|
|
|
|
+ ha_alter_info->key_count;
|
|
|
|
new_key++) {
|
|
|
|
for (KEY_PART_INFO* key_part = new_key->key_part;
|
|
|
|
key_part < new_key->key_part + new_key->user_defined_key_parts;
|
|
|
|
key_part++) {
|
|
|
|
const Create_field* new_field;
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
DBUG_ASSERT(key_part->fieldnr < altered_table->s->fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
cf_it.rewind();
|
|
|
|
for (uint fieldnr = 0; (new_field = cf_it++);
|
|
|
|
fieldnr++) {
|
|
|
|
if (fieldnr == key_part->fieldnr) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(new_field);
|
|
|
|
|
|
|
|
key_part->field = altered_table->field[
|
|
|
|
key_part->fieldnr];
|
|
|
|
/* In some special cases InnoDB emits "false"
|
|
|
|
duplicate key errors with NULL key values. Let
|
|
|
|
us play safe and ensure that we can correctly
|
|
|
|
print key values even in such cases .*/
|
|
|
|
key_part->null_offset = key_part->field->null_offset();
|
|
|
|
key_part->null_bit = key_part->field->null_bit;
|
|
|
|
|
|
|
|
if (new_field->field) {
|
|
|
|
/* This is an existing column. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is an added column. */
|
|
|
|
DBUG_ASSERT(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_COLUMN);
|
|
|
|
|
|
|
|
/* We cannot replace a hidden FTS_DOC_ID
|
|
|
|
with a user-visible FTS_DOC_ID. */
|
|
|
|
if (prebuilt->table->fts
|
2014-02-01 09:33:26 +01:00
|
|
|
&& innobase_fulltext_exist(altered_table)
|
2013-03-25 23:03:13 +01:00
|
|
|
&& !my_strcasecmp(
|
|
|
|
system_charset_info,
|
|
|
|
key_part->field->field_name,
|
|
|
|
FTS_DOC_ID_COL_NAME)) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_HIDDEN_FTS);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT((MTYP_TYPENR(key_part->field->unireg_check)
|
|
|
|
== Field::NEXT_NUMBER)
|
|
|
|
== !!(key_part->field->flags
|
|
|
|
& AUTO_INCREMENT_FLAG));
|
|
|
|
|
|
|
|
if (key_part->field->flags & AUTO_INCREMENT_FLAG) {
|
|
|
|
/* We cannot assign an AUTO_INCREMENT
|
|
|
|
column values during online ALTER. */
|
|
|
|
DBUG_ASSERT(key_part->field == altered_table
|
|
|
|
-> found_next_number_field);
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_AUTOINC);
|
|
|
|
online = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(!prebuilt->table->fts || prebuilt->table->fts->doc_col
|
2013-07-31 15:41:29 +02:00
|
|
|
<= table->s->stored_fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(!prebuilt->table->fts || prebuilt->table->fts->doc_col
|
|
|
|
< dict_table_get_n_user_cols(prebuilt->table));
|
|
|
|
|
|
|
|
if (prebuilt->table->fts
|
2014-02-01 09:33:26 +01:00
|
|
|
&& innobase_fulltext_exist(altered_table)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* FULLTEXT indexes are supposed to remain. */
|
|
|
|
/* Disallow DROP INDEX FTS_DOC_ID_INDEX */
|
|
|
|
|
|
|
|
for (uint i = 0; i < ha_alter_info->index_drop_count; i++) {
|
|
|
|
if (!my_strcasecmp(
|
|
|
|
system_charset_info,
|
|
|
|
ha_alter_info->index_drop_buffer[i]->name,
|
|
|
|
FTS_DOC_ID_INDEX_NAME)) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* InnoDB can have a hidden FTS_DOC_ID_INDEX on a
|
|
|
|
visible FTS_DOC_ID column as well. Prevent dropping or
|
|
|
|
renaming the FTS_DOC_ID. */
|
|
|
|
|
|
|
|
for (Field** fp = table->field; *fp; fp++) {
|
|
|
|
if (!((*fp)->flags
|
|
|
|
& (FIELD_IS_RENAMED | FIELD_IS_DROPPED))) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!my_strcasecmp(
|
|
|
|
system_charset_info,
|
|
|
|
(*fp)->field_name,
|
|
|
|
FTS_DOC_ID_COL_NAME)) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_CHANGE_FTS);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt->trx->will_lock++;
|
|
|
|
|
|
|
|
if (!online) {
|
|
|
|
/* We already determined that only a non-locking
|
|
|
|
operation is possible. */
|
|
|
|
} else if (((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_PK_INDEX)
|
2016-02-15 13:43:42 +01:00
|
|
|
|| innobase_need_rebuild(ha_alter_info, table))
|
2015-08-03 13:03:47 +02:00
|
|
|
&& (innobase_fulltext_exist(altered_table))) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Refuse to rebuild the table online, if
|
2015-08-03 13:03:47 +02:00
|
|
|
fulltext indexes are to survive the rebuild. */
|
2013-03-25 23:03:13 +01:00
|
|
|
online = false;
|
|
|
|
/* If the table already contains fulltext indexes,
|
|
|
|
refuse to rebuild the table natively altogether. */
|
|
|
|
if (prebuilt->table->fts) {
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_INNODB_FT_LIMIT);
|
|
|
|
DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
|
|
|
|
}
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS);
|
|
|
|
} else if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_INDEX)) {
|
|
|
|
/* Building a full-text index requires a lock.
|
|
|
|
We could do without a lock if the table already contains
|
|
|
|
an FTS_DOC_ID column, but in that case we would have
|
|
|
|
to apply the modification log to the full-text indexes. */
|
|
|
|
|
|
|
|
for (uint i = 0; i < ha_alter_info->index_add_count; i++) {
|
|
|
|
const KEY* key =
|
|
|
|
&ha_alter_info->key_info_buffer[
|
|
|
|
ha_alter_info->index_add_buffer[i]];
|
|
|
|
if (key->flags & HA_FULLTEXT) {
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
|
|
|
|
& ~(HA_FULLTEXT
|
|
|
|
| HA_PACK_KEY
|
|
|
|
| HA_GENERATED_KEY
|
|
|
|
| HA_BINARY_PACK_KEY)));
|
|
|
|
ha_alter_info->unsupported_reason = innobase_get_err_msg(
|
|
|
|
ER_ALTER_OPERATION_NOT_SUPPORTED_REASON_FTS);
|
|
|
|
online = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(online
|
|
|
|
? HA_ALTER_INPLACE_NO_LOCK_AFTER_PREPARE
|
|
|
|
: HA_ALTER_INPLACE_SHARED_LOCK_AFTER_PREPARE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Initialize the dict_foreign_t structure with supplied info
|
|
|
|
@return true if added, false if duplicate foreign->id */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(1,3,5,7)))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_init_foreign(
|
|
|
|
/*==================*/
|
|
|
|
dict_foreign_t* foreign, /*!< in/out: structure to
|
|
|
|
initialize */
|
|
|
|
char* constraint_name, /*!< in/out: constraint name if
|
|
|
|
exists */
|
|
|
|
dict_table_t* table, /*!< in: foreign table */
|
|
|
|
dict_index_t* index, /*!< in: foreign key index */
|
|
|
|
const char** column_names, /*!< in: foreign key column
|
|
|
|
names */
|
|
|
|
ulint num_field, /*!< in: number of columns */
|
|
|
|
const char* referenced_table_name, /*!< in: referenced table
|
|
|
|
name */
|
|
|
|
dict_table_t* referenced_table, /*!< in: referenced table */
|
|
|
|
dict_index_t* referenced_index, /*!< in: referenced index */
|
|
|
|
const char** referenced_column_names,/*!< in: referenced column
|
|
|
|
names */
|
|
|
|
ulint referenced_num_field) /*!< in: number of referenced
|
|
|
|
columns */
|
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (constraint_name) {
|
|
|
|
ulint db_len;
|
|
|
|
|
|
|
|
/* Catenate 'databasename/' to the constraint name specified
|
|
|
|
by the user: we conceive the constraint as belonging to the
|
|
|
|
same MySQL 'database' as the table itself. We store the name
|
|
|
|
to foreign->id. */
|
|
|
|
|
|
|
|
db_len = dict_get_db_name_len(table->name);
|
|
|
|
|
|
|
|
foreign->id = static_cast<char*>(mem_heap_alloc(
|
|
|
|
foreign->heap, db_len + strlen(constraint_name) + 2));
|
|
|
|
|
|
|
|
ut_memcpy(foreign->id, table->name, db_len);
|
|
|
|
foreign->id[db_len] = '/';
|
|
|
|
strcpy(foreign->id + db_len + 1, constraint_name);
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Check if any existing foreign key has the same id,
|
|
|
|
this is needed only if user supplies the constraint name */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-09-11 10:13:35 +02:00
|
|
|
if (table->foreign_set.find(foreign)
|
|
|
|
!= table->foreign_set.end()) {
|
|
|
|
return(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
foreign->foreign_table = table;
|
|
|
|
foreign->foreign_table_name = mem_heap_strdup(
|
|
|
|
foreign->heap, table->name);
|
|
|
|
dict_mem_foreign_table_name_lookup_set(foreign, TRUE);
|
|
|
|
|
|
|
|
foreign->foreign_index = index;
|
|
|
|
foreign->n_fields = (unsigned int) num_field;
|
|
|
|
|
|
|
|
foreign->foreign_col_names = static_cast<const char**>(
|
|
|
|
mem_heap_alloc(foreign->heap, num_field * sizeof(void*)));
|
|
|
|
|
|
|
|
for (ulint i = 0; i < foreign->n_fields; i++) {
|
|
|
|
foreign->foreign_col_names[i] = mem_heap_strdup(
|
|
|
|
foreign->heap, column_names[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
foreign->referenced_index = referenced_index;
|
|
|
|
foreign->referenced_table = referenced_table;
|
|
|
|
|
|
|
|
foreign->referenced_table_name = mem_heap_strdup(
|
|
|
|
foreign->heap, referenced_table_name);
|
|
|
|
dict_mem_referenced_table_name_lookup_set(foreign, TRUE);
|
|
|
|
|
|
|
|
foreign->referenced_col_names = static_cast<const char**>(
|
|
|
|
mem_heap_alloc(foreign->heap,
|
|
|
|
referenced_num_field * sizeof(void*)));
|
|
|
|
|
|
|
|
for (ulint i = 0; i < foreign->n_fields; i++) {
|
|
|
|
foreign->referenced_col_names[i]
|
|
|
|
= mem_heap_strdup(foreign->heap,
|
|
|
|
referenced_column_names[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Check whether the foreign key options is legit
|
|
|
|
@return true if it is */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_check_fk_option(
|
|
|
|
/*=====================*/
|
2014-02-01 09:33:26 +01:00
|
|
|
const dict_foreign_t* foreign) /*!< in: foreign key */
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!foreign->foreign_index) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (foreign->type & (DICT_FOREIGN_ON_UPDATE_SET_NULL
|
2014-02-01 09:33:26 +01:00
|
|
|
| DICT_FOREIGN_ON_DELETE_SET_NULL)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
for (ulint j = 0; j < foreign->n_fields; j++) {
|
|
|
|
if ((dict_index_get_nth_col(
|
2014-02-01 09:33:26 +01:00
|
|
|
foreign->foreign_index, j)->prtype)
|
|
|
|
& DATA_NOT_NULL) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* It is not sensible to define
|
|
|
|
SET NULL if the column is not
|
|
|
|
allowed to be NULL! */
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Set foreign key options
|
|
|
|
@return true if successfully set */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_set_foreign_key_option(
|
|
|
|
/*============================*/
|
|
|
|
dict_foreign_t* foreign, /*!< in:InnoDB Foreign key */
|
|
|
|
Foreign_key* fk_key) /*!< in: Foreign key info from
|
|
|
|
MySQL */
|
|
|
|
{
|
|
|
|
ut_ad(!foreign->type);
|
|
|
|
|
|
|
|
switch (fk_key->delete_opt) {
|
|
|
|
case Foreign_key::FK_OPTION_NO_ACTION:
|
|
|
|
case Foreign_key::FK_OPTION_RESTRICT:
|
|
|
|
case Foreign_key::FK_OPTION_DEFAULT:
|
|
|
|
foreign->type = DICT_FOREIGN_ON_DELETE_NO_ACTION;
|
|
|
|
break;
|
|
|
|
case Foreign_key::FK_OPTION_CASCADE:
|
|
|
|
foreign->type = DICT_FOREIGN_ON_DELETE_CASCADE;
|
|
|
|
break;
|
|
|
|
case Foreign_key::FK_OPTION_SET_NULL:
|
|
|
|
foreign->type = DICT_FOREIGN_ON_DELETE_SET_NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (fk_key->update_opt) {
|
|
|
|
case Foreign_key::FK_OPTION_NO_ACTION:
|
|
|
|
case Foreign_key::FK_OPTION_RESTRICT:
|
|
|
|
case Foreign_key::FK_OPTION_DEFAULT:
|
|
|
|
foreign->type |= DICT_FOREIGN_ON_UPDATE_NO_ACTION;
|
|
|
|
break;
|
|
|
|
case Foreign_key::FK_OPTION_CASCADE:
|
|
|
|
foreign->type |= DICT_FOREIGN_ON_UPDATE_CASCADE;
|
|
|
|
break;
|
|
|
|
case Foreign_key::FK_OPTION_SET_NULL:
|
|
|
|
foreign->type |= DICT_FOREIGN_ON_UPDATE_SET_NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(innobase_check_fk_option(foreign));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*******************************************************************//**
|
|
|
|
Check if a foreign key constraint can make use of an index
|
|
|
|
that is being created.
|
|
|
|
@return useable index, or NULL if none found */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
const KEY*
|
|
|
|
innobase_find_equiv_index(
|
|
|
|
/*======================*/
|
|
|
|
const char*const* col_names,
|
|
|
|
/*!< in: column names */
|
|
|
|
uint n_cols, /*!< in: number of columns */
|
|
|
|
const KEY* keys, /*!< in: index information */
|
|
|
|
const uint* add, /*!< in: indexes being created */
|
|
|
|
uint n_add) /*!< in: number of indexes to create */
|
|
|
|
{
|
|
|
|
for (uint i = 0; i < n_add; i++) {
|
|
|
|
const KEY* key = &keys[add[i]];
|
|
|
|
|
|
|
|
if (key->user_defined_key_parts < n_cols) {
|
|
|
|
no_match:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (uint j = 0; j < n_cols; j++) {
|
|
|
|
const KEY_PART_INFO& key_part = key->key_part[j];
|
|
|
|
uint32 col_len
|
|
|
|
= key_part.field->pack_length();
|
|
|
|
|
|
|
|
/* The MySQL pack length contains 1 or 2 bytes
|
|
|
|
length field for a true VARCHAR. */
|
|
|
|
|
|
|
|
if (key_part.field->type() == MYSQL_TYPE_VARCHAR) {
|
|
|
|
col_len -= static_cast<const Field_varstring*>(
|
|
|
|
key_part.field)->length_bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (key_part.length < col_len) {
|
|
|
|
|
|
|
|
/* Column prefix indexes cannot be
|
|
|
|
used for FOREIGN KEY constraints. */
|
|
|
|
goto no_match;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (innobase_strcasecmp(col_names[j],
|
|
|
|
key_part.field->field_name)) {
|
|
|
|
/* Name mismatch */
|
|
|
|
goto no_match;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(key);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
2014-02-01 09:33:26 +01:00
|
|
|
Find an index whose first fields are the columns in the array
|
2013-03-25 23:03:13 +01:00
|
|
|
in the same order and is not marked for deletion
|
|
|
|
@return matching index, NULL if not found */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(1,2,6), warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_index_t*
|
|
|
|
innobase_find_fk_index(
|
|
|
|
/*===================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
/*!< in: alter table info */
|
|
|
|
dict_table_t* table, /*!< in: table */
|
2014-02-01 09:33:26 +01:00
|
|
|
const char** col_names,
|
|
|
|
/*!< in: column names, or NULL
|
|
|
|
to use table->col_names */
|
|
|
|
dict_index_t** drop_index,
|
|
|
|
/*!< in: indexes to be dropped */
|
|
|
|
ulint n_drop_index,
|
|
|
|
/*!< in: size of drop_index[] */
|
2013-03-25 23:03:13 +01:00
|
|
|
const char** columns,/*!< in: array of column names */
|
|
|
|
ulint n_cols) /*!< in: number of columns */
|
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_index_t* index;
|
|
|
|
|
|
|
|
index = dict_table_get_first_index(table);
|
|
|
|
|
|
|
|
while (index != NULL) {
|
|
|
|
if (!(index->type & DICT_FTS)
|
|
|
|
&& dict_foreign_qualify_index(
|
|
|
|
table, col_names, columns, n_cols,
|
2015-08-03 22:09:43 +02:00
|
|
|
index, NULL, true, 0,
|
|
|
|
NULL, NULL, NULL)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < n_drop_index; i++) {
|
|
|
|
if (index == drop_index[i]) {
|
|
|
|
/* Skip to-be-dropped indexes. */
|
|
|
|
goto next_rec;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
return(index);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
next_rec:
|
2014-02-01 09:33:26 +01:00
|
|
|
index = dict_table_get_next_index(index);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
return(NULL);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Create InnoDB foreign key structure from MySQL alter_info
|
|
|
|
@retval true if successful
|
|
|
|
@retval false on error (will call my_error()) */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(1,2,3,7,8), warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_get_foreign_key_info(
|
|
|
|
/*==========================*/
|
|
|
|
Alter_inplace_info*
|
|
|
|
ha_alter_info, /*!< in: alter table info */
|
|
|
|
const TABLE_SHARE*
|
|
|
|
table_share, /*!< in: the TABLE_SHARE */
|
|
|
|
dict_table_t* table, /*!< in: table */
|
2014-02-01 09:33:26 +01:00
|
|
|
const char** col_names, /*!< in: column names, or NULL
|
|
|
|
to use table->col_names */
|
|
|
|
dict_index_t** drop_index, /*!< in: indexes to be dropped */
|
|
|
|
ulint n_drop_index, /*!< in: size of drop_index[] */
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_foreign_t**add_fk, /*!< out: foreign constraint added */
|
|
|
|
ulint* n_add_fk, /*!< out: number of foreign
|
|
|
|
constraints added */
|
|
|
|
const trx_t* trx) /*!< in: user transaction */
|
|
|
|
{
|
|
|
|
Key* key;
|
|
|
|
Foreign_key* fk_key;
|
|
|
|
dict_table_t* referenced_table = NULL;
|
|
|
|
char* referenced_table_name = NULL;
|
|
|
|
ulint num_fk = 0;
|
|
|
|
Alter_info* alter_info = ha_alter_info->alter_info;
|
|
|
|
|
|
|
|
*n_add_fk = 0;
|
|
|
|
|
|
|
|
List_iterator<Key> key_iterator(alter_info->key_list);
|
|
|
|
|
|
|
|
while ((key=key_iterator++)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
if (key->type != Key::FOREIGN_KEY) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* column_names[MAX_NUM_FK_COLUMNS];
|
|
|
|
dict_index_t* index = NULL;
|
|
|
|
const char* referenced_column_names[MAX_NUM_FK_COLUMNS];
|
|
|
|
dict_index_t* referenced_index = NULL;
|
|
|
|
ulint num_col = 0;
|
|
|
|
ulint referenced_num_col = 0;
|
|
|
|
bool correct_option;
|
|
|
|
char* db_namep = NULL;
|
|
|
|
char* tbl_namep = NULL;
|
|
|
|
ulint db_name_len = 0;
|
|
|
|
ulint tbl_name_len = 0;
|
|
|
|
char db_name[MAX_DATABASE_NAME_LEN];
|
|
|
|
char tbl_name[MAX_TABLE_NAME_LEN];
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
fk_key = static_cast<Foreign_key*>(key);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (fk_key->columns.elements > 0) {
|
|
|
|
ulint i = 0;
|
|
|
|
Key_part_spec* column;
|
|
|
|
List_iterator<Key_part_spec> key_part_iterator(
|
|
|
|
fk_key->columns);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Get all the foreign key column info for the
|
|
|
|
current table */
|
|
|
|
while ((column = key_part_iterator++)) {
|
|
|
|
column_names[i] = column->field_name.str;
|
|
|
|
ut_ad(i < MAX_NUM_FK_COLUMNS);
|
|
|
|
i++;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
index = innobase_find_fk_index(
|
|
|
|
ha_alter_info,
|
|
|
|
table, col_names,
|
|
|
|
drop_index, n_drop_index,
|
|
|
|
column_names, i);
|
|
|
|
|
|
|
|
/* MySQL would add a index in the creation
|
|
|
|
list if no such index for foreign table,
|
|
|
|
so we have to use DBUG_EXECUTE_IF to simulate
|
|
|
|
the scenario */
|
|
|
|
DBUG_EXECUTE_IF("innodb_test_no_foreign_idx",
|
|
|
|
index = NULL;);
|
|
|
|
|
|
|
|
/* Check whether there exist such
|
|
|
|
index in the the index create clause */
|
|
|
|
if (!index && !innobase_find_equiv_index(
|
2014-05-06 21:13:16 +02:00
|
|
|
column_names, static_cast<uint>(i),
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_alter_info->key_info_buffer,
|
|
|
|
ha_alter_info->index_add_buffer,
|
|
|
|
ha_alter_info->index_add_count)) {
|
|
|
|
my_error(
|
|
|
|
ER_FK_NO_INDEX_CHILD,
|
|
|
|
MYF(0),
|
|
|
|
fk_key->name.str
|
|
|
|
? fk_key->name.str : "",
|
|
|
|
table_share->table_name.str);
|
|
|
|
goto err_exit;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
num_col = i;
|
|
|
|
}
|
|
|
|
|
|
|
|
add_fk[num_fk] = dict_mem_foreign_create();
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
#ifndef __WIN__
|
2015-08-03 13:03:47 +02:00
|
|
|
if(fk_key->ref_db.str) {
|
|
|
|
tablename_to_filename(fk_key->ref_db.str, db_name,
|
|
|
|
MAX_DATABASE_NAME_LEN);
|
|
|
|
db_namep = db_name;
|
|
|
|
db_name_len = strlen(db_name);
|
|
|
|
}
|
|
|
|
if (fk_key->ref_table.str) {
|
|
|
|
tablename_to_filename(fk_key->ref_table.str, tbl_name,
|
|
|
|
MAX_TABLE_NAME_LEN);
|
|
|
|
tbl_namep = tbl_name;
|
|
|
|
tbl_name_len = strlen(tbl_name);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
#else
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(fk_key->ref_table.str);
|
2015-08-03 13:03:47 +02:00
|
|
|
tablename_to_filename(fk_key->ref_table.str, tbl_name,
|
|
|
|
MAX_TABLE_NAME_LEN);
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_casedn_str(tbl_name);
|
|
|
|
tbl_name_len = strlen(tbl_name);
|
|
|
|
tbl_namep = &tbl_name[0];
|
|
|
|
|
|
|
|
if (fk_key->ref_db.str != NULL) {
|
2015-08-03 13:03:47 +02:00
|
|
|
tablename_to_filename(fk_key->ref_db.str, db_name,
|
|
|
|
MAX_DATABASE_NAME_LEN);
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_casedn_str(db_name);
|
|
|
|
db_name_len = strlen(db_name);
|
|
|
|
db_namep = &db_name[0];
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
#endif
|
2014-02-01 09:33:26 +01:00
|
|
|
mutex_enter(&dict_sys->mutex);
|
|
|
|
|
|
|
|
referenced_table_name = dict_get_referenced_table(
|
|
|
|
table->name,
|
|
|
|
db_namep,
|
|
|
|
db_name_len,
|
|
|
|
tbl_namep,
|
|
|
|
tbl_name_len,
|
|
|
|
&referenced_table,
|
|
|
|
add_fk[num_fk]->heap);
|
|
|
|
|
|
|
|
/* Test the case when referenced_table failed to
|
|
|
|
open, if trx->check_foreigns is not set, we should
|
|
|
|
still be able to add the foreign key */
|
|
|
|
DBUG_EXECUTE_IF("innodb_test_open_ref_fail",
|
|
|
|
referenced_table = NULL;);
|
|
|
|
|
|
|
|
if (!referenced_table && trx->check_foreigns) {
|
|
|
|
mutex_exit(&dict_sys->mutex);
|
|
|
|
my_error(ER_FK_CANNOT_OPEN_PARENT,
|
|
|
|
MYF(0), tbl_namep);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
goto err_exit;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (fk_key->ref_columns.elements > 0) {
|
|
|
|
ulint i = 0;
|
|
|
|
Key_part_spec* column;
|
|
|
|
List_iterator<Key_part_spec> key_part_iterator(
|
|
|
|
fk_key->ref_columns);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
while ((column = key_part_iterator++)) {
|
|
|
|
referenced_column_names[i] =
|
|
|
|
column->field_name.str;
|
|
|
|
ut_ad(i < MAX_NUM_FK_COLUMNS);
|
|
|
|
i++;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (referenced_table) {
|
|
|
|
referenced_index =
|
|
|
|
dict_foreign_find_index(
|
|
|
|
referenced_table, 0,
|
|
|
|
referenced_column_names,
|
|
|
|
i, index,
|
2015-08-03 22:09:43 +02:00
|
|
|
TRUE, FALSE,
|
|
|
|
NULL, NULL, NULL);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_EXECUTE_IF(
|
|
|
|
"innodb_test_no_reference_idx",
|
|
|
|
referenced_index = NULL;);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Check whether there exist such
|
|
|
|
index in the the index create clause */
|
|
|
|
if (!referenced_index) {
|
2013-03-25 23:03:13 +01:00
|
|
|
mutex_exit(&dict_sys->mutex);
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error(ER_FK_NO_INDEX_PARENT, MYF(0),
|
|
|
|
fk_key->name.str
|
|
|
|
? fk_key->name.str : "",
|
|
|
|
tbl_namep);
|
2013-03-25 23:03:13 +01:00
|
|
|
goto err_exit;
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ut_a(!trx->check_foreigns);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
referenced_num_col = i;
|
2014-05-06 21:13:16 +02:00
|
|
|
} else {
|
|
|
|
/* Not possible to add a foreign key without a
|
|
|
|
referenced column */
|
|
|
|
mutex_exit(&dict_sys->mutex);
|
|
|
|
my_error(ER_CANNOT_ADD_FOREIGN, MYF(0), tbl_namep);
|
|
|
|
goto err_exit;
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!innobase_init_foreign(
|
|
|
|
add_fk[num_fk], fk_key->name.str,
|
|
|
|
table, index, column_names,
|
|
|
|
num_col, referenced_table_name,
|
|
|
|
referenced_table, referenced_index,
|
|
|
|
referenced_column_names, referenced_num_col)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
mutex_exit(&dict_sys->mutex);
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error(
|
|
|
|
ER_FK_DUP_NAME,
|
|
|
|
MYF(0),
|
|
|
|
add_fk[num_fk]->id);
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
mutex_exit(&dict_sys->mutex);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
correct_option = innobase_set_foreign_key_option(
|
|
|
|
add_fk[num_fk], fk_key);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_EXECUTE_IF("innodb_test_wrong_fk_option",
|
|
|
|
correct_option = false;);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!correct_option) {
|
|
|
|
my_error(ER_FK_INCORRECT_OPTION,
|
|
|
|
MYF(0),
|
|
|
|
table_share->table_name.str,
|
|
|
|
add_fk[num_fk]->id);
|
|
|
|
goto err_exit;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
num_fk++;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
*n_add_fk = num_fk;
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
err_exit:
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i <= num_fk; i++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
if (add_fk[i]) {
|
|
|
|
dict_foreign_free(add_fk[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*************************************************************//**
|
2007-09-27 13:03:36 +02:00
|
|
|
Copies an InnoDB column to a MySQL field. This function is
|
|
|
|
adapted from row_sel_field_store_in_mysql_format(). */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
innobase_col_to_mysql(
|
|
|
|
/*==================*/
|
2009-05-25 08:46:10 +02:00
|
|
|
const dict_col_t* col, /*!< in: InnoDB column */
|
|
|
|
const uchar* data, /*!< in: InnoDB column data */
|
|
|
|
ulint len, /*!< in: length of data, in bytes */
|
|
|
|
Field* field) /*!< in/out: MySQL field */
|
2007-09-27 13:03:36 +02:00
|
|
|
{
|
|
|
|
uchar* ptr;
|
|
|
|
uchar* dest = field->ptr;
|
|
|
|
ulint flen = field->pack_length();
|
|
|
|
|
|
|
|
switch (col->mtype) {
|
|
|
|
case DATA_INT:
|
|
|
|
ut_ad(len == flen);
|
|
|
|
|
|
|
|
/* Convert integer data from Innobase to little-endian
|
|
|
|
format, sign bit restored to normal */
|
|
|
|
|
|
|
|
for (ptr = dest + len; ptr != dest; ) {
|
|
|
|
*--ptr = *data++;
|
|
|
|
}
|
|
|
|
|
2012-02-07 16:22:36 +01:00
|
|
|
if (!(col->prtype & DATA_UNSIGNED)) {
|
2007-09-27 13:03:36 +02:00
|
|
|
((byte*) dest)[len - 1] ^= 0x80;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_VARCHAR:
|
|
|
|
case DATA_VARMYSQL:
|
|
|
|
case DATA_BINARY:
|
|
|
|
field->reset();
|
|
|
|
|
|
|
|
if (field->type() == MYSQL_TYPE_VARCHAR) {
|
|
|
|
/* This is a >= 5.0.3 type true VARCHAR. Store the
|
|
|
|
length of the data to the first byte or the first
|
|
|
|
two bytes of dest. */
|
|
|
|
|
|
|
|
dest = row_mysql_store_true_var_len(
|
|
|
|
dest, len, flen - field->key_length());
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the actual data */
|
|
|
|
memcpy(dest, data, len);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_BLOB:
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Skip MySQL BLOBs when reporting an erroneous row
|
|
|
|
during index creation or table rebuild. */
|
|
|
|
field->set_null();
|
2007-09-27 13:03:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
case DATA_MYSQL:
|
|
|
|
ut_ad(flen >= len);
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 13:32:48 +02:00
|
|
|
ut_ad(DATA_MBMAXLEN(col->mbminmaxlen)
|
|
|
|
>= DATA_MBMINLEN(col->mbminmaxlen));
|
2007-09-27 13:03:36 +02:00
|
|
|
memcpy(dest, data, len);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
case DATA_SYS_CHILD:
|
|
|
|
case DATA_SYS:
|
|
|
|
/* These column types should never be shipped to MySQL. */
|
|
|
|
ut_ad(0);
|
|
|
|
|
|
|
|
case DATA_FLOAT:
|
|
|
|
case DATA_DOUBLE:
|
|
|
|
case DATA_DECIMAL:
|
|
|
|
/* Above are the valid column types for MySQL data. */
|
|
|
|
ut_ad(flen == len);
|
2012-10-22 21:10:33 +02:00
|
|
|
/* fall through */
|
2014-05-06 21:13:16 +02:00
|
|
|
case DATA_FIXBINARY:
|
2012-10-22 21:10:33 +02:00
|
|
|
case DATA_CHAR:
|
|
|
|
/* We may have flen > len when there is a shorter
|
2014-05-06 21:13:16 +02:00
|
|
|
prefix on the CHAR and BINARY column. */
|
2012-10-22 21:10:33 +02:00
|
|
|
ut_ad(flen >= len);
|
2007-09-27 13:03:36 +02:00
|
|
|
#else /* UNIV_DEBUG */
|
|
|
|
default:
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
memcpy(dest, data, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*************************************************************//**
|
2007-09-27 13:03:36 +02:00
|
|
|
Copies an InnoDB record to table->record[0]. */
|
2012-08-01 16:27:34 +02:00
|
|
|
UNIV_INTERN
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
void
|
|
|
|
innobase_rec_to_mysql(
|
|
|
|
/*==================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
struct TABLE* table, /*!< in/out: MySQL table */
|
|
|
|
const rec_t* rec, /*!< in: record */
|
|
|
|
const dict_index_t* index, /*!< in: index */
|
|
|
|
const ulint* offsets)/*!< in: rec_get_offsets(
|
|
|
|
rec, index, ...) */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
{
|
2013-07-31 15:41:29 +02:00
|
|
|
uint n_fields = table->s->stored_fields;
|
|
|
|
uint sql_idx = 0;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2012-08-01 16:27:34 +02:00
|
|
|
ut_ad(n_fields == dict_table_get_n_user_cols(index->table)
|
2013-03-25 23:03:13 +01:00
|
|
|
- !!(DICT_TF2_FLAG_IS_SET(index->table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID)));
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
for (uint i = 0; i < n_fields; i++, sql_idx++) {
|
|
|
|
Field* field;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
ulint ipos;
|
|
|
|
ulint ilen;
|
2007-09-27 13:03:36 +02:00
|
|
|
const uchar* ifield;
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
while (!((field= table->field[sql_idx])->stored_in_db))
|
|
|
|
sql_idx++;
|
|
|
|
|
2007-09-27 13:03:36 +02:00
|
|
|
field->reset();
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2012-10-16 13:24:15 +02:00
|
|
|
ipos = dict_index_get_nth_col_or_prefix_pos(index, i, TRUE);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ipos == ULINT_UNDEFINED
|
|
|
|
|| rec_offs_nth_extern(offsets, ipos)) {
|
2007-09-27 13:03:36 +02:00
|
|
|
null_field:
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
field->set_null();
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ifield = rec_get_nth_field(rec, offsets, ipos, &ilen);
|
|
|
|
|
|
|
|
/* Assign the NULL flag */
|
|
|
|
if (ilen == UNIV_SQL_NULL) {
|
|
|
|
ut_ad(field->real_maybe_null());
|
2007-09-27 13:03:36 +02:00
|
|
|
goto null_field;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
}
|
2007-09-27 13:03:36 +02:00
|
|
|
|
|
|
|
field->set_notnull();
|
|
|
|
|
|
|
|
innobase_col_to_mysql(
|
|
|
|
dict_field_get_col(
|
|
|
|
dict_index_get_nth_field(index, ipos)),
|
|
|
|
ifield, ilen, field);
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*************************************************************//**
|
2013-03-25 23:03:13 +01:00
|
|
|
Copies an InnoDB index entry to table->record[0]. */
|
2012-08-01 16:27:34 +02:00
|
|
|
UNIV_INTERN
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
void
|
2013-03-25 23:03:13 +01:00
|
|
|
innobase_fields_to_mysql(
|
|
|
|
/*=====================*/
|
|
|
|
struct TABLE* table, /*!< in/out: MySQL table */
|
|
|
|
const dict_index_t* index, /*!< in: InnoDB index */
|
|
|
|
const dfield_t* fields) /*!< in: InnoDB index fields */
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
{
|
2013-07-31 15:41:29 +02:00
|
|
|
uint n_fields = table->s->stored_fields;
|
|
|
|
uint sql_idx = 0;
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(n_fields == dict_table_get_n_user_cols(index->table)
|
|
|
|
- !!(DICT_TF2_FLAG_IS_SET(index->table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID)));
|
branches/zip: Implement the reporting of duplicate key values to MySQL.
innobase_rec_to_mysql(): New function, for converting an InnoDB clustered
index record to MySQL table->record[0]. TODO: convert integer fields.
Currently, integer fields are in big-endian byte order instead of
host byte order, and signed integer fields are offset by 0x80000000.
innobase_rec_reset(): New function, for resetting table->record[0].
row_merge_build_indexes(): Add the parameter TABLE* table (the MySQL table
handle) for reporting duplicate key values.
dtuple_from_fields(): New function, to convert an array of dfield_t* to
dtuple_t.
dtuple_get_n_ext(): New function, to compute the number of externally stored
fields.
row_merge_dup_t: Structure for counting and reporting duplicate records.
row_merge_dup_report(): Function for counting and reporting duplicate records.
row_merge_tuple_cmp(), row_merge_tuple_sort(): Replace the ulint* n_dup
parameter with row_merge_dup_t* dup.
row_merge_buf_sort(): Add the parameter row_merge_dup_t* dup, which is
NULL when sorting a non-unique index.
row_merge_buf_write(), row_merge_heap_create(), row_merge_read_rec(),
row_merge_cmp(), row_merge_read_clustered_index(), row_merge_blocks(),
row_merge(), row_merge_sort(): Add const qualifiers.
row_merge_read_clustered_index(): Use a common error handling branch err_exit.
Invoke row_merge_buf_sort() differently on unique indexes.
row_merge_blocks(): note TODO: We could invoke innobase_rec_to_mysql()
to report duplicate key values when creating a clustered index.
2007-09-26 13:56:26 +02:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
for (uint i = 0; i < n_fields; i++, sql_idx++) {
|
|
|
|
Field* field;
|
2013-03-25 23:03:13 +01:00
|
|
|
ulint ipos;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
while (!((field= table->field[sql_idx])->stored_in_db))
|
|
|
|
sql_idx++;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
field->reset();
|
|
|
|
|
|
|
|
ipos = dict_index_get_nth_col_or_prefix_pos(index, i, TRUE);
|
|
|
|
|
|
|
|
if (ipos == ULINT_UNDEFINED
|
|
|
|
|| dfield_is_ext(&fields[ipos])
|
|
|
|
|| dfield_is_null(&fields[ipos])) {
|
|
|
|
|
|
|
|
field->set_null();
|
|
|
|
} else {
|
|
|
|
field->set_notnull();
|
|
|
|
|
|
|
|
const dfield_t* df = &fields[ipos];
|
|
|
|
|
|
|
|
innobase_col_to_mysql(
|
|
|
|
dict_field_get_col(
|
|
|
|
dict_index_get_nth_field(index, ipos)),
|
|
|
|
static_cast<const uchar*>(dfield_get_data(df)),
|
|
|
|
dfield_get_len(df), field);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Copies an InnoDB row to table->record[0]. */
|
|
|
|
UNIV_INTERN
|
|
|
|
void
|
|
|
|
innobase_row_to_mysql(
|
|
|
|
/*==================*/
|
|
|
|
struct TABLE* table, /*!< in/out: MySQL table */
|
|
|
|
const dict_table_t* itab, /*!< in: InnoDB table */
|
|
|
|
const dtuple_t* row) /*!< in: InnoDB row */
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-07-31 15:41:29 +02:00
|
|
|
uint n_fields = table->s->stored_fields;
|
|
|
|
uint sql_idx = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* The InnoDB row may contain an extra FTS_DOC_ID column at the end. */
|
|
|
|
ut_ad(row->n_fields == dict_table_get_n_cols(itab));
|
|
|
|
ut_ad(n_fields == row->n_fields - DATA_N_SYS_COLS
|
|
|
|
- !!(DICT_TF2_FLAG_IS_SET(itab, DICT_TF2_FTS_HAS_DOC_ID)));
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
for (uint i = 0; i < n_fields; i++, sql_idx++) {
|
|
|
|
Field* field;
|
2013-03-25 23:03:13 +01:00
|
|
|
const dfield_t* df = dtuple_get_nth_field(row, i);
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
while (!((field= table->field[sql_idx])->stored_in_db))
|
|
|
|
sql_idx++;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
field->reset();
|
|
|
|
|
|
|
|
if (dfield_is_ext(df) || dfield_is_null(df)) {
|
|
|
|
field->set_null();
|
|
|
|
} else {
|
|
|
|
field->set_notnull();
|
|
|
|
|
|
|
|
innobase_col_to_mysql(
|
|
|
|
dict_table_get_nth_col(itab, i),
|
|
|
|
static_cast<const uchar*>(dfield_get_data(df)),
|
|
|
|
dfield_get_len(df), field);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************//**
|
|
|
|
Resets table->record[0]. */
|
|
|
|
UNIV_INTERN
|
|
|
|
void
|
|
|
|
innobase_rec_reset(
|
|
|
|
/*===============*/
|
|
|
|
TABLE* table) /*!< in/out: MySQL table */
|
|
|
|
{
|
|
|
|
uint n_fields = table->s->fields;
|
|
|
|
uint i;
|
|
|
|
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
table->field[i]->set_default();
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*******************************************************************//**
|
2009-05-25 08:46:10 +02:00
|
|
|
This function checks that index keys are sensible.
|
|
|
|
@return 0 or error number */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2007-09-13 11:31:54 +02:00
|
|
|
int
|
|
|
|
innobase_check_index_keys(
|
|
|
|
/*======================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
const Alter_inplace_info* info,
|
|
|
|
/*!< in: indexes to be created or dropped */
|
|
|
|
const dict_table_t* innodb_table)
|
|
|
|
/*!< in: Existing indexes */
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
for (uint key_num = 0; key_num < info->index_add_count;
|
|
|
|
key_num++) {
|
|
|
|
const KEY& key = info->key_info_buffer[
|
|
|
|
info->index_add_buffer[key_num]];
|
2007-09-13 11:31:54 +02:00
|
|
|
|
|
|
|
/* Check that the same index name does not appear
|
|
|
|
twice in indexes to be created. */
|
|
|
|
|
|
|
|
for (ulint i = 0; i < key_num; i++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
const KEY& key2 = info->key_info_buffer[
|
|
|
|
info->index_add_buffer[i]];
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2008-02-13 21:18:00 +01:00
|
|
|
if (0 == strcmp(key.name, key2.name)) {
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 11:15:07 +01:00
|
|
|
my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0),
|
|
|
|
key.name);
|
|
|
|
|
|
|
|
return(ER_WRONG_NAME_FOR_INDEX);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check that the same index name does not already exist. */
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
const dict_index_t* index;
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 11:15:07 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (index = dict_table_get_first_index(innodb_table);
|
|
|
|
index; index = dict_table_get_next_index(index)) {
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!strcmp(key.name, index->name)) {
|
|
|
|
break;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (index) {
|
|
|
|
/* If a key by the same name is being created and
|
|
|
|
dropped, the name clash is OK. */
|
|
|
|
for (uint i = 0; i < info->index_drop_count;
|
|
|
|
i++) {
|
|
|
|
const KEY* drop_key
|
|
|
|
= info->index_drop_buffer[i];
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (0 == strcmp(key.name, drop_key->name)) {
|
|
|
|
goto name_ok;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
my_error(ER_WRONG_NAME_FOR_INDEX, MYF(0), key.name);
|
|
|
|
|
|
|
|
return(ER_WRONG_NAME_FOR_INDEX);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
name_ok:
|
|
|
|
for (ulint i = 0; i < key.user_defined_key_parts; i++) {
|
2008-02-13 21:18:00 +01:00
|
|
|
const KEY_PART_INFO& key_part1
|
|
|
|
= key.key_part[i];
|
|
|
|
const Field* field
|
|
|
|
= key_part1.field;
|
|
|
|
ibool is_unsigned;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2008-02-13 21:18:00 +01:00
|
|
|
switch (get_innobase_type_from_mysql_type(
|
|
|
|
&is_unsigned, field)) {
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
case DATA_INT:
|
|
|
|
case DATA_FLOAT:
|
|
|
|
case DATA_DOUBLE:
|
|
|
|
case DATA_DECIMAL:
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Check that MySQL does not try to
|
|
|
|
create a column prefix index field on
|
|
|
|
an inappropriate data type. */
|
|
|
|
|
2008-02-13 21:18:00 +01:00
|
|
|
if (field->type() == MYSQL_TYPE_VARCHAR) {
|
|
|
|
if (key_part1.length
|
|
|
|
>= field->pack_length()
|
|
|
|
- ((Field_varstring*) field)
|
|
|
|
->length_bytes) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (key_part1.length
|
|
|
|
>= field->pack_length()) {
|
|
|
|
break;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2008-02-13 21:18:00 +01:00
|
|
|
|
2013-04-10 07:25:13 +02:00
|
|
|
my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 11:15:07 +01:00
|
|
|
field->field_name);
|
2008-02-13 21:18:00 +01:00
|
|
|
return(ER_WRONG_KEY_COLUMN);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Check that the same column does not appear
|
|
|
|
twice in the index. */
|
|
|
|
|
2007-09-13 11:31:54 +02:00
|
|
|
for (ulint j = 0; j < i; j++) {
|
2008-02-13 21:18:00 +01:00
|
|
|
const KEY_PART_INFO& key_part2
|
|
|
|
= key.key_part[j];
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (key_part1.fieldnr != key_part2.fieldnr) {
|
2008-02-13 21:18:00 +01:00
|
|
|
continue;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2008-02-13 21:18:00 +01:00
|
|
|
|
2013-04-10 07:25:13 +02:00
|
|
|
my_error(ER_WRONG_KEY_COLUMN, MYF(0), "InnoDB",
|
2013-03-25 23:03:13 +01:00
|
|
|
field->field_name);
|
2008-02-13 21:18:00 +01:00
|
|
|
return(ER_WRONG_KEY_COLUMN);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-13 21:18:00 +01:00
|
|
|
return(0);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*******************************************************************//**
|
2007-09-13 11:31:54 +02:00
|
|
|
Create index field definition for key part */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(2,3)))
|
2007-09-13 11:31:54 +02:00
|
|
|
void
|
|
|
|
innobase_create_index_field_def(
|
|
|
|
/*============================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
const TABLE* altered_table, /*!< in: MySQL table that is
|
|
|
|
being altered, or NULL
|
|
|
|
if a new clustered index is
|
|
|
|
not being created */
|
|
|
|
const KEY_PART_INFO* key_part, /*!< in: MySQL key definition */
|
2015-03-30 17:53:10 +02:00
|
|
|
index_field_t* index_field, /*!< out: index field
|
2007-09-13 11:31:54 +02:00
|
|
|
definition for key_part */
|
2015-03-30 17:53:10 +02:00
|
|
|
const Field** fields) /*!< in: MySQL table fields */
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
const Field* field;
|
2007-09-13 11:31:54 +02:00
|
|
|
ibool is_unsigned;
|
|
|
|
ulint col_type;
|
|
|
|
|
|
|
|
DBUG_ENTER("innobase_create_index_field_def");
|
|
|
|
|
|
|
|
ut_ad(key_part);
|
|
|
|
ut_ad(index_field);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
field = altered_table
|
|
|
|
? altered_table->field[key_part->fieldnr]
|
|
|
|
: key_part->field;
|
2007-09-13 11:31:54 +02:00
|
|
|
ut_a(field);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
index_field->col_no = key_part->fieldnr;
|
2015-03-30 17:53:10 +02:00
|
|
|
index_field->col_name = altered_table ? field->field_name : fields[key_part->fieldnr]->field_name;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2007-09-13 11:31:54 +02:00
|
|
|
col_type = get_innobase_type_from_mysql_type(&is_unsigned, field);
|
|
|
|
|
|
|
|
if (DATA_BLOB == col_type
|
|
|
|
|| (key_part->length < field->pack_length()
|
|
|
|
&& field->type() != MYSQL_TYPE_VARCHAR)
|
|
|
|
|| (field->type() == MYSQL_TYPE_VARCHAR
|
|
|
|
&& key_part->length < field->pack_length()
|
2012-08-01 16:27:34 +02:00
|
|
|
- ((Field_varstring*) field)->length_bytes)) {
|
2007-09-13 11:31:54 +02:00
|
|
|
|
|
|
|
index_field->prefix_len = key_part->length;
|
|
|
|
} else {
|
|
|
|
index_field->prefix_len = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*******************************************************************//**
|
2007-09-13 11:31:54 +02:00
|
|
|
Create index definition for key */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2007-09-13 11:31:54 +02:00
|
|
|
void
|
|
|
|
innobase_create_index_def(
|
|
|
|
/*======================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
const TABLE* altered_table, /*!< in: MySQL table that is
|
|
|
|
being altered */
|
|
|
|
const KEY* keys, /*!< in: key definitions */
|
|
|
|
ulint key_number, /*!< in: MySQL key number */
|
|
|
|
bool new_clustered, /*!< in: true if generating
|
|
|
|
a new clustered index
|
2007-09-13 11:31:54 +02:00
|
|
|
on the table */
|
2013-03-25 23:03:13 +01:00
|
|
|
bool key_clustered, /*!< in: true if this is
|
|
|
|
the new clustered index */
|
|
|
|
index_def_t* index, /*!< out: index definition */
|
2015-03-30 17:53:10 +02:00
|
|
|
mem_heap_t* heap, /*!< in: heap where memory
|
2007-09-13 11:31:54 +02:00
|
|
|
is allocated */
|
2016-02-15 13:43:42 +01:00
|
|
|
const Field** fields) /*!< in: MySQL table fields
|
|
|
|
*/
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
const KEY* key = &keys[key_number];
|
|
|
|
ulint i;
|
|
|
|
ulint len;
|
|
|
|
ulint n_fields = key->user_defined_key_parts;
|
|
|
|
char* index_name;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
|
|
|
DBUG_ENTER("innobase_create_index_def");
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(!key_clustered || new_clustered);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
index->fields = static_cast<index_field_t*>(
|
|
|
|
mem_heap_alloc(heap, n_fields * sizeof *index->fields));
|
2015-03-30 17:53:10 +02:00
|
|
|
memset(index->fields, 0, n_fields * sizeof *index->fields);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
|
|
|
index->ind_type = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
index->key_number = key_number;
|
2007-09-13 11:31:54 +02:00
|
|
|
index->n_fields = n_fields;
|
|
|
|
len = strlen(key->name) + 1;
|
2013-03-25 23:03:13 +01:00
|
|
|
index->name = index_name = static_cast<char*>(
|
|
|
|
mem_heap_alloc(heap, len + !new_clustered));
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!new_clustered) {
|
2007-09-13 11:31:54 +02:00
|
|
|
*index_name++ = TEMP_INDEX_PREFIX;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(index_name, key->name, len);
|
|
|
|
|
|
|
|
if (key->flags & HA_NOSAME) {
|
|
|
|
index->ind_type |= DICT_UNIQUE;
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (key_clustered) {
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_FULLTEXT));
|
|
|
|
index->ind_type |= DICT_CLUSTERED;
|
|
|
|
} else if (key->flags & HA_FULLTEXT) {
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
|
|
|
|
& ~(HA_FULLTEXT
|
|
|
|
| HA_PACK_KEY
|
|
|
|
| HA_BINARY_PACK_KEY)));
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_NOSAME));
|
|
|
|
DBUG_ASSERT(!index->ind_type);
|
2012-08-01 16:27:34 +02:00
|
|
|
index->ind_type |= DICT_FTS;
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!new_clustered) {
|
|
|
|
altered_table = NULL;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
innobase_create_index_field_def(
|
2015-03-30 17:53:10 +02:00
|
|
|
altered_table, &key->key_part[i], &index->fields[i], fields);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*******************************************************************//**
|
2013-03-25 23:03:13 +01:00
|
|
|
Check whether the table has the FTS_DOC_ID column
|
|
|
|
@return whether there exists an FTS_DOC_ID column */
|
2007-09-13 11:31:54 +02:00
|
|
|
static
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_fts_check_doc_id_col(
|
2007-09-13 11:31:54 +02:00
|
|
|
/*==========================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
const dict_table_t* table, /*!< in: InnoDB table with
|
|
|
|
fulltext index */
|
|
|
|
const TABLE* altered_table,
|
|
|
|
/*!< in: MySQL table with
|
|
|
|
fulltext index */
|
|
|
|
ulint* fts_doc_col_no)
|
|
|
|
/*!< out: The column number for
|
|
|
|
Doc ID, or ULINT_UNDEFINED
|
|
|
|
if it is of wrong type */
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
*fts_doc_col_no = ULINT_UNDEFINED;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
const uint n_cols = altered_table->s->stored_fields;
|
|
|
|
uint sql_idx = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
uint i;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
for (i = 0; i < n_cols; i++, sql_idx++) {
|
|
|
|
const Field* field;
|
|
|
|
while (!((field= altered_table->field[sql_idx])->
|
|
|
|
stored_in_db))
|
|
|
|
sql_idx++;
|
2013-03-25 23:03:13 +01:00
|
|
|
if (my_strcasecmp(system_charset_info,
|
|
|
|
field->field_name, FTS_DOC_ID_COL_NAME)) {
|
|
|
|
continue;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (strcmp(field->field_name, FTS_DOC_ID_COL_NAME)) {
|
|
|
|
my_error(ER_WRONG_COLUMN_NAME, MYF(0),
|
|
|
|
field->field_name);
|
|
|
|
} else if (field->type() != MYSQL_TYPE_LONGLONG
|
|
|
|
|| field->pack_length() != 8
|
|
|
|
|| field->real_maybe_null()
|
|
|
|
|| !(field->flags & UNSIGNED_FLAG)) {
|
|
|
|
my_error(ER_INNODB_FT_WRONG_DOCID_COLUMN, MYF(0),
|
|
|
|
field->field_name);
|
|
|
|
} else {
|
|
|
|
*fts_doc_col_no = i;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
return(true);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!table) {
|
|
|
|
return(false);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (; i + DATA_N_SYS_COLS < (uint) table->n_cols; i++) {
|
2012-08-01 16:27:34 +02:00
|
|
|
const char* name = dict_table_get_col_name(table, i);
|
|
|
|
|
|
|
|
if (strcmp(name, FTS_DOC_ID_COL_NAME) == 0) {
|
2013-03-25 23:03:13 +01:00
|
|
|
#ifdef UNIV_DEBUG
|
2012-08-01 16:27:34 +02:00
|
|
|
const dict_col_t* col;
|
|
|
|
|
|
|
|
col = dict_table_get_nth_col(table, i);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Because the FTS_DOC_ID does not exist in
|
|
|
|
the MySQL data dictionary, this must be the
|
|
|
|
internally created FTS_DOC_ID column. */
|
|
|
|
ut_ad(col->mtype == DATA_INT);
|
|
|
|
ut_ad(col->len == 8);
|
|
|
|
ut_ad(col->prtype & DATA_NOT_NULL);
|
|
|
|
ut_ad(col->prtype & DATA_UNSIGNED);
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
*fts_doc_col_no = i;
|
|
|
|
return(true);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
return(false);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*******************************************************************//**
|
|
|
|
Check whether the table has a unique index with FTS_DOC_ID_INDEX_NAME
|
|
|
|
on the Doc ID column.
|
2013-03-25 23:03:13 +01:00
|
|
|
@return the status of the FTS_DOC_ID index */
|
2012-08-01 16:27:34 +02:00
|
|
|
UNIV_INTERN
|
|
|
|
enum fts_doc_id_index_enum
|
|
|
|
innobase_fts_check_doc_id_index(
|
|
|
|
/*============================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
const dict_table_t* table, /*!< in: table definition */
|
|
|
|
const TABLE* altered_table, /*!< in: MySQL table
|
|
|
|
that is being altered */
|
|
|
|
ulint* fts_doc_col_no) /*!< out: The column number for
|
|
|
|
Doc ID, or ULINT_UNDEFINED
|
|
|
|
if it is being created in
|
|
|
|
ha_alter_info */
|
2012-08-01 16:27:34 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
const dict_index_t* index;
|
|
|
|
const dict_field_t* field;
|
|
|
|
|
|
|
|
if (altered_table) {
|
|
|
|
/* Check if a unique index with the name of
|
|
|
|
FTS_DOC_ID_INDEX_NAME is being created. */
|
|
|
|
|
|
|
|
for (uint i = 0; i < altered_table->s->keys; i++) {
|
2014-02-01 09:33:26 +01:00
|
|
|
const KEY& key = altered_table->key_info[i];
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (innobase_strcasecmp(
|
|
|
|
key.name, FTS_DOC_ID_INDEX_NAME)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((key.flags & HA_NOSAME)
|
|
|
|
&& key.user_defined_key_parts == 1
|
|
|
|
&& !strcmp(key.name, FTS_DOC_ID_INDEX_NAME)
|
|
|
|
&& !strcmp(key.key_part[0].field->field_name,
|
|
|
|
FTS_DOC_ID_COL_NAME)) {
|
|
|
|
if (fts_doc_col_no) {
|
|
|
|
*fts_doc_col_no = ULINT_UNDEFINED;
|
|
|
|
}
|
|
|
|
return(FTS_EXIST_DOC_ID_INDEX);
|
|
|
|
} else {
|
|
|
|
return(FTS_INCORRECT_DOC_ID_INDEX);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!table) {
|
|
|
|
return(FTS_NOT_EXIST_DOC_ID_INDEX);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
|
|
|
for (index = dict_table_get_first_index(table);
|
|
|
|
index; index = dict_table_get_next_index(index)) {
|
|
|
|
|
|
|
|
/* Check if there exists a unique index with the name of
|
|
|
|
FTS_DOC_ID_INDEX_NAME */
|
|
|
|
if (innobase_strcasecmp(index->name, FTS_DOC_ID_INDEX_NAME)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!dict_index_is_unique(index)
|
2013-03-25 23:03:13 +01:00
|
|
|
|| dict_index_get_n_unique(index) > 1
|
2012-08-01 16:27:34 +02:00
|
|
|
|| strcmp(index->name, FTS_DOC_ID_INDEX_NAME)) {
|
|
|
|
return(FTS_INCORRECT_DOC_ID_INDEX);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether the index has FTS_DOC_ID as its
|
|
|
|
first column */
|
|
|
|
field = dict_index_get_nth_field(index, 0);
|
|
|
|
|
|
|
|
/* The column would be of a BIGINT data type */
|
|
|
|
if (strcmp(field->name, FTS_DOC_ID_COL_NAME) == 0
|
|
|
|
&& field->col->mtype == DATA_INT
|
|
|
|
&& field->col->len == 8
|
|
|
|
&& field->col->prtype & DATA_NOT_NULL) {
|
|
|
|
if (fts_doc_col_no) {
|
|
|
|
*fts_doc_col_no = dict_col_get_no(field->col);
|
|
|
|
}
|
|
|
|
return(FTS_EXIST_DOC_ID_INDEX);
|
|
|
|
} else {
|
|
|
|
return(FTS_INCORRECT_DOC_ID_INDEX);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2012-08-01 16:27:34 +02:00
|
|
|
/* Not found */
|
|
|
|
return(FTS_NOT_EXIST_DOC_ID_INDEX);
|
|
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
|
|
Check whether the table has a unique index with FTS_DOC_ID_INDEX_NAME
|
|
|
|
on the Doc ID column in MySQL create index definition.
|
|
|
|
@return FTS_EXIST_DOC_ID_INDEX if there exists the FTS_DOC_ID index,
|
|
|
|
FTS_INCORRECT_DOC_ID_INDEX if the FTS_DOC_ID index is of wrong format */
|
|
|
|
UNIV_INTERN
|
|
|
|
enum fts_doc_id_index_enum
|
|
|
|
innobase_fts_check_doc_id_index_in_def(
|
|
|
|
/*===================================*/
|
|
|
|
ulint n_key, /*!< in: Number of keys */
|
2013-03-25 23:03:13 +01:00
|
|
|
const KEY* key_info) /*!< in: Key definition */
|
2012-08-01 16:27:34 +02:00
|
|
|
{
|
|
|
|
/* Check whether there is a "FTS_DOC_ID_INDEX" in the to be built index
|
|
|
|
list */
|
|
|
|
for (ulint j = 0; j < n_key; j++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
const KEY* key = &key_info[j];
|
2012-08-01 16:27:34 +02:00
|
|
|
|
|
|
|
if (innobase_strcasecmp(key->name, FTS_DOC_ID_INDEX_NAME)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Do a check on FTS DOC ID_INDEX, it must be unique,
|
|
|
|
named as "FTS_DOC_ID_INDEX" and on column "FTS_DOC_ID" */
|
|
|
|
if (!(key->flags & HA_NOSAME)
|
2013-03-25 23:03:13 +01:00
|
|
|
|| key->user_defined_key_parts != 1
|
2012-08-01 16:27:34 +02:00
|
|
|
|| strcmp(key->name, FTS_DOC_ID_INDEX_NAME)
|
|
|
|
|| strcmp(key->key_part[0].field->field_name,
|
2013-03-25 23:03:13 +01:00
|
|
|
FTS_DOC_ID_COL_NAME)) {
|
2012-08-01 16:27:34 +02:00
|
|
|
return(FTS_INCORRECT_DOC_ID_INDEX);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
|
|
|
return(FTS_EXIST_DOC_ID_INDEX);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
|
|
|
return(FTS_NOT_EXIST_DOC_ID_INDEX);
|
|
|
|
}
|
2017-01-07 13:24:42 +01:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 11:52:16 +02:00
|
|
|
/*******************************************************************//**
|
2007-09-13 11:31:54 +02:00
|
|
|
Create an index table where indexes are ordered as follows:
|
|
|
|
|
|
|
|
IF a new primary key is defined for the table THEN
|
|
|
|
|
|
|
|
1) New primary key
|
2013-03-25 23:03:13 +01:00
|
|
|
2) The remaining keys in key_info
|
2007-09-13 11:31:54 +02:00
|
|
|
|
|
|
|
ELSE
|
|
|
|
|
|
|
|
1) All new indexes in the order they arrive from MySQL
|
|
|
|
|
|
|
|
ENDIF
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
@return key definitions */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result, malloc))
|
2013-03-25 23:03:13 +01:00
|
|
|
index_def_t*
|
|
|
|
innobase_create_key_defs(
|
|
|
|
/*=====================*/
|
|
|
|
mem_heap_t* heap,
|
|
|
|
/*!< in/out: memory heap where space for key
|
|
|
|
definitions are allocated */
|
|
|
|
const Alter_inplace_info* ha_alter_info,
|
|
|
|
/*!< in: alter operation */
|
|
|
|
const TABLE* altered_table,
|
|
|
|
/*!< in: MySQL table that is being altered */
|
|
|
|
ulint& n_add,
|
|
|
|
/*!< in/out: number of indexes to be created */
|
|
|
|
ulint& n_fts_add,
|
|
|
|
/*!< out: number of FTS indexes to be created */
|
|
|
|
bool got_default_clust,
|
|
|
|
/*!< in: whether the table lacks a primary key */
|
|
|
|
ulint& fts_doc_id_col,
|
|
|
|
/*!< in: The column number for Doc ID */
|
|
|
|
bool& add_fts_doc_id,
|
|
|
|
/*!< in: whether we need to add new DOC ID
|
|
|
|
column for FTS index */
|
2016-02-15 13:43:42 +01:00
|
|
|
bool& add_fts_doc_idx,
|
2013-03-25 23:03:13 +01:00
|
|
|
/*!< in: whether we need to add new DOC ID
|
|
|
|
index for FTS index */
|
2016-02-15 13:43:42 +01:00
|
|
|
const TABLE* table)
|
|
|
|
/*!< in: MySQL table that is being altered */
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
|
|
|
index_def_t* indexdef;
|
|
|
|
index_def_t* indexdefs;
|
|
|
|
bool new_primary;
|
|
|
|
const uint*const add
|
|
|
|
= ha_alter_info->index_add_buffer;
|
|
|
|
const KEY*const key_info
|
|
|
|
= ha_alter_info->key_info_buffer;
|
|
|
|
|
|
|
|
DBUG_ENTER("innobase_create_key_defs");
|
|
|
|
DBUG_ASSERT(!add_fts_doc_id || add_fts_doc_idx);
|
|
|
|
DBUG_ASSERT(ha_alter_info->index_add_count == n_add);
|
|
|
|
|
|
|
|
/* If there is a primary key, it is always the first index
|
|
|
|
defined for the innodb_table. */
|
|
|
|
|
|
|
|
new_primary = n_add > 0
|
|
|
|
&& !my_strcasecmp(system_charset_info,
|
|
|
|
key_info[*add].name, "PRIMARY");
|
|
|
|
n_fts_add = 0;
|
|
|
|
|
|
|
|
/* If there is a UNIQUE INDEX consisting entirely of NOT NULL
|
|
|
|
columns and if the index does not contain column prefix(es)
|
|
|
|
(only prefix/part of the column is indexed), MySQL will treat the
|
|
|
|
index as a PRIMARY KEY unless the table already has one. */
|
|
|
|
|
2017-01-07 13:24:42 +01:00
|
|
|
ut_ad(altered_table->s->primary_key == 0
|
|
|
|
|| altered_table->s->primary_key == MAX_KEY);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2017-01-07 13:24:42 +01:00
|
|
|
if (got_default_clust && !new_primary) {
|
|
|
|
new_primary = (altered_table->s->primary_key != MAX_KEY);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
const bool rebuild = new_primary || add_fts_doc_id
|
2016-02-15 13:43:42 +01:00
|
|
|
|| innobase_need_rebuild(ha_alter_info, table);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Reserve one more space if new_primary is true, and we might
|
|
|
|
need to add the FTS_DOC_ID_INDEX */
|
|
|
|
indexdef = indexdefs = static_cast<index_def_t*>(
|
|
|
|
mem_heap_alloc(
|
|
|
|
heap, sizeof *indexdef
|
|
|
|
* (ha_alter_info->key_count
|
|
|
|
+ rebuild
|
|
|
|
+ got_default_clust)));
|
|
|
|
|
|
|
|
if (rebuild) {
|
|
|
|
ulint primary_key_number;
|
|
|
|
|
|
|
|
if (new_primary) {
|
2017-01-07 13:24:42 +01:00
|
|
|
if (n_add == 0) {
|
|
|
|
DBUG_ASSERT(got_default_clust);
|
|
|
|
DBUG_ASSERT(altered_table->s->primary_key
|
|
|
|
== 0);
|
|
|
|
primary_key_number = 0;
|
|
|
|
} else {
|
|
|
|
primary_key_number = *add;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
} else if (got_default_clust) {
|
|
|
|
/* Create the GEN_CLUST_INDEX */
|
|
|
|
index_def_t* index = indexdef++;
|
|
|
|
|
|
|
|
index->fields = NULL;
|
|
|
|
index->n_fields = 0;
|
|
|
|
index->ind_type = DICT_CLUSTERED;
|
|
|
|
index->name = mem_heap_strdup(
|
|
|
|
heap, innobase_index_reserve_name);
|
|
|
|
index->key_number = ~0;
|
|
|
|
primary_key_number = ULINT_UNDEFINED;
|
|
|
|
goto created_clustered;
|
|
|
|
} else {
|
|
|
|
primary_key_number = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create the PRIMARY key index definition */
|
|
|
|
innobase_create_index_def(
|
|
|
|
altered_table, key_info, primary_key_number,
|
2015-03-30 17:53:10 +02:00
|
|
|
TRUE, TRUE, indexdef++, heap, (const Field **)altered_table->field);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
created_clustered:
|
|
|
|
n_add = 1;
|
|
|
|
|
|
|
|
for (ulint i = 0; i < ha_alter_info->key_count; i++) {
|
|
|
|
if (i == primary_key_number) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Copy the index definitions. */
|
|
|
|
innobase_create_index_def(
|
|
|
|
altered_table, key_info, i, TRUE, FALSE,
|
2015-03-30 17:53:10 +02:00
|
|
|
indexdef, heap, (const Field **)altered_table->field);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (indexdef->ind_type & DICT_FTS) {
|
|
|
|
n_fts_add++;
|
|
|
|
}
|
|
|
|
|
|
|
|
indexdef++;
|
|
|
|
n_add++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n_fts_add > 0) {
|
|
|
|
if (!add_fts_doc_id
|
|
|
|
&& !innobase_fts_check_doc_id_col(
|
|
|
|
NULL, altered_table,
|
|
|
|
&fts_doc_id_col)) {
|
2013-07-31 15:41:29 +02:00
|
|
|
fts_doc_id_col =
|
|
|
|
altered_table->s->stored_fields;
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fts_doc_id = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!add_fts_doc_idx) {
|
|
|
|
fts_doc_id_index_enum ret;
|
|
|
|
ulint doc_col_no;
|
|
|
|
|
|
|
|
ret = innobase_fts_check_doc_id_index(
|
|
|
|
NULL, altered_table, &doc_col_no);
|
|
|
|
|
|
|
|
/* This should have been checked before */
|
|
|
|
ut_ad(ret != FTS_INCORRECT_DOC_ID_INDEX);
|
|
|
|
|
|
|
|
if (ret == FTS_NOT_EXIST_DOC_ID_INDEX) {
|
|
|
|
add_fts_doc_idx = true;
|
|
|
|
} else {
|
|
|
|
ut_ad(ret == FTS_EXIST_DOC_ID_INDEX);
|
|
|
|
ut_ad(doc_col_no == ULINT_UNDEFINED
|
|
|
|
|| doc_col_no == fts_doc_id_col);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Create definitions for added secondary indexes. */
|
|
|
|
|
|
|
|
for (ulint i = 0; i < n_add; i++) {
|
|
|
|
innobase_create_index_def(
|
|
|
|
altered_table, key_info, add[i], FALSE, FALSE,
|
2015-03-30 17:53:10 +02:00
|
|
|
indexdef, heap, (const Field **)altered_table->field);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (indexdef->ind_type & DICT_FTS) {
|
|
|
|
n_fts_add++;
|
|
|
|
}
|
|
|
|
|
|
|
|
indexdef++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(indexdefs + n_add == indexdef);
|
|
|
|
|
|
|
|
if (add_fts_doc_idx) {
|
|
|
|
index_def_t* index = indexdef++;
|
|
|
|
|
|
|
|
index->fields = static_cast<index_field_t*>(
|
|
|
|
mem_heap_alloc(heap, sizeof *index->fields));
|
2015-03-30 17:53:10 +02:00
|
|
|
memset(index->fields, 0, sizeof *index->fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
index->n_fields = 1;
|
|
|
|
index->fields->col_no = fts_doc_id_col;
|
|
|
|
index->fields->prefix_len = 0;
|
|
|
|
index->ind_type = DICT_UNIQUE;
|
|
|
|
|
|
|
|
if (rebuild) {
|
|
|
|
index->name = mem_heap_strdup(
|
|
|
|
heap, FTS_DOC_ID_INDEX_NAME);
|
|
|
|
ut_ad(!add_fts_doc_id
|
2013-07-31 15:41:29 +02:00
|
|
|
|| fts_doc_id_col == altered_table->s->stored_fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
|
|
|
char* index_name;
|
|
|
|
index->name = index_name = static_cast<char*>(
|
|
|
|
mem_heap_alloc(
|
|
|
|
heap,
|
|
|
|
1 + sizeof FTS_DOC_ID_INDEX_NAME));
|
|
|
|
*index_name++ = TEMP_INDEX_PREFIX;
|
|
|
|
memcpy(index_name, FTS_DOC_ID_INDEX_NAME,
|
|
|
|
sizeof FTS_DOC_ID_INDEX_NAME);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: assign a real MySQL key number for this */
|
|
|
|
index->key_number = ULINT_UNDEFINED;
|
|
|
|
n_add++;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(indexdef > indexdefs);
|
|
|
|
DBUG_ASSERT((ulint) (indexdef - indexdefs)
|
|
|
|
<= ha_alter_info->key_count
|
|
|
|
+ add_fts_doc_idx + got_default_clust);
|
|
|
|
DBUG_ASSERT(ha_alter_info->index_add_count <= n_add);
|
|
|
|
DBUG_RETURN(indexdefs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*******************************************************************//**
|
|
|
|
Check each index column size, make sure they do not exceed the max limit
|
|
|
|
@return true if index column size exceeds limit */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_check_column_length(
|
|
|
|
/*=========================*/
|
|
|
|
ulint max_col_len, /*!< in: maximum column length */
|
|
|
|
const KEY* key_info) /*!< in: Indexes to be created */
|
|
|
|
{
|
|
|
|
for (ulint key_part = 0; key_part < key_info->user_defined_key_parts; key_part++) {
|
|
|
|
if (key_info->key_part[key_part].length > max_col_len) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
|
|
|
|
{
|
|
|
|
/** Dummy query graph */
|
|
|
|
que_thr_t* thr;
|
2014-02-01 09:33:26 +01:00
|
|
|
/** reference to the prebuilt struct of the creating instance */
|
|
|
|
row_prebuilt_t*&prebuilt;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** InnoDB indexes being created */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_index_t** add_index;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** MySQL key numbers for the InnoDB indexes that are being created */
|
|
|
|
const ulint* add_key_numbers;
|
|
|
|
/** number of InnoDB indexes being created */
|
2014-02-01 09:33:26 +01:00
|
|
|
ulint num_to_add_index;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** InnoDB indexes being dropped */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_index_t** drop_index;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** number of InnoDB indexes being dropped */
|
2014-02-01 09:33:26 +01:00
|
|
|
const ulint num_to_drop_index;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** InnoDB foreign key constraints being dropped */
|
|
|
|
dict_foreign_t** drop_fk;
|
|
|
|
/** number of InnoDB foreign key constraints being dropped */
|
|
|
|
const ulint num_to_drop_fk;
|
|
|
|
/** InnoDB foreign key constraints being added */
|
|
|
|
dict_foreign_t** add_fk;
|
|
|
|
/** number of InnoDB foreign key constraints being dropped */
|
|
|
|
const ulint num_to_add_fk;
|
|
|
|
/** whether to create the indexes online */
|
|
|
|
bool online;
|
|
|
|
/** memory heap */
|
|
|
|
mem_heap_t* heap;
|
|
|
|
/** dictionary transaction */
|
|
|
|
trx_t* trx;
|
2014-02-01 09:33:26 +01:00
|
|
|
/** original table (if rebuilt, differs from indexed_table) */
|
|
|
|
dict_table_t* old_table;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** table where the indexes are being created or dropped */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_t* new_table;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** mapping of old column numbers to new ones, or NULL */
|
|
|
|
const ulint* col_map;
|
2014-02-01 09:33:26 +01:00
|
|
|
/** new column names, or NULL if nothing was renamed */
|
|
|
|
const char** col_names;
|
2013-03-25 23:03:13 +01:00
|
|
|
/** added AUTO_INCREMENT column position, or ULINT_UNDEFINED */
|
|
|
|
const ulint add_autoinc;
|
|
|
|
/** default values of ADD COLUMN, or NULL */
|
|
|
|
const dtuple_t* add_cols;
|
|
|
|
/** autoinc sequence to use */
|
|
|
|
ib_sequence_t sequence;
|
2014-02-01 09:33:26 +01:00
|
|
|
/** maximum auto-increment value */
|
|
|
|
ulonglong max_autoinc;
|
|
|
|
/** temporary table name to use for old table when renaming tables */
|
|
|
|
const char* tmp_name;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_innobase_inplace_ctx(row_prebuilt_t*& prebuilt_arg,
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_index_t** drop_arg,
|
|
|
|
ulint num_to_drop_arg,
|
|
|
|
dict_foreign_t** drop_fk_arg,
|
|
|
|
ulint num_to_drop_fk_arg,
|
|
|
|
dict_foreign_t** add_fk_arg,
|
|
|
|
ulint num_to_add_fk_arg,
|
|
|
|
bool online_arg,
|
|
|
|
mem_heap_t* heap_arg,
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_t* new_table_arg,
|
|
|
|
const char** col_names_arg,
|
2013-03-25 23:03:13 +01:00
|
|
|
ulint add_autoinc_arg,
|
|
|
|
ulonglong autoinc_col_min_value_arg,
|
2014-02-01 09:33:26 +01:00
|
|
|
ulonglong autoinc_col_max_value_arg) :
|
2013-03-25 23:03:13 +01:00
|
|
|
inplace_alter_handler_ctx(),
|
2014-02-01 09:33:26 +01:00
|
|
|
prebuilt (prebuilt_arg),
|
|
|
|
add_index (0), add_key_numbers (0), num_to_add_index (0),
|
|
|
|
drop_index (drop_arg), num_to_drop_index (num_to_drop_arg),
|
2013-03-25 23:03:13 +01:00
|
|
|
drop_fk (drop_fk_arg), num_to_drop_fk (num_to_drop_fk_arg),
|
|
|
|
add_fk (add_fk_arg), num_to_add_fk (num_to_add_fk_arg),
|
2014-02-01 09:33:26 +01:00
|
|
|
online (online_arg), heap (heap_arg), trx (0),
|
|
|
|
old_table (prebuilt_arg->table),
|
|
|
|
new_table (new_table_arg),
|
|
|
|
col_map (0), col_names (col_names_arg),
|
|
|
|
add_autoinc (add_autoinc_arg),
|
|
|
|
add_cols (0),
|
|
|
|
sequence(prebuilt->trx->mysql_thd,
|
|
|
|
autoinc_col_min_value_arg, autoinc_col_max_value_arg),
|
|
|
|
max_autoinc (0),
|
|
|
|
tmp_name (0)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
|
|
|
#ifdef UNIV_DEBUG
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < num_to_add_index; i++) {
|
|
|
|
ut_ad(!add_index[i]->to_be_dropped);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < num_to_drop_index; i++) {
|
|
|
|
ut_ad(drop_index[i]->to_be_dropped);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
thr = pars_complete_graph_for_exec(NULL, prebuilt->trx, heap);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
~ha_innobase_inplace_ctx()
|
|
|
|
{
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Determine if the table will be rebuilt.
|
|
|
|
@return whether the table will be rebuilt */
|
|
|
|
bool need_rebuild () const { return(old_table != new_table); }
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
private:
|
|
|
|
// Disable copying
|
|
|
|
ha_innobase_inplace_ctx(const ha_innobase_inplace_ctx&);
|
|
|
|
ha_innobase_inplace_ctx& operator=(const ha_innobase_inplace_ctx&);
|
|
|
|
};
|
|
|
|
|
|
|
|
/********************************************************************//**
|
|
|
|
Drop any indexes that we were not able to free previously due to
|
|
|
|
open table handles. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
online_retry_drop_indexes_low(
|
|
|
|
/*==========================*/
|
|
|
|
dict_table_t* table, /*!< in/out: table */
|
|
|
|
trx_t* trx) /*!< in/out: transaction */
|
|
|
|
{
|
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
ut_ad(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
|
|
|
|
|
|
|
|
/* We can have table->n_ref_count > 1, because other threads
|
|
|
|
may have prebuilt->table pointing to the table. However, these
|
|
|
|
other threads should be between statements, waiting for the
|
|
|
|
next statement to execute, or for a meta-data lock. */
|
|
|
|
ut_ad(table->n_ref_count >= 1);
|
|
|
|
|
|
|
|
if (table->drop_aborted) {
|
|
|
|
row_merge_drop_indexes(trx, table, TRUE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/********************************************************************//**
|
|
|
|
Drop any indexes that we were not able to free previously due to
|
|
|
|
open table handles. */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
|
|
|
online_retry_drop_indexes(
|
|
|
|
/*======================*/
|
|
|
|
dict_table_t* table, /*!< in/out: table */
|
|
|
|
THD* user_thd) /*!< in/out: MySQL connection */
|
|
|
|
{
|
|
|
|
if (table->drop_aborted) {
|
|
|
|
trx_t* trx = innobase_trx_allocate(user_thd);
|
|
|
|
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
|
|
|
|
|
|
|
|
row_mysql_lock_data_dictionary(trx);
|
|
|
|
online_retry_drop_indexes_low(table, trx);
|
|
|
|
trx_commit_for_mysql(trx);
|
|
|
|
row_mysql_unlock_data_dictionary(trx);
|
|
|
|
trx_free_for_mysql(trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
mutex_enter(&dict_sys->mutex);
|
|
|
|
dict_table_check_for_dup_indexes(table, CHECK_ALL_COMPLETE);
|
|
|
|
mutex_exit(&dict_sys->mutex);
|
|
|
|
ut_a(!table->drop_aborted);
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
}
|
|
|
|
|
|
|
|
/********************************************************************//**
|
|
|
|
Commit a dictionary transaction and drop any indexes that we were not
|
|
|
|
able to free previously due to open table handles. */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
|
|
|
online_retry_drop_indexes_with_trx(
|
|
|
|
/*===============================*/
|
|
|
|
dict_table_t* table, /*!< in/out: table */
|
|
|
|
trx_t* trx) /*!< in/out: transaction */
|
|
|
|
{
|
|
|
|
ut_ad(trx_state_eq(trx, TRX_STATE_NOT_STARTED));
|
|
|
|
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
|
|
|
|
/* Now that the dictionary is being locked, check if we can
|
|
|
|
drop any incompletely created indexes that may have been left
|
|
|
|
behind in rollback_inplace_alter_table() earlier. */
|
|
|
|
if (table->drop_aborted) {
|
|
|
|
|
|
|
|
trx->table_id = 0;
|
|
|
|
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
|
|
|
|
|
|
|
|
online_retry_drop_indexes_low(table, trx);
|
|
|
|
trx_commit_for_mysql(trx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determines if InnoDB is dropping a foreign key constraint.
|
|
|
|
@param foreign the constraint
|
|
|
|
@param drop_fk constraints being dropped
|
|
|
|
@param n_drop_fk number of constraints that are being dropped
|
|
|
|
@return whether the constraint is being dropped */
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((pure, nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_dropping_foreign(
|
|
|
|
/*======================*/
|
|
|
|
const dict_foreign_t* foreign,
|
|
|
|
dict_foreign_t** drop_fk,
|
|
|
|
ulint n_drop_fk)
|
|
|
|
{
|
|
|
|
while (n_drop_fk--) {
|
|
|
|
if (*drop_fk++ == foreign) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determines if an InnoDB FOREIGN KEY constraint depends on a
|
|
|
|
column that is being dropped or modified to NOT NULL.
|
|
|
|
@param user_table InnoDB table as it is before the ALTER operation
|
|
|
|
@param col_name Name of the column being altered
|
|
|
|
@param drop_fk constraints being dropped
|
|
|
|
@param n_drop_fk number of constraints that are being dropped
|
|
|
|
@param drop true=drop column, false=set NOT NULL
|
|
|
|
@retval true Not allowed (will call my_error())
|
|
|
|
@retval false Allowed
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((pure, nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_check_foreigns_low(
|
|
|
|
/*========================*/
|
|
|
|
const dict_table_t* user_table,
|
|
|
|
dict_foreign_t** drop_fk,
|
|
|
|
ulint n_drop_fk,
|
|
|
|
const char* col_name,
|
|
|
|
bool drop)
|
|
|
|
{
|
2014-09-11 10:13:35 +02:00
|
|
|
dict_foreign_t* foreign;
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
|
|
|
|
/* Check if any FOREIGN KEY constraints are defined on this
|
|
|
|
column. */
|
2014-09-11 10:13:35 +02:00
|
|
|
|
2014-10-04 15:26:04 +02:00
|
|
|
for (dict_foreign_set::const_iterator it = user_table->foreign_set.begin();
|
2014-09-11 10:13:35 +02:00
|
|
|
it != user_table->foreign_set.end();
|
|
|
|
++it) {
|
|
|
|
|
|
|
|
foreign = *it;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!drop && !(foreign->type
|
|
|
|
& (DICT_FOREIGN_ON_DELETE_SET_NULL
|
|
|
|
| DICT_FOREIGN_ON_UPDATE_SET_NULL))) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (innobase_dropping_foreign(foreign, drop_fk, n_drop_fk)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
|
|
|
if (!strcmp(foreign->foreign_col_names[f],
|
|
|
|
col_name)) {
|
|
|
|
my_error(drop
|
|
|
|
? ER_FK_COLUMN_CANNOT_DROP
|
|
|
|
: ER_FK_COLUMN_NOT_NULL, MYF(0),
|
|
|
|
col_name, foreign->id);
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!drop) {
|
|
|
|
/* SET NULL clauses on foreign key constraints of
|
|
|
|
child tables affect the child tables, not the parent table.
|
|
|
|
The column can be NOT NULL in the parent table. */
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if any FOREIGN KEY constraints in other tables are
|
|
|
|
referring to the column that is being dropped. */
|
2014-10-04 15:26:04 +02:00
|
|
|
for (dict_foreign_set::const_iterator it
|
2014-09-11 10:13:35 +02:00
|
|
|
= user_table->referenced_set.begin();
|
|
|
|
it != user_table->referenced_set.end();
|
|
|
|
++it) {
|
|
|
|
|
|
|
|
foreign = *it;
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (innobase_dropping_foreign(foreign, drop_fk, n_drop_fk)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (unsigned f = 0; f < foreign->n_fields; f++) {
|
|
|
|
char display_name[FN_REFLEN];
|
|
|
|
|
|
|
|
if (strcmp(foreign->referenced_col_names[f],
|
|
|
|
col_name)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
char* buf_end = innobase_convert_name(
|
|
|
|
display_name, (sizeof display_name) - 1,
|
|
|
|
foreign->foreign_table_name,
|
|
|
|
strlen(foreign->foreign_table_name),
|
|
|
|
NULL, TRUE);
|
|
|
|
*buf_end = '\0';
|
|
|
|
my_error(ER_FK_COLUMN_CANNOT_DROP_CHILD,
|
|
|
|
MYF(0), col_name, foreign->id,
|
|
|
|
display_name);
|
|
|
|
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Determines if an InnoDB FOREIGN KEY constraint depends on a
|
|
|
|
column that is being dropped or modified to NOT NULL.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param old_table MySQL table as it is before the ALTER operation
|
|
|
|
@param user_table InnoDB table as it is before the ALTER operation
|
|
|
|
@param drop_fk constraints being dropped
|
|
|
|
@param n_drop_fk number of constraints that are being dropped
|
|
|
|
@retval true Not allowed (will call my_error())
|
|
|
|
@retval false Allowed
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((pure, nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_check_foreigns(
|
|
|
|
/*====================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* altered_table,
|
|
|
|
const TABLE* old_table,
|
|
|
|
const dict_table_t* user_table,
|
|
|
|
dict_foreign_t** drop_fk,
|
|
|
|
ulint n_drop_fk)
|
|
|
|
{
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
|
|
|
|
for (Field** fp = old_table->field; *fp; fp++) {
|
|
|
|
cf_it.rewind();
|
|
|
|
const Create_field* new_field;
|
|
|
|
|
|
|
|
ut_ad(!(*fp)->real_maybe_null()
|
|
|
|
== !!((*fp)->flags & NOT_NULL_FLAG));
|
|
|
|
|
|
|
|
while ((new_field = cf_it++)) {
|
|
|
|
if (new_field->field == *fp) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!new_field || (new_field->flags & NOT_NULL_FLAG)) {
|
|
|
|
if (innobase_check_foreigns_low(
|
|
|
|
user_table, drop_fk, n_drop_fk,
|
|
|
|
(*fp)->field_name, !new_field)) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Convert a default value for ADD COLUMN.
|
|
|
|
|
|
|
|
@param heap Memory heap where allocated
|
|
|
|
@param dfield InnoDB data field to copy to
|
|
|
|
@param field MySQL value for the column
|
|
|
|
@param comp nonzero if in compact format */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
|
|
|
innobase_build_col_map_add(
|
|
|
|
/*=======================*/
|
|
|
|
mem_heap_t* heap,
|
|
|
|
dfield_t* dfield,
|
|
|
|
const Field* field,
|
|
|
|
ulint comp)
|
|
|
|
{
|
|
|
|
if (field->is_real_null()) {
|
|
|
|
dfield_set_null(dfield);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ulint size = field->pack_length();
|
|
|
|
|
|
|
|
byte* buf = static_cast<byte*>(mem_heap_alloc(heap, size));
|
|
|
|
|
|
|
|
row_mysql_store_col_in_innobase_format(
|
|
|
|
dfield, buf, TRUE, field->ptr, size, comp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Construct the translation table for reordering, dropping or
|
|
|
|
adding columns.
|
|
|
|
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param table MySQL table as it is before the ALTER operation
|
|
|
|
@param new_table InnoDB table corresponding to MySQL altered_table
|
|
|
|
@param old_table InnoDB table corresponding to MYSQL table
|
|
|
|
@param add_cols Default values for ADD COLUMN, or NULL if no ADD COLUMN
|
|
|
|
@param heap Memory heap where allocated
|
|
|
|
@return array of integers, mapping column numbers in the table
|
|
|
|
to column numbers in altered_table */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(1,2,3,4,5,7), warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
const ulint*
|
|
|
|
innobase_build_col_map(
|
|
|
|
/*===================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* altered_table,
|
|
|
|
const TABLE* table,
|
|
|
|
const dict_table_t* new_table,
|
|
|
|
const dict_table_t* old_table,
|
|
|
|
dtuple_t* add_cols,
|
|
|
|
mem_heap_t* heap)
|
|
|
|
{
|
2013-07-31 15:41:29 +02:00
|
|
|
uint old_i, old_innobase_i;
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ENTER("innobase_build_col_map");
|
|
|
|
DBUG_ASSERT(altered_table != table);
|
|
|
|
DBUG_ASSERT(new_table != old_table);
|
|
|
|
DBUG_ASSERT(dict_table_get_n_cols(new_table)
|
2013-07-31 15:41:29 +02:00
|
|
|
>= altered_table->s->stored_fields + DATA_N_SYS_COLS);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(dict_table_get_n_cols(old_table)
|
2013-07-31 15:41:29 +02:00
|
|
|
>= table->s->stored_fields + DATA_N_SYS_COLS);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(!!add_cols == !!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_COLUMN));
|
|
|
|
DBUG_ASSERT(!add_cols || dtuple_get_n_fields(add_cols)
|
|
|
|
== dict_table_get_n_cols(new_table));
|
|
|
|
|
|
|
|
ulint* col_map = static_cast<ulint*>(
|
|
|
|
mem_heap_alloc(heap, old_table->n_cols * sizeof *col_map));
|
|
|
|
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
2013-07-31 15:41:29 +02:00
|
|
|
uint i = 0, sql_idx = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Any dropped columns will map to ULINT_UNDEFINED. */
|
2013-07-31 15:41:29 +02:00
|
|
|
for (old_innobase_i = 0;
|
|
|
|
old_innobase_i + DATA_N_SYS_COLS < old_table->n_cols;
|
|
|
|
old_innobase_i++) {
|
|
|
|
col_map[old_innobase_i] = ULINT_UNDEFINED;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
while (const Create_field* new_field = cf_it++) {
|
2013-07-31 15:41:29 +02:00
|
|
|
if (!new_field->stored_in_db)
|
|
|
|
{
|
|
|
|
sql_idx++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
for (old_i = 0, old_innobase_i= 0;
|
|
|
|
table->field[old_i];
|
|
|
|
old_i++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
const Field* field = table->field[old_i];
|
2013-07-31 15:41:29 +02:00
|
|
|
if (!table->field[old_i]->stored_in_db)
|
|
|
|
continue;
|
2013-03-25 23:03:13 +01:00
|
|
|
if (new_field->field == field) {
|
2013-07-31 15:41:29 +02:00
|
|
|
col_map[old_innobase_i] = i;
|
2013-03-25 23:03:13 +01:00
|
|
|
goto found_col;
|
|
|
|
}
|
2013-07-31 15:41:29 +02:00
|
|
|
old_innobase_i++;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
innobase_build_col_map_add(
|
|
|
|
heap, dtuple_get_nth_field(add_cols, i),
|
2014-11-18 22:25:33 +01:00
|
|
|
altered_table->field[sql_idx],
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_table_is_comp(new_table));
|
|
|
|
found_col:
|
|
|
|
i++;
|
2013-07-31 15:41:29 +02:00
|
|
|
sql_idx++;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
DBUG_ASSERT(i == altered_table->s->stored_fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
i = table->s->stored_fields;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Add the InnoDB hidden FTS_DOC_ID column, if any. */
|
|
|
|
if (i + DATA_N_SYS_COLS < old_table->n_cols) {
|
|
|
|
/* There should be exactly one extra field,
|
|
|
|
the FTS_DOC_ID. */
|
|
|
|
DBUG_ASSERT(DICT_TF2_FLAG_IS_SET(old_table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID));
|
|
|
|
DBUG_ASSERT(i + DATA_N_SYS_COLS + 1 == old_table->n_cols);
|
|
|
|
DBUG_ASSERT(!strcmp(dict_table_get_col_name(
|
2013-07-31 15:41:29 +02:00
|
|
|
old_table, table->s->stored_fields),
|
2013-03-25 23:03:13 +01:00
|
|
|
FTS_DOC_ID_COL_NAME));
|
2013-07-31 15:41:29 +02:00
|
|
|
if (altered_table->s->stored_fields + DATA_N_SYS_COLS
|
2013-03-25 23:03:13 +01:00
|
|
|
< new_table->n_cols) {
|
|
|
|
DBUG_ASSERT(DICT_TF2_FLAG_IS_SET(
|
|
|
|
new_table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID));
|
2013-07-31 15:41:29 +02:00
|
|
|
DBUG_ASSERT(altered_table->s->stored_fields
|
2013-03-25 23:03:13 +01:00
|
|
|
+ DATA_N_SYS_COLS + 1
|
|
|
|
== new_table->n_cols);
|
2013-07-31 15:41:29 +02:00
|
|
|
col_map[i] = altered_table->s->stored_fields;
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
|
|
|
DBUG_ASSERT(!DICT_TF2_FLAG_IS_SET(
|
|
|
|
new_table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID));
|
|
|
|
col_map[i] = ULINT_UNDEFINED;
|
|
|
|
}
|
|
|
|
|
|
|
|
i++;
|
|
|
|
} else {
|
|
|
|
DBUG_ASSERT(!DICT_TF2_FLAG_IS_SET(
|
|
|
|
old_table,
|
|
|
|
DICT_TF2_FTS_HAS_DOC_ID));
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; i < old_table->n_cols; i++) {
|
|
|
|
col_map[i] = i + new_table->n_cols - old_table->n_cols;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(col_map);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Drop newly create FTS index related auxiliary table during
|
|
|
|
FIC create index process, before fts_add_index is called
|
|
|
|
@param table table that was being rebuilt online
|
|
|
|
@param trx transaction
|
|
|
|
@return DB_SUCCESS if successful, otherwise last error code
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
dberr_t
|
|
|
|
innobase_drop_fts_index_table(
|
|
|
|
/*==========================*/
|
|
|
|
dict_table_t* table,
|
|
|
|
trx_t* trx)
|
|
|
|
{
|
|
|
|
dberr_t ret_err = DB_SUCCESS;
|
|
|
|
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(table);
|
|
|
|
index != NULL;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
|
|
|
if (index->type & DICT_FTS) {
|
|
|
|
dberr_t err;
|
|
|
|
|
|
|
|
err = fts_drop_index_tables(trx, index);
|
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
ret_err = err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(ret_err);
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Get the new column names if any columns were renamed
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param altered_table MySQL table that is being altered
|
2014-05-05 18:20:28 +02:00
|
|
|
@param table MySQL table as it is before the ALTER operation
|
2014-02-01 09:33:26 +01:00
|
|
|
@param user_table InnoDB table as it is before the ALTER operation
|
|
|
|
@param heap Memory heap for the allocation
|
|
|
|
@return array of new column names in rebuilt_table, or NULL if not renamed */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
const char**
|
|
|
|
innobase_get_col_names(
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* altered_table,
|
2014-05-05 18:20:28 +02:00
|
|
|
const TABLE* table,
|
2014-02-01 09:33:26 +01:00
|
|
|
const dict_table_t* user_table,
|
|
|
|
mem_heap_t* heap)
|
|
|
|
{
|
|
|
|
const char** cols;
|
|
|
|
uint i;
|
|
|
|
|
|
|
|
DBUG_ENTER("innobase_get_col_names");
|
2014-05-05 18:20:28 +02:00
|
|
|
DBUG_ASSERT(user_table->n_def > table->s->fields);
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME);
|
|
|
|
|
|
|
|
cols = static_cast<const char**>(
|
2014-05-05 18:20:28 +02:00
|
|
|
mem_heap_zalloc(heap, user_table->n_def * sizeof *cols));
|
2014-02-26 19:11:54 +01:00
|
|
|
|
2014-05-05 18:20:28 +02:00
|
|
|
i = 0;
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
while (const Create_field* new_field = cf_it++) {
|
|
|
|
DBUG_ASSERT(i < altered_table->s->fields);
|
2014-02-01 09:33:26 +01:00
|
|
|
|
2014-05-05 18:20:28 +02:00
|
|
|
for (uint old_i = 0; table->field[old_i]; old_i++) {
|
|
|
|
if (new_field->field == table->field[old_i]) {
|
|
|
|
cols[old_i] = new_field->field_name;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
2014-05-05 18:20:28 +02:00
|
|
|
i++;
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the internal column names. */
|
2014-05-05 18:20:28 +02:00
|
|
|
i = table->s->fields;
|
2014-02-01 09:33:26 +01:00
|
|
|
cols[i] = dict_table_get_col_name(user_table, i);
|
|
|
|
|
|
|
|
while (++i < user_table->n_def) {
|
|
|
|
cols[i] = cols[i - 1] + strlen(cols[i - 1]) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(cols);
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Update internal structures with concurrent writes blocked,
|
|
|
|
while preparing ALTER TABLE.
|
|
|
|
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param old_table MySQL table as it is before the ALTER operation
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@param flags Table and tablespace flags
|
|
|
|
@param flags2 Additional table flags
|
|
|
|
@param fts_doc_id_col The column number of FTS_DOC_ID
|
|
|
|
@param add_fts_doc_id Flag: add column FTS_DOC_ID?
|
2014-02-01 09:33:26 +01:00
|
|
|
@param add_fts_doc_id_idx Flag: add index FTS_DOC_ID_INDEX (FTS_DOC_ID)?
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((warn_unused_result, nonnull(1,2,3,4)))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
prepare_inplace_alter_table_dict(
|
|
|
|
/*=============================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* altered_table,
|
|
|
|
const TABLE* old_table,
|
|
|
|
const char* table_name,
|
|
|
|
ulint flags,
|
|
|
|
ulint flags2,
|
|
|
|
ulint fts_doc_id_col,
|
|
|
|
bool add_fts_doc_id,
|
|
|
|
bool add_fts_doc_id_idx)
|
|
|
|
{
|
|
|
|
bool dict_locked = false;
|
|
|
|
ulint* add_key_nums; /* MySQL key numbers */
|
|
|
|
index_def_t* index_defs; /* index definitions */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_t* user_table;
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_index_t* fts_index = NULL;
|
|
|
|
ulint new_clustered = 0;
|
|
|
|
dberr_t error;
|
|
|
|
ulint num_fts_index;
|
2013-07-31 15:41:29 +02:00
|
|
|
uint sql_idx;
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_innobase_inplace_ctx*ctx;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("prepare_inplace_alter_table_dict");
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
ctx = static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(ha_alter_info->handler_ctx);
|
|
|
|
|
|
|
|
DBUG_ASSERT((ctx->add_autoinc != ULINT_UNDEFINED)
|
|
|
|
== (ctx->sequence.m_max_value > 0));
|
|
|
|
DBUG_ASSERT(!ctx->num_to_drop_index == !ctx->drop_index);
|
|
|
|
DBUG_ASSERT(!ctx->num_to_drop_fk == !ctx->drop_fk);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(!add_fts_doc_id || add_fts_doc_id_idx);
|
|
|
|
DBUG_ASSERT(!add_fts_doc_id_idx
|
2014-02-01 09:33:26 +01:00
|
|
|
|| innobase_fulltext_exist(altered_table));
|
|
|
|
DBUG_ASSERT(!ctx->add_cols);
|
|
|
|
DBUG_ASSERT(!ctx->add_index);
|
|
|
|
DBUG_ASSERT(!ctx->add_key_numbers);
|
|
|
|
DBUG_ASSERT(!ctx->num_to_add_index);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
user_table = ctx->new_table;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_start_if_not_started_xa(ctx->prebuilt->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Create a background transaction for the operations on
|
|
|
|
the data dictionary tables. */
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->trx = innobase_trx_allocate(ctx->prebuilt->trx->mysql_thd);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_start_for_ddl(ctx->trx, TRX_DICT_OP_INDEX);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Create table containing all indexes to be built in this
|
|
|
|
ALTER TABLE ADD INDEX so that they are in the correct order
|
|
|
|
in the table. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->num_to_add_index = ha_alter_info->index_add_count;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2016-02-16 12:07:18 +01:00
|
|
|
ut_ad(ctx->prebuilt->trx->mysql_thd != NULL);
|
|
|
|
const char* path = thd_innodb_tmpdir(
|
|
|
|
ctx->prebuilt->trx->mysql_thd);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
index_defs = innobase_create_key_defs(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->heap, ha_alter_info, altered_table, ctx->num_to_add_index,
|
|
|
|
num_fts_index,
|
|
|
|
row_table_got_default_clust_index(ctx->new_table),
|
2016-02-15 13:43:42 +01:00
|
|
|
fts_doc_id_col, add_fts_doc_id, add_fts_doc_id_idx,
|
|
|
|
old_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
new_clustered = DICT_CLUSTERED & index_defs[0].ind_type;
|
|
|
|
|
|
|
|
if (num_fts_index > 1) {
|
|
|
|
my_error(ER_INNODB_FT_LIMIT, MYF(0));
|
|
|
|
goto error_handled;
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!ctx->online) {
|
|
|
|
/* This is not an online operation (LOCK=NONE). */
|
|
|
|
} else if (ctx->add_autoinc == ULINT_UNDEFINED
|
|
|
|
&& num_fts_index == 0
|
2016-02-15 13:43:42 +01:00
|
|
|
&& (!innobase_need_rebuild(ha_alter_info, old_table)
|
2014-02-01 09:33:26 +01:00
|
|
|
|| !innobase_fulltext_exist(altered_table))) {
|
|
|
|
/* InnoDB can perform an online operation (LOCK=NONE). */
|
|
|
|
} else {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* This should have been blocked in
|
|
|
|
check_if_supported_inplace_alter(). */
|
|
|
|
ut_ad(0);
|
|
|
|
my_error(ER_NOT_SUPPORTED_YET, MYF(0),
|
2014-02-01 09:33:26 +01:00
|
|
|
thd_query_string(ctx->prebuilt->trx->mysql_thd)->str);
|
2013-03-25 23:03:13 +01:00
|
|
|
goto error_handled;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The primary index would be rebuilt if a FTS Doc ID
|
|
|
|
column is to be added, and the primary index definition
|
|
|
|
is just copied from old table and stored in indexdefs[0] */
|
|
|
|
DBUG_ASSERT(!add_fts_doc_id || new_clustered);
|
|
|
|
DBUG_ASSERT(!!new_clustered ==
|
2016-02-15 13:43:42 +01:00
|
|
|
(innobase_need_rebuild(ha_alter_info, old_table)
|
2013-03-25 23:03:13 +01:00
|
|
|
|| add_fts_doc_id));
|
|
|
|
|
|
|
|
/* Allocate memory for dictionary index definitions */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->add_index = static_cast<dict_index_t**>(
|
|
|
|
mem_heap_alloc(ctx->heap, ctx->num_to_add_index
|
|
|
|
* sizeof *ctx->add_index));
|
|
|
|
ctx->add_key_numbers = add_key_nums = static_cast<ulint*>(
|
|
|
|
mem_heap_alloc(ctx->heap, ctx->num_to_add_index
|
|
|
|
* sizeof *ctx->add_key_numbers));
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* This transaction should be dictionary operation, so that
|
|
|
|
the data dictionary will be locked during crash recovery. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(ctx->trx->dict_operation == TRX_DICT_OP_INDEX);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Acquire a lock on the table before creating any indexes. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->online) {
|
|
|
|
error = DB_SUCCESS;
|
|
|
|
} else {
|
2013-03-25 23:03:13 +01:00
|
|
|
error = row_merge_lock_table(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->prebuilt->trx, ctx->new_table, LOCK_S);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Latch the InnoDB data dictionary exclusively so that no deadlocks
|
|
|
|
or lock waits can happen in it during an index create operation. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_mysql_lock_data_dictionary(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_locked = true;
|
|
|
|
|
|
|
|
/* Wait for background stats processing to stop using the table that
|
|
|
|
we are going to alter. We know bg stats will not start using it again
|
|
|
|
until we are holding the data dict locked and we are holding it here
|
|
|
|
at least until checking ut_ad(user_table->n_ref_count == 1) below.
|
|
|
|
XXX what may happen if bg stats opens the table after we
|
|
|
|
have unlocked data dictionary below? */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_stats_wait_bg_to_stop_using_table(user_table, ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
online_retry_drop_indexes_low(ctx->new_table, ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, CHECK_ABORTED_OK));
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* If a new clustered index is defined for the table we need
|
2014-02-01 09:33:26 +01:00
|
|
|
to rebuild the table with a temporary name. */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (new_clustered) {
|
2014-02-01 09:33:26 +01:00
|
|
|
const char* new_table_name
|
|
|
|
= dict_mem_create_temporary_tablename(
|
|
|
|
ctx->heap,
|
|
|
|
ctx->new_table->name,
|
|
|
|
ctx->new_table->id);
|
|
|
|
ulint n_cols;
|
|
|
|
dtuple_t* add_cols;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (innobase_check_foreigns(
|
|
|
|
ha_alter_info, altered_table, old_table,
|
2014-02-01 09:33:26 +01:00
|
|
|
user_table, ctx->drop_fk, ctx->num_to_drop_fk)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
goto new_clustered_failed;
|
|
|
|
}
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
n_cols = altered_table->s->stored_fields;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (add_fts_doc_id) {
|
|
|
|
n_cols++;
|
|
|
|
DBUG_ASSERT(flags2 & DICT_TF2_FTS);
|
|
|
|
DBUG_ASSERT(add_fts_doc_id_idx);
|
|
|
|
flags2 |= DICT_TF2_FTS_ADD_DOC_ID
|
|
|
|
| DICT_TF2_FTS_HAS_DOC_ID
|
|
|
|
| DICT_TF2_FTS;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(!add_fts_doc_id_idx || (flags2 & DICT_TF2_FTS));
|
|
|
|
|
|
|
|
/* Create the table. */
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_set_dict_operation(ctx->trx, TRX_DICT_OP_TABLE);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (dict_table_get_low(new_table_name)) {
|
|
|
|
my_error(ER_TABLE_EXISTS_ERROR, MYF(0),
|
|
|
|
new_table_name);
|
|
|
|
goto new_clustered_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The initial space id 0 may be overridden later. */
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table = dict_mem_table_create(
|
2013-03-25 23:03:13 +01:00
|
|
|
new_table_name, 0, n_cols, flags, flags2);
|
2014-02-01 09:33:26 +01:00
|
|
|
/* The rebuilt indexed_table will use the renamed
|
|
|
|
column names. */
|
|
|
|
ctx->col_names = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (DICT_TF_HAS_DATA_DIR(flags)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table->data_dir_path =
|
|
|
|
mem_heap_strdup(ctx->new_table->heap,
|
2013-03-25 23:03:13 +01:00
|
|
|
user_table->data_dir_path);
|
|
|
|
}
|
|
|
|
|
2013-07-31 15:41:29 +02:00
|
|
|
sql_idx= 0;
|
|
|
|
for (uint i = 0; i < altered_table->s->stored_fields; i++, sql_idx++) {
|
|
|
|
const Field* field;
|
|
|
|
while (!((field= altered_table->field[sql_idx])->
|
|
|
|
stored_in_db))
|
|
|
|
sql_idx++;
|
2013-03-25 23:03:13 +01:00
|
|
|
ulint is_unsigned;
|
|
|
|
ulint field_type
|
|
|
|
= (ulint) field->type();
|
|
|
|
ulint col_type
|
|
|
|
= get_innobase_type_from_mysql_type(
|
|
|
|
&is_unsigned, field);
|
|
|
|
ulint charset_no;
|
|
|
|
ulint col_len;
|
|
|
|
|
|
|
|
/* we assume in dtype_form_prtype() that this
|
|
|
|
fits in two bytes */
|
|
|
|
ut_a(field_type <= MAX_CHAR_COLL_NUM);
|
|
|
|
|
|
|
|
if (!field->real_maybe_null()) {
|
|
|
|
field_type |= DATA_NOT_NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (field->binary()) {
|
|
|
|
field_type |= DATA_BINARY_TYPE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_unsigned) {
|
|
|
|
field_type |= DATA_UNSIGNED;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dtype_is_string_type(col_type)) {
|
|
|
|
charset_no = (ulint) field->charset()->number;
|
|
|
|
|
|
|
|
if (charset_no > MAX_CHAR_COLL_NUM) {
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_mem_table_free(
|
|
|
|
ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
my_error(ER_WRONG_KEY_COLUMN, MYF(0),
|
|
|
|
field->field_name);
|
|
|
|
goto new_clustered_failed;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
charset_no = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
col_len = field->pack_length();
|
|
|
|
|
|
|
|
/* The MySQL pack length contains 1 or 2 bytes
|
|
|
|
length field for a true VARCHAR. Let us
|
|
|
|
subtract that, so that the InnoDB column
|
|
|
|
length in the InnoDB data dictionary is the
|
|
|
|
real maximum byte length of the actual data. */
|
|
|
|
|
|
|
|
if (field->type() == MYSQL_TYPE_VARCHAR) {
|
|
|
|
uint32 length_bytes
|
|
|
|
= static_cast<const Field_varstring*>(
|
|
|
|
field)->length_bytes;
|
|
|
|
|
|
|
|
col_len -= length_bytes;
|
|
|
|
|
|
|
|
if (length_bytes == 2) {
|
|
|
|
field_type |= DATA_LONG_TRUE_VARCHAR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dict_col_name_is_reserved(field->field_name)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_mem_table_free(ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
my_error(ER_WRONG_COLUMN_NAME, MYF(0),
|
|
|
|
field->field_name);
|
|
|
|
goto new_clustered_failed;
|
|
|
|
}
|
|
|
|
|
|
|
|
dict_mem_table_add_col(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, ctx->heap,
|
2013-03-25 23:03:13 +01:00
|
|
|
field->field_name,
|
|
|
|
col_type,
|
|
|
|
dtype_form_prtype(field_type, charset_no),
|
|
|
|
col_len);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (add_fts_doc_id) {
|
2014-02-01 09:33:26 +01:00
|
|
|
fts_add_doc_id_column(ctx->new_table, ctx->heap);
|
|
|
|
ctx->new_table->fts->doc_col = fts_doc_id_col;
|
2013-07-31 15:41:29 +02:00
|
|
|
ut_ad(fts_doc_id_col == altered_table->s->stored_fields);
|
2014-02-01 09:33:26 +01:00
|
|
|
} else if (ctx->new_table->fts) {
|
|
|
|
ctx->new_table->fts->doc_col = fts_doc_id_col;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
error = row_create_table_for_mysql(
|
|
|
|
ctx->new_table, ctx->trx, false);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
switch (error) {
|
|
|
|
dict_table_t* temp_table;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
/* We need to bump up the table ref count and
|
|
|
|
before we can use it we need to open the
|
|
|
|
table. The new_table must be in the data
|
|
|
|
dictionary cache, because we are still holding
|
|
|
|
the dict_sys->mutex. */
|
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
temp_table = dict_table_open_on_name(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table->name, TRUE, FALSE,
|
2013-03-25 23:03:13 +01:00
|
|
|
DICT_ERR_IGNORE_NONE);
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_a(ctx->new_table == temp_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
/* n_ref_count must be 1, because purge cannot
|
|
|
|
be executing on this very table as we are
|
|
|
|
holding dict_operation_lock X-latch. */
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->new_table->n_ref_count == 1);
|
2013-03-25 23:03:13 +01:00
|
|
|
break;
|
|
|
|
case DB_TABLESPACE_EXISTS:
|
|
|
|
my_error(ER_TABLESPACE_EXISTS, MYF(0),
|
|
|
|
new_table_name);
|
|
|
|
goto new_clustered_failed;
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
my_error(HA_ERR_TABLE_EXIST, MYF(0),
|
|
|
|
altered_table->s->table_name.str);
|
|
|
|
goto new_clustered_failed;
|
|
|
|
default:
|
|
|
|
my_error_innodb(error, table_name, flags);
|
|
|
|
new_clustered_failed:
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->trx != ctx->prebuilt->trx);
|
|
|
|
trx_rollback_to_savepoint(ctx->trx, NULL);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
ut_ad(user_table->n_ref_count == 1);
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
online_retry_drop_indexes_with_trx(
|
|
|
|
user_table, ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_COLUMN) {
|
|
|
|
add_cols = dtuple_create(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->heap,
|
|
|
|
dict_table_get_n_cols(ctx->new_table));
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_copy_types(add_cols, ctx->new_table);
|
|
|
|
} else {
|
|
|
|
add_cols = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->col_map = innobase_build_col_map(
|
2013-03-25 23:03:13 +01:00
|
|
|
ha_alter_info, altered_table, old_table,
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, user_table,
|
|
|
|
add_cols, ctx->heap);
|
|
|
|
ctx->add_cols = add_cols;
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
2016-02-15 13:43:42 +01:00
|
|
|
DBUG_ASSERT(!innobase_need_rebuild(ha_alter_info, old_table));
|
2017-01-07 13:24:42 +01:00
|
|
|
DBUG_ASSERT(old_table->s->primary_key
|
|
|
|
== altered_table->s->primary_key);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!ctx->new_table->fts
|
|
|
|
&& innobase_fulltext_exist(altered_table)) {
|
|
|
|
ctx->new_table->fts = fts_create(
|
|
|
|
ctx->new_table);
|
|
|
|
ctx->new_table->fts->doc_col = fts_doc_id_col;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Assign table_id, so that no table id of
|
|
|
|
fts_create_index_tables() will be written to the undo logs. */
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->new_table->id != 0);
|
|
|
|
ctx->trx->table_id = ctx->new_table->id;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Create the indexes in SYS_INDEXES and load into dictionary. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint a = 0; a < ctx->num_to_add_index; a++) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->add_index[a] = row_merge_create_index(
|
|
|
|
ctx->trx, ctx->new_table,
|
2016-02-15 13:43:42 +01:00
|
|
|
&index_defs[a], ctx->col_names);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
add_key_nums[a] = index_defs[a].key_number;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!ctx->add_index[a]) {
|
|
|
|
error = ctx->trx->error_state;
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(error != DB_SUCCESS);
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->add_index[a]->type & DICT_FTS) {
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(num_fts_index);
|
|
|
|
DBUG_ASSERT(!fts_index);
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->add_index[a]->type == DICT_FTS);
|
|
|
|
fts_index = ctx->add_index[a];
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* If only online ALTER TABLE operations have been
|
|
|
|
requested, allocate a modification log. If the table
|
|
|
|
will be locked anyway, the modification
|
|
|
|
log is unnecessary. When rebuilding the table
|
|
|
|
(new_clustered), we will allocate the log for the
|
|
|
|
clustered index of the old table, later. */
|
|
|
|
if (new_clustered
|
2014-02-01 09:33:26 +01:00
|
|
|
|| !ctx->online
|
2013-03-25 23:03:13 +01:00
|
|
|
|| user_table->ibd_file_missing
|
|
|
|
|| dict_table_is_discarded(user_table)) {
|
|
|
|
/* No need to allocate a modification log. */
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(!ctx->add_index[a]->online_log);
|
|
|
|
} else if (ctx->add_index[a]->type & DICT_FTS) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Fulltext indexes are not covered
|
|
|
|
by a modification log. */
|
|
|
|
} else {
|
|
|
|
DBUG_EXECUTE_IF("innodb_OOM_prepare_inplace_alter",
|
|
|
|
error = DB_OUT_OF_MEMORY;
|
|
|
|
goto error_handling;);
|
2014-02-01 09:33:26 +01:00
|
|
|
rw_lock_x_lock(&ctx->add_index[a]->lock);
|
2016-02-16 12:07:18 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
bool ok = row_log_allocate(ctx->add_index[a],
|
2016-02-16 12:07:18 +01:00
|
|
|
NULL, true, NULL,
|
|
|
|
NULL, path);
|
2014-02-01 09:33:26 +01:00
|
|
|
rw_lock_x_unlock(&ctx->add_index[a]->lock);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (!ok) {
|
|
|
|
error = DB_OUT_OF_MEMORY;
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(new_clustered == ctx->need_rebuild());
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("innodb_OOM_prepare_inplace_alter",
|
|
|
|
error = DB_OUT_OF_MEMORY;
|
|
|
|
goto error_handling;);
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered && ctx->online) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Allocate a log for online table rebuild. */
|
|
|
|
dict_index_t* clust_index = dict_table_get_first_index(
|
|
|
|
user_table);
|
|
|
|
|
|
|
|
rw_lock_x_lock(&clust_index->lock);
|
|
|
|
bool ok = row_log_allocate(
|
2014-02-01 09:33:26 +01:00
|
|
|
clust_index, ctx->new_table,
|
2013-03-25 23:03:13 +01:00
|
|
|
!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_PK_INDEX),
|
2016-02-16 12:07:18 +01:00
|
|
|
ctx->add_cols, ctx->col_map, path);
|
2013-03-25 23:03:13 +01:00
|
|
|
rw_lock_x_unlock(&clust_index->lock);
|
|
|
|
|
|
|
|
if (!ok) {
|
|
|
|
error = DB_OUT_OF_MEMORY;
|
|
|
|
goto error_handling;
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->online) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Assign a consistent read view for
|
|
|
|
row_merge_read_clustered_index(). */
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_assign_read_view(ctx->prebuilt->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fts_index) {
|
|
|
|
/* Ensure that the dictionary operation mode will
|
|
|
|
not change while creating the auxiliary tables. */
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_dict_op_t op = trx_get_dict_operation(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
switch (op) {
|
|
|
|
case TRX_DICT_OP_NONE:
|
|
|
|
break;
|
|
|
|
case TRX_DICT_OP_TABLE:
|
|
|
|
case TRX_DICT_OP_INDEX:
|
|
|
|
goto op_ok;
|
|
|
|
}
|
|
|
|
ut_error;
|
|
|
|
op_ok:
|
|
|
|
#endif /* UNIV_DEBUG */
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(ctx->trx->dict_operation_lock_mode == RW_X_LATCH);
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DICT_TF2_FLAG_SET(ctx->new_table, DICT_TF2_FTS);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* This function will commit the transaction and reset
|
|
|
|
the trx_t::dict_operation flag on success. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
error = fts_create_index_tables(ctx->trx, fts_index);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("innodb_test_fail_after_fts_index_table",
|
|
|
|
error = DB_LOCK_WAIT_TIMEOUT;
|
|
|
|
goto error_handling;);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_start_for_ddl(ctx->trx, op);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!ctx->new_table->fts
|
|
|
|
|| ib_vector_size(ctx->new_table->fts->indexes) == 0) {
|
2013-03-25 23:03:13 +01:00
|
|
|
error = fts_create_common_tables(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->trx, ctx->new_table,
|
|
|
|
user_table->name, TRUE);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_EXECUTE_IF(
|
|
|
|
"innodb_test_fail_after_fts_common_table",
|
|
|
|
error = DB_LOCK_WAIT_TIMEOUT;);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table->fts->fts_status
|
|
|
|
|= TABLE_DICT_LOCKED;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
error = innobase_fts_load_stopword(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, ctx->trx,
|
|
|
|
ctx->prebuilt->trx->mysql_thd)
|
2013-03-25 23:03:13 +01:00
|
|
|
? DB_SUCCESS : DB_ERROR;
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table->fts->fts_status
|
|
|
|
&= ~TABLE_DICT_LOCKED;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto error_handling;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(trx_get_dict_operation(ctx->trx) == op);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(error == DB_SUCCESS);
|
|
|
|
|
|
|
|
/* Commit the data dictionary transaction in order to release
|
|
|
|
the table locks on the system tables. This means that if
|
|
|
|
MySQL crashes while creating a new primary key inside
|
2014-02-01 09:33:26 +01:00
|
|
|
row_merge_build_indexes(), ctx->new_table will not be dropped
|
2013-03-25 23:03:13 +01:00
|
|
|
by trx_rollback_active(). It will have to be recovered or
|
|
|
|
dropped by the database administrator. */
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_commit_for_mysql(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_mysql_unlock_data_dictionary(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_locked = false;
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_a(ctx->trx->lock.n_active_thrs == 0);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
error_handling:
|
|
|
|
/* After an error, remove all those index definitions from the
|
|
|
|
dictionary which were defined. */
|
|
|
|
|
|
|
|
switch (error) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
ut_a(!dict_locked);
|
|
|
|
|
|
|
|
ut_d(mutex_enter(&dict_sys->mutex));
|
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
user_table, CHECK_PARTIAL_OK));
|
|
|
|
ut_d(mutex_exit(&dict_sys->mutex));
|
|
|
|
DBUG_RETURN(false);
|
|
|
|
case DB_TABLESPACE_EXISTS:
|
|
|
|
my_error(ER_TABLESPACE_EXISTS, MYF(0), "(unknown)");
|
|
|
|
break;
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
my_error(ER_DUP_KEY, MYF(0), "SYS_INDEXES");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
my_error_innodb(error, table_name, user_table->flags);
|
|
|
|
}
|
|
|
|
|
|
|
|
error_handled:
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->prebuilt->trx->error_info = NULL;
|
|
|
|
ctx->trx->error_state = DB_SUCCESS;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (!dict_locked) {
|
2014-02-01 09:33:26 +01:00
|
|
|
row_mysql_lock_data_dictionary(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (new_clustered) {
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->need_rebuild()) {
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (DICT_TF2_FLAG_IS_SET(
|
|
|
|
ctx->new_table, DICT_TF2_FTS)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
innobase_drop_fts_index_table(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_close(ctx->new_table, TRUE, FALSE);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
#if defined UNIV_DEBUG || defined UNIV_DDL_DEBUG
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Nobody should have initialized the stats of the
|
|
|
|
newly created table yet. When this is the case, we
|
|
|
|
know that it has not been added for background stats
|
|
|
|
gathering. */
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_a(!ctx->new_table->stat_initialized);
|
|
|
|
#endif /* UNIV_DEBUG || UNIV_DDL_DEBUG */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_merge_drop_table(ctx->trx, ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Free the log for online table rebuild, if
|
|
|
|
one was allocated. */
|
|
|
|
|
|
|
|
dict_index_t* clust_index = dict_table_get_first_index(
|
|
|
|
user_table);
|
|
|
|
|
|
|
|
rw_lock_x_lock(&clust_index->lock);
|
|
|
|
|
|
|
|
if (clust_index->online_log) {
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(ctx->online);
|
2013-03-25 23:03:13 +01:00
|
|
|
row_log_abort_sec(clust_index);
|
|
|
|
clust_index->online_status
|
|
|
|
= ONLINE_INDEX_COMPLETE;
|
|
|
|
}
|
|
|
|
|
|
|
|
rw_lock_x_unlock(&clust_index->lock);
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_commit_for_mysql(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
/* n_ref_count must be 1, because purge cannot
|
|
|
|
be executing on this very table as we are
|
|
|
|
holding dict_operation_lock X-latch. */
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(user_table->n_ref_count == 1 || ctx->online);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
online_retry_drop_indexes_with_trx(user_table, ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_ad(!ctx->need_rebuild());
|
|
|
|
row_merge_drop_indexes(ctx->trx, user_table, TRUE);
|
|
|
|
trx_commit_for_mysql(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ut_d(dict_table_check_for_dup_indexes(user_table, CHECK_ALL_COMPLETE));
|
|
|
|
ut_ad(!user_table->drop_aborted);
|
|
|
|
|
|
|
|
err_exit:
|
|
|
|
/* Clear the to_be_dropped flag in the data dictionary cache. */
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
DBUG_ASSERT(*ctx->drop_index[i]->name != TEMP_INDEX_PREFIX);
|
|
|
|
DBUG_ASSERT(ctx->drop_index[i]->to_be_dropped);
|
|
|
|
ctx->drop_index[i]->to_be_dropped = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_mysql_unlock_data_dictionary(ctx->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_free_for_mysql(ctx->trx);
|
|
|
|
trx_commit_for_mysql(ctx->prebuilt->trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
delete ctx;
|
|
|
|
ha_alter_info->handler_ctx = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether an index is needed for the foreign key constraint.
|
|
|
|
If so, if it is dropped, is there an equivalent index can play its role.
|
|
|
|
@return true if the index is needed and can't be dropped */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull(1,2,3,5), warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
innobase_check_foreign_key_index(
|
|
|
|
/*=============================*/
|
|
|
|
Alter_inplace_info* ha_alter_info, /*!< in: Structure describing
|
|
|
|
changes to be done by ALTER
|
|
|
|
TABLE */
|
|
|
|
dict_index_t* index, /*!< in: index to check */
|
|
|
|
dict_table_t* indexed_table, /*!< in: table that owns the
|
|
|
|
foreign keys */
|
2014-02-01 09:33:26 +01:00
|
|
|
const char** col_names, /*!< in: column names, or NULL
|
|
|
|
for indexed_table->col_names */
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_t* trx, /*!< in/out: transaction */
|
|
|
|
dict_foreign_t** drop_fk, /*!< in: Foreign key constraints
|
|
|
|
to drop */
|
|
|
|
ulint n_drop_fk) /*!< in: Number of foreign keys
|
|
|
|
to drop */
|
|
|
|
{
|
2015-08-03 13:03:47 +02:00
|
|
|
ut_ad(index != NULL);
|
|
|
|
ut_ad(indexed_table != NULL);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2015-08-03 13:03:47 +02:00
|
|
|
const dict_foreign_set* fks = &indexed_table->referenced_set;
|
|
|
|
|
|
|
|
/* Check for all FK references from other tables to the index. */
|
|
|
|
for (dict_foreign_set::const_iterator it = fks->begin();
|
|
|
|
it != fks->end(); ++it) {
|
|
|
|
|
|
|
|
dict_foreign_t* foreign = *it;
|
|
|
|
if (foreign->referenced_index != index) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ut_ad(indexed_table == foreign->referenced_table);
|
|
|
|
|
|
|
|
if (NULL == dict_foreign_find_index(
|
|
|
|
indexed_table, col_names,
|
|
|
|
foreign->referenced_col_names,
|
|
|
|
foreign->n_fields, index,
|
|
|
|
/*check_charsets=*/TRUE,
|
2015-08-05 00:02:46 +02:00
|
|
|
/*check_null=*/FALSE,
|
|
|
|
NULL, NULL, NULL)
|
2015-08-03 13:03:47 +02:00
|
|
|
&& NULL == innobase_find_equiv_index(
|
|
|
|
foreign->referenced_col_names,
|
|
|
|
foreign->n_fields,
|
|
|
|
ha_alter_info->key_info_buffer,
|
|
|
|
ha_alter_info->index_add_buffer,
|
|
|
|
ha_alter_info->index_add_count)) {
|
|
|
|
|
|
|
|
/* Index cannot be dropped. */
|
|
|
|
trx->error_info = index;
|
|
|
|
return(true);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
2015-08-03 13:03:47 +02:00
|
|
|
fks = &indexed_table->foreign_set;
|
|
|
|
|
|
|
|
/* Check for all FK references in current table using the index. */
|
|
|
|
for (dict_foreign_set::const_iterator it = fks->begin();
|
|
|
|
it != fks->end(); ++it) {
|
|
|
|
|
|
|
|
dict_foreign_t* foreign = *it;
|
|
|
|
if (foreign->foreign_index != index) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(indexed_table == foreign->foreign_table);
|
|
|
|
|
|
|
|
if (!innobase_dropping_foreign(
|
|
|
|
foreign, drop_fk, n_drop_fk)
|
|
|
|
&& NULL == dict_foreign_find_index(
|
|
|
|
indexed_table, col_names,
|
|
|
|
foreign->foreign_col_names,
|
|
|
|
foreign->n_fields, index,
|
|
|
|
/*check_charsets=*/TRUE,
|
2015-08-05 00:02:46 +02:00
|
|
|
/*check_null=*/FALSE,
|
|
|
|
NULL, NULL, NULL)
|
2015-08-03 13:03:47 +02:00
|
|
|
&& NULL == innobase_find_equiv_index(
|
|
|
|
foreign->foreign_col_names,
|
|
|
|
foreign->n_fields,
|
|
|
|
ha_alter_info->key_info_buffer,
|
|
|
|
ha_alter_info->index_add_buffer,
|
|
|
|
ha_alter_info->index_add_count)) {
|
|
|
|
|
|
|
|
/* Index cannot be dropped. */
|
|
|
|
trx->error_info = index;
|
|
|
|
return(true);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Allows InnoDB to update internal structures with concurrent
|
|
|
|
writes blocked (provided that check_if_supported_inplace_alter()
|
|
|
|
did not return HA_ALTER_INPLACE_NO_LOCK).
|
|
|
|
This will be invoked before inplace_alter_table().
|
|
|
|
|
|
|
|
@param altered_table TABLE object for new version of table.
|
|
|
|
@param ha_alter_info Structure describing changes to be done
|
|
|
|
by ALTER TABLE and holding data used during in-place alter.
|
|
|
|
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
|
|
|
UNIV_INTERN
|
|
|
|
bool
|
|
|
|
ha_innobase::prepare_inplace_alter_table(
|
|
|
|
/*=====================================*/
|
|
|
|
TABLE* altered_table,
|
|
|
|
Alter_inplace_info* ha_alter_info)
|
|
|
|
{
|
|
|
|
dict_index_t** drop_index; /*!< Index to be dropped */
|
|
|
|
ulint n_drop_index; /*!< Number of indexes to drop */
|
|
|
|
dict_foreign_t**drop_fk; /*!< Foreign key constraints to drop */
|
|
|
|
ulint n_drop_fk; /*!< Number of foreign keys to drop */
|
|
|
|
dict_foreign_t**add_fk = NULL; /*!< Foreign key constraints to drop */
|
|
|
|
ulint n_add_fk; /*!< Number of foreign keys to drop */
|
|
|
|
dict_table_t* indexed_table; /*!< Table where indexes are created */
|
|
|
|
mem_heap_t* heap;
|
2014-02-01 09:33:26 +01:00
|
|
|
const char** col_names;
|
2013-03-25 23:03:13 +01:00
|
|
|
int error;
|
|
|
|
ulint flags;
|
|
|
|
ulint flags2;
|
|
|
|
ulint max_col_len;
|
|
|
|
ulint add_autoinc_col_no = ULINT_UNDEFINED;
|
|
|
|
ulonglong autoinc_col_max_value = 0;
|
|
|
|
ulint fts_doc_col_no = ULINT_UNDEFINED;
|
|
|
|
bool add_fts_doc_id = false;
|
|
|
|
bool add_fts_doc_id_idx = false;
|
2014-05-05 18:20:28 +02:00
|
|
|
bool add_fts_idx = false;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("prepare_inplace_alter_table");
|
|
|
|
DBUG_ASSERT(!ha_alter_info->handler_ctx);
|
|
|
|
DBUG_ASSERT(ha_alter_info->create_info);
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!srv_read_only_mode);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
MONITOR_ATOMIC_INC(MONITOR_PENDING_ALTER_TABLE);
|
|
|
|
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(prebuilt->table);
|
|
|
|
index;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
|
|
|
ut_ad(!index->to_be_dropped);
|
|
|
|
}
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
|
|
|
|
ut_d(mutex_enter(&dict_sys->mutex));
|
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
prebuilt->table, CHECK_ABORTED_OK));
|
|
|
|
ut_d(mutex_exit(&dict_sys->mutex));
|
|
|
|
|
|
|
|
if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
|
|
|
|
/* Nothing to do */
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::CHANGE_CREATE_OPTION) {
|
|
|
|
if (const char* invalid_opt = create_options_are_invalid(
|
|
|
|
user_thd, altered_table,
|
|
|
|
ha_alter_info->create_info,
|
|
|
|
prebuilt->table->space != 0)) {
|
|
|
|
my_error(ER_ILLEGAL_HA_CREATE_OPTION, MYF(0),
|
|
|
|
table_type(), invalid_opt);
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check if any index name is reserved. */
|
|
|
|
if (innobase_index_name_is_reserved(
|
|
|
|
user_thd,
|
|
|
|
ha_alter_info->key_info_buffer,
|
|
|
|
ha_alter_info->key_count)) {
|
|
|
|
err_exit_no_heap:
|
|
|
|
DBUG_ASSERT(prebuilt->trx->dict_operation_lock_mode == 0);
|
|
|
|
if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
|
|
|
|
online_retry_drop_indexes(prebuilt->table, user_thd);
|
|
|
|
}
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
indexed_table = prebuilt->table;
|
|
|
|
|
|
|
|
/* Check that index keys are sensible */
|
|
|
|
error = innobase_check_index_keys(ha_alter_info, indexed_table);
|
|
|
|
|
|
|
|
if (error) {
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prohibit renaming a column to something that the table
|
|
|
|
already contains. */
|
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME) {
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
|
|
|
|
for (Field** fp = table->field; *fp; fp++) {
|
|
|
|
if (!((*fp)->flags & FIELD_IS_RENAMED)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* name = 0;
|
|
|
|
|
|
|
|
cf_it.rewind();
|
|
|
|
while (Create_field* cf = cf_it++) {
|
|
|
|
if (cf->field == *fp) {
|
|
|
|
name = cf->field_name;
|
|
|
|
goto check_if_ok_to_rename;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_error;
|
|
|
|
check_if_ok_to_rename:
|
|
|
|
/* Prohibit renaming a column from FTS_DOC_ID
|
|
|
|
if full-text indexes exist. */
|
|
|
|
if (!my_strcasecmp(system_charset_info,
|
|
|
|
(*fp)->field_name,
|
|
|
|
FTS_DOC_ID_COL_NAME)
|
2014-02-01 09:33:26 +01:00
|
|
|
&& innobase_fulltext_exist(altered_table)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
my_error(ER_INNODB_FT_WRONG_DOCID_COLUMN,
|
|
|
|
MYF(0), name);
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Prohibit renaming a column to an internal column. */
|
|
|
|
const char* s = prebuilt->table->col_names;
|
|
|
|
unsigned j;
|
|
|
|
/* Skip user columns.
|
|
|
|
MySQL should have checked these already.
|
|
|
|
We want to allow renaming of c1 to c2, c2 to c1. */
|
|
|
|
for (j = 0; j < table->s->fields; j++) {
|
|
|
|
s += strlen(s) + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; j < prebuilt->table->n_def; j++) {
|
|
|
|
if (!my_strcasecmp(
|
|
|
|
system_charset_info, name, s)) {
|
|
|
|
my_error(ER_WRONG_COLUMN_NAME, MYF(0),
|
|
|
|
s);
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
|
|
|
s += strlen(s) + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!innobase_table_flags(altered_table,
|
|
|
|
ha_alter_info->create_info,
|
|
|
|
user_thd,
|
|
|
|
srv_file_per_table
|
|
|
|
|| indexed_table->space != 0,
|
|
|
|
&flags, &flags2)) {
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
|
|
|
max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(flags);
|
|
|
|
|
|
|
|
/* Check each index's column length to make sure they do not
|
|
|
|
exceed limit */
|
|
|
|
for (ulint i = 0; i < ha_alter_info->index_add_count; i++) {
|
|
|
|
const KEY* key = &ha_alter_info->key_info_buffer[
|
|
|
|
ha_alter_info->index_add_buffer[i]];
|
|
|
|
|
|
|
|
if (key->flags & HA_FULLTEXT) {
|
|
|
|
/* The column length does not matter for
|
|
|
|
fulltext search indexes. But, UNIQUE
|
|
|
|
fulltext indexes are not supported. */
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_NOSAME));
|
|
|
|
DBUG_ASSERT(!(key->flags & HA_KEYFLAG_MASK
|
|
|
|
& ~(HA_FULLTEXT
|
|
|
|
| HA_PACK_KEY
|
|
|
|
| HA_BINARY_PACK_KEY)));
|
2014-05-05 18:20:28 +02:00
|
|
|
add_fts_idx = true;
|
2013-03-25 23:03:13 +01:00
|
|
|
continue;
|
|
|
|
}
|
2009-05-25 08:46:10 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (innobase_check_column_length(max_col_len, key)) {
|
|
|
|
my_error(ER_INDEX_COLUMN_TOO_LONG, MYF(0),
|
|
|
|
max_col_len);
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-05-05 18:20:28 +02:00
|
|
|
/* We won't be allowed to add fts index to a table with
|
|
|
|
fts indexes already but without AUX_HEX_NAME set.
|
|
|
|
This means the aux tables of the table failed to
|
|
|
|
rename to hex format but new created aux tables
|
2015-01-19 00:11:05 +01:00
|
|
|
shall be in hex format, which is contradictory. */
|
2014-05-05 18:20:28 +02:00
|
|
|
if (!DICT_TF2_FLAG_IS_SET(indexed_table, DICT_TF2_FTS_AUX_HEX_NAME)
|
|
|
|
&& indexed_table->fts != NULL && add_fts_idx) {
|
|
|
|
my_error(ER_INNODB_FT_AUX_NOT_HEX_ID, MYF(0));
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Check existing index definitions for too-long column
|
|
|
|
prefixes as well, in case max_col_len shrunk. */
|
|
|
|
for (const dict_index_t* index
|
|
|
|
= dict_table_get_first_index(indexed_table);
|
|
|
|
index;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
|
|
|
if (index->type & DICT_FTS) {
|
|
|
|
DBUG_ASSERT(index->type == DICT_FTS
|
|
|
|
|| (index->type & DICT_CORRUPT));
|
2015-08-03 13:03:47 +02:00
|
|
|
|
|
|
|
/* We need to drop any corrupted fts indexes
|
|
|
|
before we add a new fts index. */
|
|
|
|
if (add_fts_idx && index->type & DICT_CORRUPT) {
|
|
|
|
ib_errf(user_thd, IB_LOG_LEVEL_ERROR,
|
|
|
|
ER_INNODB_INDEX_CORRUPT,
|
|
|
|
"Fulltext index '%s' is corrupt. "
|
|
|
|
"you should drop this index first.",
|
|
|
|
index->name);
|
|
|
|
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
continue;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
|
|
|
|
const dict_field_t* field
|
|
|
|
= dict_index_get_nth_field(index, i);
|
|
|
|
if (field->prefix_len > max_col_len) {
|
|
|
|
my_error(ER_INDEX_COLUMN_TOO_LONG, MYF(0),
|
|
|
|
max_col_len);
|
|
|
|
goto err_exit_no_heap;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
n_drop_index = 0;
|
|
|
|
n_drop_fk = 0;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& (INNOBASE_ALTER_NOREBUILD | INNOBASE_ALTER_REBUILD)) {
|
|
|
|
heap = mem_heap_create(1024);
|
|
|
|
|
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME) {
|
|
|
|
col_names = innobase_get_col_names(
|
2014-05-05 18:20:28 +02:00
|
|
|
ha_alter_info, altered_table, table,
|
|
|
|
indexed_table, heap);
|
2014-02-01 09:33:26 +01:00
|
|
|
} else {
|
|
|
|
col_names = NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
heap = NULL;
|
|
|
|
col_names = NULL;
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::DROP_FOREIGN_KEY) {
|
|
|
|
DBUG_ASSERT(ha_alter_info->alter_info->drop_list.elements > 0);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
drop_fk = static_cast<dict_foreign_t**>(
|
|
|
|
mem_heap_alloc(
|
|
|
|
heap,
|
|
|
|
ha_alter_info->alter_info->drop_list.elements
|
|
|
|
* sizeof(dict_foreign_t*)));
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
List_iterator<Alter_drop> drop_it(
|
|
|
|
ha_alter_info->alter_info->drop_list);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
while (Alter_drop* drop = drop_it++) {
|
|
|
|
if (drop->type != Alter_drop::FOREIGN_KEY) {
|
|
|
|
continue;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-09-11 10:13:35 +02:00
|
|
|
for (dict_foreign_set::iterator it
|
|
|
|
= prebuilt->table->foreign_set.begin();
|
|
|
|
it != prebuilt->table->foreign_set.end();
|
|
|
|
++it) {
|
|
|
|
|
|
|
|
dict_foreign_t* foreign = *it;
|
2013-03-25 23:03:13 +01:00
|
|
|
const char* fid = strchr(foreign->id, '/');
|
|
|
|
|
|
|
|
DBUG_ASSERT(fid);
|
|
|
|
/* If no database/ prefix was present in
|
|
|
|
the FOREIGN KEY constraint name, compare
|
|
|
|
to the full constraint name. */
|
|
|
|
fid = fid ? fid + 1 : foreign->id;
|
|
|
|
|
|
|
|
if (!my_strcasecmp(system_charset_info,
|
|
|
|
fid, drop->name)) {
|
|
|
|
drop_fk[n_drop_fk++] = foreign;
|
|
|
|
goto found_fk;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
my_error(ER_CANT_DROP_FIELD_OR_KEY, MYF(0),
|
|
|
|
drop->name);
|
|
|
|
goto err_exit;
|
|
|
|
found_fk:
|
|
|
|
continue;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(n_drop_fk > 0);
|
|
|
|
DBUG_ASSERT(n_drop_fk
|
|
|
|
== ha_alter_info->alter_info->drop_list.elements);
|
|
|
|
} else {
|
|
|
|
drop_fk = NULL;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ha_alter_info->index_drop_count) {
|
|
|
|
dict_index_t* drop_primary = NULL;
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(ha_alter_info->handler_flags
|
|
|
|
& (Alter_inplace_info::DROP_INDEX
|
|
|
|
| Alter_inplace_info::DROP_UNIQUE_INDEX
|
|
|
|
| Alter_inplace_info::DROP_PK_INDEX));
|
|
|
|
/* Check which indexes to drop. */
|
|
|
|
drop_index = static_cast<dict_index_t**>(
|
|
|
|
mem_heap_alloc(
|
|
|
|
heap, (ha_alter_info->index_drop_count + 1)
|
|
|
|
* sizeof *drop_index));
|
|
|
|
|
|
|
|
for (uint i = 0; i < ha_alter_info->index_drop_count; i++) {
|
|
|
|
const KEY* key
|
|
|
|
= ha_alter_info->index_drop_buffer[i];
|
|
|
|
dict_index_t* index
|
|
|
|
= dict_table_get_index_on_name_and_min_id(
|
|
|
|
indexed_table, key->name);
|
|
|
|
|
|
|
|
if (!index) {
|
2012-08-01 16:27:34 +02:00
|
|
|
push_warning_printf(
|
2013-03-25 23:03:13 +01:00
|
|
|
user_thd,
|
2012-08-01 16:27:34 +02:00
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
2013-03-25 23:03:13 +01:00
|
|
|
HA_ERR_WRONG_INDEX,
|
|
|
|
"InnoDB could not find key "
|
|
|
|
"with name %s", key->name);
|
|
|
|
} else {
|
|
|
|
ut_ad(!index->to_be_dropped);
|
|
|
|
if (!dict_index_is_clust(index)) {
|
|
|
|
drop_index[n_drop_index++] = index;
|
|
|
|
} else {
|
|
|
|
drop_primary = index;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* If all FULLTEXT indexes were removed, drop an
|
|
|
|
internal FTS_DOC_ID_INDEX as well, unless it exists in
|
|
|
|
the table. */
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (innobase_fulltext_exist(table)
|
|
|
|
&& !innobase_fulltext_exist(altered_table)
|
2013-03-25 23:03:13 +01:00
|
|
|
&& !DICT_TF2_FLAG_IS_SET(
|
|
|
|
indexed_table, DICT_TF2_FTS_HAS_DOC_ID)) {
|
|
|
|
dict_index_t* fts_doc_index
|
|
|
|
= dict_table_get_index_on_name(
|
|
|
|
indexed_table, FTS_DOC_ID_INDEX_NAME);
|
|
|
|
|
|
|
|
// Add some fault tolerance for non-debug builds.
|
|
|
|
if (fts_doc_index == NULL) {
|
|
|
|
goto check_if_can_drop_indexes;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(!fts_doc_index->to_be_dropped);
|
|
|
|
|
|
|
|
for (uint i = 0; i < table->s->keys; i++) {
|
|
|
|
if (!my_strcasecmp(
|
|
|
|
system_charset_info,
|
|
|
|
FTS_DOC_ID_INDEX_NAME,
|
2014-02-01 09:33:26 +01:00
|
|
|
table->key_info[i].name)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
/* The index exists in the MySQL
|
|
|
|
data dictionary. Do not drop it,
|
|
|
|
even though it is no longer needed
|
|
|
|
by InnoDB fulltext search. */
|
|
|
|
goto check_if_can_drop_indexes;
|
|
|
|
}
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
drop_index[n_drop_index++] = fts_doc_index;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
check_if_can_drop_indexes:
|
|
|
|
/* Check if the indexes can be dropped. */
|
|
|
|
|
|
|
|
/* Prevent a race condition between DROP INDEX and
|
|
|
|
CREATE TABLE adding FOREIGN KEY constraints. */
|
|
|
|
row_mysql_lock_data_dictionary(prebuilt->trx);
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!n_drop_index) {
|
|
|
|
drop_index = NULL;
|
|
|
|
} else {
|
|
|
|
/* Flag all indexes that are to be dropped. */
|
|
|
|
for (ulint i = 0; i < n_drop_index; i++) {
|
|
|
|
ut_ad(!drop_index[i]->to_be_dropped);
|
|
|
|
drop_index[i]->to_be_dropped = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (prebuilt->trx->check_foreigns) {
|
|
|
|
for (uint i = 0; i < n_drop_index; i++) {
|
|
|
|
dict_index_t* index = drop_index[i];
|
|
|
|
|
|
|
|
if (innobase_check_foreign_key_index(
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_alter_info, index,
|
|
|
|
indexed_table, col_names,
|
2013-03-25 23:03:13 +01:00
|
|
|
prebuilt->trx, drop_fk, n_drop_fk)) {
|
|
|
|
row_mysql_unlock_data_dictionary(
|
|
|
|
prebuilt->trx);
|
|
|
|
prebuilt->trx->error_info = index;
|
|
|
|
print_error(HA_ERR_DROP_INDEX_FK,
|
|
|
|
MYF(0));
|
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* If a primary index is dropped, need to check
|
|
|
|
any depending foreign constraints get affected */
|
|
|
|
if (drop_primary
|
|
|
|
&& innobase_check_foreign_key_index(
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_alter_info, drop_primary,
|
|
|
|
indexed_table, col_names,
|
2013-03-25 23:03:13 +01:00
|
|
|
prebuilt->trx, drop_fk, n_drop_fk)) {
|
|
|
|
row_mysql_unlock_data_dictionary(prebuilt->trx);
|
|
|
|
print_error(HA_ERR_DROP_INDEX_FK, MYF(0));
|
|
|
|
goto err_exit;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_unlock_data_dictionary(prebuilt->trx);
|
|
|
|
} else {
|
|
|
|
drop_index = NULL;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2016-06-21 14:11:02 +02:00
|
|
|
/* Check if any of the existing indexes are marked as corruption
|
|
|
|
and if they are, refuse adding more indexes. */
|
|
|
|
if (ha_alter_info->handler_flags & Alter_inplace_info::ADD_INDEX) {
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(indexed_table);
|
|
|
|
index != NULL; index = dict_table_get_next_index(index)) {
|
|
|
|
|
|
|
|
if (!index->to_be_dropped && dict_index_is_corrupted(index)) {
|
|
|
|
char index_name[MAX_FULL_NAME_LEN + 1];
|
|
|
|
|
|
|
|
innobase_format_name(index_name, sizeof index_name,
|
|
|
|
index->name, TRUE);
|
|
|
|
|
|
|
|
my_error(ER_INDEX_CORRUPT, MYF(0), index_name);
|
2017-01-05 19:13:34 +01:00
|
|
|
goto err_exit;
|
2016-06-21 14:11:02 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
n_add_fk = 0;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_FOREIGN_KEY) {
|
|
|
|
ut_ad(!prebuilt->trx->check_foreigns);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fk = static_cast<dict_foreign_t**>(
|
|
|
|
mem_heap_zalloc(
|
|
|
|
heap,
|
|
|
|
ha_alter_info->alter_info->key_list.elements
|
|
|
|
* sizeof(dict_foreign_t*)));
|
|
|
|
|
|
|
|
if (!innobase_get_foreign_key_info(
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_alter_info, table_share,
|
|
|
|
prebuilt->table, col_names,
|
|
|
|
drop_index, n_drop_index,
|
|
|
|
add_fk, &n_add_fk, prebuilt->trx)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
err_exit:
|
|
|
|
if (n_drop_index) {
|
|
|
|
row_mysql_lock_data_dictionary(prebuilt->trx);
|
|
|
|
|
|
|
|
/* Clear the to_be_dropped flags, which might
|
|
|
|
have been set at this point. */
|
|
|
|
for (ulint i = 0; i < n_drop_index; i++) {
|
|
|
|
DBUG_ASSERT(*drop_index[i]->name
|
|
|
|
!= TEMP_INDEX_PREFIX);
|
|
|
|
drop_index[i]->to_be_dropped = 0;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_unlock_data_dictionary(prebuilt->trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (heap) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
goto err_exit_no_heap;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA)
|
2016-09-27 17:56:00 +02:00
|
|
|
|| ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)
|
2014-02-01 09:33:26 +01:00
|
|
|
== Alter_inplace_info::CHANGE_CREATE_OPTION
|
2016-02-15 13:43:42 +01:00
|
|
|
&& !innobase_need_rebuild(ha_alter_info, table))) {
|
2014-02-01 09:33:26 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (heap) {
|
|
|
|
ha_alter_info->handler_ctx
|
|
|
|
= new ha_innobase_inplace_ctx(
|
2014-02-01 09:33:26 +01:00
|
|
|
prebuilt,
|
2013-03-25 23:03:13 +01:00
|
|
|
drop_index, n_drop_index,
|
|
|
|
drop_fk, n_drop_fk,
|
|
|
|
add_fk, n_add_fk,
|
|
|
|
ha_alter_info->online,
|
2014-02-01 09:33:26 +01:00
|
|
|
heap, indexed_table,
|
|
|
|
col_names, ULINT_UNDEFINED, 0, 0);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
func_exit:
|
|
|
|
DBUG_ASSERT(prebuilt->trx->dict_operation_lock_mode == 0);
|
|
|
|
if (ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE) {
|
|
|
|
online_retry_drop_indexes(prebuilt->table, user_thd);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_RETURN(false);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* If we are to build a full-text search index, check whether
|
|
|
|
the table already has a DOC ID column. If not, we will need to
|
|
|
|
add a Doc ID hidden column and rebuild the primary index */
|
2014-02-01 09:33:26 +01:00
|
|
|
if (innobase_fulltext_exist(altered_table)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
ulint doc_col_no;
|
|
|
|
|
|
|
|
if (!innobase_fts_check_doc_id_col(
|
|
|
|
prebuilt->table, altered_table, &fts_doc_col_no)) {
|
2013-07-31 15:41:29 +02:00
|
|
|
fts_doc_col_no = altered_table->s->stored_fields;
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fts_doc_id = true;
|
|
|
|
add_fts_doc_id_idx = true;
|
|
|
|
|
|
|
|
push_warning_printf(
|
|
|
|
user_thd,
|
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
|
|
|
HA_ERR_WRONG_INDEX,
|
|
|
|
"InnoDB rebuilding table to add column "
|
|
|
|
FTS_DOC_ID_COL_NAME);
|
|
|
|
} else if (fts_doc_col_no == ULINT_UNDEFINED) {
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
switch (innobase_fts_check_doc_id_index(
|
|
|
|
prebuilt->table, altered_table, &doc_col_no)) {
|
2012-08-01 16:27:34 +02:00
|
|
|
case FTS_NOT_EXIST_DOC_ID_INDEX:
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fts_doc_id_idx = true;
|
2012-08-01 16:27:34 +02:00
|
|
|
break;
|
|
|
|
case FTS_INCORRECT_DOC_ID_INDEX:
|
2013-03-25 23:03:13 +01:00
|
|
|
my_error(ER_INNODB_FT_WRONG_DOCID_INDEX, MYF(0),
|
|
|
|
FTS_DOC_ID_INDEX_NAME);
|
|
|
|
goto err_exit;
|
|
|
|
case FTS_EXIST_DOC_ID_INDEX:
|
|
|
|
DBUG_ASSERT(doc_col_no == fts_doc_col_no
|
|
|
|
|| doc_col_no == ULINT_UNDEFINED
|
|
|
|
|| (ha_alter_info->handler_flags
|
|
|
|
& (Alter_inplace_info::ALTER_COLUMN_ORDER
|
|
|
|
| Alter_inplace_info::DROP_COLUMN
|
|
|
|
| Alter_inplace_info::ADD_COLUMN)));
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* See if an AUTO_INCREMENT column was added. */
|
2013-07-31 15:41:29 +02:00
|
|
|
uint i = 0, innodb_idx= 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
while (const Create_field* new_field = cf_it++) {
|
|
|
|
const Field* field;
|
2013-07-31 15:41:29 +02:00
|
|
|
if (!new_field->stored_in_db) {
|
|
|
|
i++;
|
|
|
|
continue;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(i < altered_table->s->fields);
|
2013-07-31 15:41:29 +02:00
|
|
|
DBUG_ASSERT(innodb_idx < altered_table->s->stored_fields);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
for (uint old_i = 0; table->field[old_i]; old_i++) {
|
2013-07-31 15:41:29 +02:00
|
|
|
if (!table->field[old_i]->stored_in_db)
|
|
|
|
continue;
|
2013-03-25 23:03:13 +01:00
|
|
|
if (new_field->field == table->field[old_i]) {
|
|
|
|
goto found_col;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* This is an added column. */
|
|
|
|
DBUG_ASSERT(!new_field->field);
|
|
|
|
DBUG_ASSERT(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_COLUMN);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
field = altered_table->field[i];
|
2011-05-31 11:12:32 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT((MTYP_TYPENR(field->unireg_check)
|
|
|
|
== Field::NEXT_NUMBER)
|
|
|
|
== !!(field->flags & AUTO_INCREMENT_FLAG));
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (field->flags & AUTO_INCREMENT_FLAG) {
|
|
|
|
if (add_autoinc_col_no != ULINT_UNDEFINED) {
|
|
|
|
/* This should have been blocked earlier. */
|
|
|
|
ut_ad(0);
|
|
|
|
my_error(ER_WRONG_AUTO_KEY, MYF(0));
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2013-07-31 15:41:29 +02:00
|
|
|
add_autoinc_col_no = innodb_idx;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
autoinc_col_max_value = innobase_get_int_col_max_value(
|
|
|
|
field);
|
2011-05-31 11:12:32 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
found_col:
|
|
|
|
i++;
|
2013-07-31 15:41:29 +02:00
|
|
|
innodb_idx++;
|
2011-05-31 11:12:32 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(heap);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(user_thd == prebuilt->trx->mysql_thd);
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!ha_alter_info->handler_ctx);
|
|
|
|
|
|
|
|
ha_alter_info->handler_ctx = new ha_innobase_inplace_ctx(
|
|
|
|
prebuilt,
|
|
|
|
drop_index, n_drop_index,
|
|
|
|
drop_fk, n_drop_fk, add_fk, n_add_fk,
|
|
|
|
ha_alter_info->online,
|
|
|
|
heap, prebuilt->table, col_names,
|
|
|
|
add_autoinc_col_no,
|
|
|
|
ha_alter_info->create_info->auto_increment_value,
|
|
|
|
autoinc_col_max_value);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_RETURN(prepare_inplace_alter_table_dict(
|
|
|
|
ha_alter_info, altered_table, table,
|
|
|
|
table_share->table_name.str,
|
|
|
|
flags, flags2,
|
2014-02-01 09:33:26 +01:00
|
|
|
fts_doc_col_no, add_fts_doc_id,
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fts_doc_id_idx));
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2017-01-07 13:24:42 +01:00
|
|
|
/** Get the name of an erroneous key.
|
|
|
|
@param[in] error_key_num InnoDB number of the erroneus key
|
|
|
|
@param[in] ha_alter_info changes that were being performed
|
|
|
|
@param[in] table InnoDB table
|
|
|
|
@return the name of the erroneous key */
|
|
|
|
static
|
|
|
|
const char*
|
|
|
|
get_error_key_name(
|
|
|
|
ulint error_key_num,
|
|
|
|
const Alter_inplace_info* ha_alter_info,
|
|
|
|
const dict_table_t* table)
|
|
|
|
{
|
|
|
|
if (error_key_num == ULINT_UNDEFINED) {
|
|
|
|
return(FTS_DOC_ID_INDEX_NAME);
|
|
|
|
} else if (ha_alter_info->key_count == 0) {
|
|
|
|
return(dict_table_get_first_index(table)->name);
|
|
|
|
} else {
|
|
|
|
return(ha_alter_info->key_info_buffer[error_key_num].name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Alter the table structure in-place with operations
|
|
|
|
specified using Alter_inplace_info.
|
|
|
|
The level of concurrency allowed during this operation depends
|
|
|
|
on the return value from check_if_supported_inplace_alter().
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
@param altered_table TABLE object for new version of table.
|
|
|
|
@param ha_alter_info Structure describing changes to be done
|
|
|
|
by ALTER TABLE and holding data used during in-place alter.
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
|
|
|
UNIV_INTERN
|
|
|
|
bool
|
|
|
|
ha_innobase::inplace_alter_table(
|
|
|
|
/*=============================*/
|
|
|
|
TABLE* altered_table,
|
|
|
|
Alter_inplace_info* ha_alter_info)
|
2011-06-01 10:06:55 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
dberr_t error;
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ENTER("inplace_alter_table");
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!srv_read_only_mode);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(!rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
|
|
|
|
ut_ad(!rw_lock_own(&dict_operation_lock, RW_LOCK_SHARED));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DEBUG_SYNC(user_thd, "innodb_inplace_alter_table_enter");
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!(ha_alter_info->handler_flags & INNOBASE_ALTER_DATA)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
ok_exit:
|
|
|
|
DEBUG_SYNC(user_thd, "innodb_after_inplace_alter_table");
|
|
|
|
DBUG_RETURN(false);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2016-09-27 17:56:00 +02:00
|
|
|
if ((ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)
|
2013-03-25 23:03:13 +01:00
|
|
|
== Alter_inplace_info::CHANGE_CREATE_OPTION
|
2016-02-15 13:43:42 +01:00
|
|
|
&& !innobase_need_rebuild(ha_alter_info, table)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
goto ok_exit;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(ha_alter_info->handler_ctx);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(ctx);
|
|
|
|
DBUG_ASSERT(ctx->trx);
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->prebuilt == prebuilt);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (prebuilt->table->ibd_file_missing
|
|
|
|
|| dict_table_is_discarded(prebuilt->table)) {
|
|
|
|
goto all_done;
|
2011-05-31 11:12:32 +02:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Read the clustered index of the table and build
|
|
|
|
indexes based on this information using temporary
|
|
|
|
files and merge sort. */
|
|
|
|
DBUG_EXECUTE_IF("innodb_OOM_inplace_alter",
|
|
|
|
error = DB_OUT_OF_MEMORY; goto oom;);
|
2016-02-16 12:07:18 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
error = row_merge_build_indexes(
|
|
|
|
prebuilt->trx,
|
2014-02-01 09:33:26 +01:00
|
|
|
prebuilt->table, ctx->new_table,
|
2013-03-25 23:03:13 +01:00
|
|
|
ctx->online,
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->add_index, ctx->add_key_numbers, ctx->num_to_add_index,
|
2013-03-25 23:03:13 +01:00
|
|
|
altered_table, ctx->add_cols, ctx->col_map,
|
|
|
|
ctx->add_autoinc, ctx->sequence);
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
oom:
|
|
|
|
#endif /* !DBUG_OFF */
|
2014-02-01 09:33:26 +01:00
|
|
|
if (error == DB_SUCCESS && ctx->online && ctx->need_rebuild()) {
|
2013-03-25 23:03:13 +01:00
|
|
|
DEBUG_SYNC_C("row_log_table_apply1_before");
|
|
|
|
error = row_log_table_apply(
|
|
|
|
ctx->thr, prebuilt->table, altered_table);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DEBUG_SYNC_C("inplace_after_index_build");
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_EXECUTE_IF("create_index_fail",
|
2014-02-26 19:23:04 +01:00
|
|
|
error = DB_DUPLICATE_KEY;
|
|
|
|
prebuilt->trx->error_key_num = ULINT_UNDEFINED;);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* After an error, remove all those index definitions
|
|
|
|
from the dictionary which were defined. */
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
switch (error) {
|
|
|
|
KEY* dup_key;
|
|
|
|
all_done:
|
|
|
|
case DB_SUCCESS:
|
|
|
|
ut_d(mutex_enter(&dict_sys->mutex));
|
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
prebuilt->table, CHECK_PARTIAL_OK));
|
|
|
|
ut_d(mutex_exit(&dict_sys->mutex));
|
|
|
|
/* prebuilt->table->n_ref_count can be anything here,
|
|
|
|
given that we hold at most a shared lock on the table. */
|
|
|
|
goto ok_exit;
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
if (prebuilt->trx->error_key_num == ULINT_UNDEFINED
|
|
|
|
|| ha_alter_info->key_count == 0) {
|
|
|
|
/* This should be the hidden index on
|
|
|
|
FTS_DOC_ID, or there is no PRIMARY KEY in the
|
|
|
|
table. Either way, we should be seeing and
|
|
|
|
reporting a bogus duplicate key error. */
|
|
|
|
dup_key = NULL;
|
|
|
|
} else {
|
|
|
|
DBUG_ASSERT(prebuilt->trx->error_key_num
|
|
|
|
< ha_alter_info->key_count);
|
|
|
|
dup_key = &ha_alter_info->key_info_buffer[
|
|
|
|
prebuilt->trx->error_key_num];
|
|
|
|
}
|
|
|
|
print_keydup_error(altered_table, dup_key, MYF(0));
|
|
|
|
break;
|
|
|
|
case DB_ONLINE_LOG_TOO_BIG:
|
|
|
|
DBUG_ASSERT(ctx->online);
|
|
|
|
my_error(ER_INNODB_ONLINE_LOG_TOO_BIG, MYF(0),
|
2017-01-07 13:24:42 +01:00
|
|
|
get_error_key_name(prebuilt->trx->error_key_num,
|
|
|
|
ha_alter_info, prebuilt->table));
|
2013-03-25 23:03:13 +01:00
|
|
|
break;
|
|
|
|
case DB_INDEX_CORRUPT:
|
|
|
|
my_error(ER_INDEX_CORRUPT, MYF(0),
|
2017-01-07 13:24:42 +01:00
|
|
|
get_error_key_name(prebuilt->trx->error_key_num,
|
|
|
|
ha_alter_info, prebuilt->table));
|
2013-03-25 23:03:13 +01:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
my_error_innodb(error,
|
|
|
|
table_share->table_name.str,
|
|
|
|
prebuilt->table->flags);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* prebuilt->table->n_ref_count can be anything here, given
|
|
|
|
that we hold at most a shared lock on the table. */
|
|
|
|
prebuilt->trx->error_info = NULL;
|
|
|
|
ctx->trx->error_state = DB_SUCCESS;
|
|
|
|
|
|
|
|
DBUG_RETURN(true);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Free the modification log for online table rebuild.
|
|
|
|
@param table table that was being rebuilt online */
|
2012-08-01 16:27:34 +02:00
|
|
|
static
|
|
|
|
void
|
2013-03-25 23:03:13 +01:00
|
|
|
innobase_online_rebuild_log_free(
|
|
|
|
/*=============================*/
|
|
|
|
dict_table_t* table)
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
dict_index_t* clust_index = dict_table_get_first_index(table);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
rw_lock_x_lock(&clust_index->lock);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (clust_index->online_log) {
|
|
|
|
ut_ad(dict_index_get_online_status(clust_index)
|
|
|
|
== ONLINE_INDEX_CREATION);
|
|
|
|
clust_index->online_status = ONLINE_INDEX_COMPLETE;
|
|
|
|
row_log_free(clust_index->online_log);
|
|
|
|
DEBUG_SYNC_C("innodb_online_rebuild_log_free_aborted");
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(dict_index_get_online_status(clust_index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
rw_lock_x_unlock(&clust_index->lock);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Rollback a secondary index creation, drop the indexes with
|
|
|
|
temparary index prefix
|
2014-02-01 09:33:26 +01:00
|
|
|
@param user_table InnoDB table
|
|
|
|
@param table the TABLE
|
|
|
|
@param locked TRUE=table locked, FALSE=may need to do a lazy drop
|
2013-03-25 23:03:13 +01:00
|
|
|
@param trx the transaction
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
|
|
|
innobase_rollback_sec_index(
|
|
|
|
/*========================*/
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_t* user_table,
|
|
|
|
const TABLE* table,
|
|
|
|
ibool locked,
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_t* trx)
|
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
row_merge_drop_indexes(trx, user_table, locked);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
/* Free the table->fts only if there is no FTS_DOC_ID
|
|
|
|
in the table */
|
2014-02-01 09:33:26 +01:00
|
|
|
if (user_table->fts
|
|
|
|
&& !DICT_TF2_FLAG_IS_SET(user_table,
|
2013-03-25 23:03:13 +01:00
|
|
|
DICT_TF2_FTS_HAS_DOC_ID)
|
2014-02-01 09:33:26 +01:00
|
|
|
&& !innobase_fulltext_exist(table)) {
|
|
|
|
fts_free(user_table);
|
2011-04-11 15:40:28 +02:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Roll back the changes made during prepare_inplace_alter_table()
|
|
|
|
and inplace_alter_table() inside the storage engine. Note that the
|
|
|
|
allowed level of concurrency during this operation will be the same as
|
|
|
|
for inplace_alter_table() and thus might be higher than during
|
|
|
|
prepare_inplace_alter_table(). (E.g concurrent writes were blocked
|
|
|
|
during prepare, but might not be during commit).
|
|
|
|
|
|
|
|
@param ha_alter_info Data used during in-place alter.
|
2014-02-01 09:33:26 +01:00
|
|
|
@param table the TABLE
|
2013-03-25 23:03:13 +01:00
|
|
|
@param prebuilt the prebuilt struct
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
|
|
|
rollback_inplace_alter_table(
|
|
|
|
/*=========================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
2014-02-01 09:33:26 +01:00
|
|
|
const TABLE* table,
|
2013-03-25 23:03:13 +01:00
|
|
|
row_prebuilt_t* prebuilt)
|
2007-09-13 11:31:54 +02:00
|
|
|
{
|
2013-03-25 23:03:13 +01:00
|
|
|
bool fail = false;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(ha_alter_info->handler_ctx);
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 11:15:07 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ENTER("rollback_inplace_alter_table");
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!ctx || !ctx->trx) {
|
|
|
|
/* If we have not started a transaction yet,
|
|
|
|
(almost) nothing has been or needs to be done. */
|
|
|
|
goto func_exit;
|
2012-05-16 11:53:56 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_lock_data_dictionary(ctx->trx);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->need_rebuild()) {
|
2013-03-25 23:03:13 +01:00
|
|
|
dberr_t err;
|
2014-02-01 09:33:26 +01:00
|
|
|
ulint flags = ctx->new_table->flags;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* DML threads can access ctx->new_table via the
|
2013-03-25 23:03:13 +01:00
|
|
|
online rebuild log. Free it first. */
|
|
|
|
innobase_online_rebuild_log_free(prebuilt->table);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Since the FTS index specific auxiliary tables has
|
|
|
|
not yet registered with "table->fts" by fts_add_index(),
|
|
|
|
we will need explicitly delete them here */
|
2014-02-01 09:33:26 +01:00
|
|
|
if (DICT_TF2_FLAG_IS_SET(ctx->new_table, DICT_TF2_FTS)) {
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
err = innobase_drop_fts_index_table(
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->new_table, ctx->trx);
|
2011-05-31 11:12:32 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
my_error_innodb(
|
2014-02-01 09:33:26 +01:00
|
|
|
err, table->s->table_name.str,
|
2013-03-25 23:03:13 +01:00
|
|
|
flags);
|
|
|
|
fail = true;
|
|
|
|
}
|
2011-05-31 11:12:32 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Drop the table. */
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_close(ctx->new_table, TRUE, FALSE);
|
2011-04-11 15:40:28 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
#if defined UNIV_DEBUG || defined UNIV_DDL_DEBUG
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Nobody should have initialized the stats of the
|
|
|
|
newly created table yet. When this is the case, we
|
|
|
|
know that it has not been added for background stats
|
|
|
|
gathering. */
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_a(!ctx->new_table->stat_initialized);
|
|
|
|
#endif /* UNIV_DEBUG || UNIV_DDL_DEBUG */
|
2011-04-11 15:40:28 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
err = row_merge_drop_table(ctx->trx, ctx->new_table);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error_innodb(err, table->s->table_name.str,
|
2013-03-25 23:03:13 +01:00
|
|
|
flags);
|
|
|
|
fail = true;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
|
|
|
DBUG_ASSERT(!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ADD_PK_INDEX));
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->new_table == prebuilt->table);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_start_for_ddl(ctx->trx, TRX_DICT_OP_INDEX);
|
2011-05-31 11:12:32 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_rollback_sec_index(
|
|
|
|
prebuilt->table, table, FALSE, ctx->trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_commit_for_mysql(ctx->trx);
|
|
|
|
row_mysql_unlock_data_dictionary(ctx->trx);
|
|
|
|
trx_free_for_mysql(ctx->trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
func_exit:
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
dict_index_t* clust_index = dict_table_get_first_index(
|
|
|
|
prebuilt->table);
|
|
|
|
DBUG_ASSERT(!clust_index->online_log);
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(clust_index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
#endif /* !DBUG_OFF */
|
|
|
|
|
|
|
|
if (ctx) {
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->prebuilt == prebuilt);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (ctx->num_to_add_fk) {
|
|
|
|
for (ulint i = 0; i < ctx->num_to_add_fk; i++) {
|
|
|
|
dict_foreign_free(ctx->add_fk[i]);
|
|
|
|
}
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->num_to_drop_index) {
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_lock_data_dictionary(prebuilt->trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Clear the to_be_dropped flags
|
|
|
|
in the data dictionary cache.
|
|
|
|
The flags may already have been cleared,
|
|
|
|
in case an error was detected in
|
|
|
|
commit_inplace_alter_table(). */
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[i];
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
index->to_be_dropped = 0;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_unlock_data_dictionary(prebuilt->trx);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_commit_for_mysql(prebuilt->trx);
|
|
|
|
MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
|
|
|
|
DBUG_RETURN(fail);
|
|
|
|
}
|
2007-10-19 12:52:25 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Drop a FOREIGN KEY constraint from the data dictionary tables.
|
2013-03-25 23:03:13 +01:00
|
|
|
@param trx data dictionary transaction
|
2014-02-01 09:33:26 +01:00
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@param foreign_id Foreign key constraint identifier
|
2013-03-25 23:03:13 +01:00
|
|
|
@retval true Failure
|
|
|
|
@retval false Success */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_drop_foreign_try(
|
|
|
|
/*======================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_t* trx,
|
2014-02-01 09:33:26 +01:00
|
|
|
const char* table_name,
|
|
|
|
const char* foreign_id)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ENTER("innobase_drop_foreign_try");
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
|
|
|
|
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
|
|
|
|
|
|
|
/* Drop the constraint from the data dictionary. */
|
|
|
|
static const char sql[] =
|
|
|
|
"PROCEDURE DROP_FOREIGN_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
|
|
|
"DELETE FROM SYS_FOREIGN WHERE ID=:id;\n"
|
|
|
|
"DELETE FROM SYS_FOREIGN_COLS WHERE ID=:id;\n"
|
|
|
|
"END;\n";
|
|
|
|
|
|
|
|
dberr_t error;
|
|
|
|
pars_info_t* info;
|
|
|
|
|
|
|
|
info = pars_info_create();
|
2014-02-01 09:33:26 +01:00
|
|
|
pars_info_add_str_literal(info, "id", foreign_id);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
trx->op_info = "dropping foreign key constraint from dictionary";
|
|
|
|
error = que_eval_sql(info, sql, FALSE, trx);
|
|
|
|
trx->op_info = "";
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("ib_drop_foreign_error",
|
|
|
|
error = DB_OUT_OF_FILE_SPACE;);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error_innodb(error, table_name, 0);
|
2013-03-25 23:03:13 +01:00
|
|
|
trx->error_state = DB_SUCCESS;
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_RETURN(false);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Rename a column in the data dictionary tables.
|
|
|
|
@param user_table InnoDB table that was being altered
|
2013-03-25 23:03:13 +01:00
|
|
|
@param trx data dictionary transaction
|
2014-02-01 09:33:26 +01:00
|
|
|
@param table_name Table name in MySQL
|
2013-03-25 23:03:13 +01:00
|
|
|
@param nth_col 0-based index of the column
|
|
|
|
@param from old column name
|
|
|
|
@param to new column name
|
|
|
|
@param new_clustered whether the table has been rebuilt
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_rename_column_try(
|
|
|
|
/*=======================*/
|
|
|
|
const dict_table_t* user_table,
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_t* trx,
|
2014-02-01 09:33:26 +01:00
|
|
|
const char* table_name,
|
2013-03-25 23:03:13 +01:00
|
|
|
ulint nth_col,
|
|
|
|
const char* from,
|
|
|
|
const char* to,
|
|
|
|
bool new_clustered)
|
|
|
|
{
|
|
|
|
pars_info_t* info;
|
|
|
|
dberr_t error;
|
2007-10-19 12:52:25 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ENTER("innobase_rename_column_try");
|
2007-10-19 12:52:25 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(trx_get_dict_operation(trx) == TRX_DICT_OP_INDEX);
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
ut_ad(mutex_own(&dict_sys->mutex));
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(rw_lock_own(&dict_operation_lock, RW_LOCK_EX));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2007-10-19 12:52:25 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (new_clustered) {
|
|
|
|
goto rename_foreign;
|
2007-10-19 12:52:25 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
info = pars_info_create();
|
2007-12-19 15:26:01 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
pars_info_add_ull_literal(info, "tableid", user_table->id);
|
2013-03-25 23:03:13 +01:00
|
|
|
pars_info_add_int4_literal(info, "nth", nth_col);
|
|
|
|
pars_info_add_str_literal(info, "old", from);
|
|
|
|
pars_info_add_str_literal(info, "new", to);
|
2007-12-19 15:26:01 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx->op_info = "renaming column in SYS_COLUMNS";
|
2010-04-06 14:18:47 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
error = que_eval_sql(
|
|
|
|
info,
|
|
|
|
"PROCEDURE RENAME_SYS_COLUMNS_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
|
|
|
"UPDATE SYS_COLUMNS SET NAME=:new\n"
|
|
|
|
"WHERE TABLE_ID=:tableid AND NAME=:old\n"
|
|
|
|
"AND POS=:nth;\n"
|
|
|
|
"END;\n",
|
|
|
|
FALSE, trx);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_EXECUTE_IF("ib_rename_column_error",
|
|
|
|
error = DB_OUT_OF_FILE_SPACE;);
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 16:49:59 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
err_exit:
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error_innodb(error, table_name, 0);
|
2013-03-25 23:03:13 +01:00
|
|
|
trx->error_state = DB_SUCCESS;
|
|
|
|
trx->op_info = "";
|
|
|
|
DBUG_RETURN(true);
|
2007-10-19 12:52:25 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx->op_info = "renaming column in SYS_FIELDS";
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (const dict_index_t* index = dict_table_get_first_index(
|
|
|
|
user_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
index != NULL;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (ulint i = 0; i < dict_index_get_n_fields(index); i++) {
|
|
|
|
if (strcmp(dict_index_get_nth_field(index, i)->name,
|
|
|
|
from)) {
|
|
|
|
continue;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
info = pars_info_create();
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
pars_info_add_ull_literal(info, "indexid", index->id);
|
|
|
|
pars_info_add_int4_literal(info, "nth", i);
|
|
|
|
pars_info_add_str_literal(info, "old", from);
|
|
|
|
pars_info_add_str_literal(info, "new", to);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
error = que_eval_sql(
|
|
|
|
info,
|
|
|
|
"PROCEDURE RENAME_SYS_FIELDS_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
"UPDATE SYS_FIELDS SET COL_NAME=:new\n"
|
|
|
|
"WHERE INDEX_ID=:indexid AND COL_NAME=:old\n"
|
|
|
|
"AND POS=:nth;\n"
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Try again, in case there is a prefix_len
|
|
|
|
encoded in SYS_FIELDS.POS */
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
"UPDATE SYS_FIELDS SET COL_NAME=:new\n"
|
|
|
|
"WHERE INDEX_ID=:indexid AND COL_NAME=:old\n"
|
|
|
|
"AND POS>=65536*:nth AND POS<65536*(:nth+1);\n"
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
"END;\n",
|
|
|
|
FALSE, trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
rename_foreign:
|
|
|
|
trx->op_info = "renaming column in SYS_FOREIGN_COLS";
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2015-02-18 16:20:46 +01:00
|
|
|
std::list<dict_foreign_t*> fk_evict;
|
|
|
|
bool foreign_modified;
|
|
|
|
|
2014-10-04 15:26:04 +02:00
|
|
|
for (dict_foreign_set::const_iterator it = user_table->foreign_set.begin();
|
2014-09-11 10:13:35 +02:00
|
|
|
it != user_table->foreign_set.end();
|
|
|
|
++it) {
|
|
|
|
|
|
|
|
dict_foreign_t* foreign = *it;
|
2015-02-18 16:20:46 +01:00
|
|
|
foreign_modified = false;
|
2014-09-11 10:13:35 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (unsigned i = 0; i < foreign->n_fields; i++) {
|
|
|
|
if (strcmp(foreign->foreign_col_names[i], from)) {
|
|
|
|
continue;
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
info = pars_info_create();
|
|
|
|
|
|
|
|
pars_info_add_str_literal(info, "id", foreign->id);
|
|
|
|
pars_info_add_int4_literal(info, "nth", i);
|
|
|
|
pars_info_add_str_literal(info, "old", from);
|
|
|
|
pars_info_add_str_literal(info, "new", to);
|
|
|
|
|
|
|
|
error = que_eval_sql(
|
|
|
|
info,
|
|
|
|
"PROCEDURE RENAME_SYS_FOREIGN_F_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
|
|
|
"UPDATE SYS_FOREIGN_COLS\n"
|
|
|
|
"SET FOR_COL_NAME=:new\n"
|
|
|
|
"WHERE ID=:id AND POS=:nth\n"
|
|
|
|
"AND FOR_COL_NAME=:old;\n"
|
|
|
|
"END;\n",
|
|
|
|
FALSE, trx);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2015-02-18 16:20:46 +01:00
|
|
|
foreign_modified = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (foreign_modified) {
|
|
|
|
fk_evict.push_back(foreign);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2014-10-04 15:26:04 +02:00
|
|
|
for (dict_foreign_set::const_iterator it
|
2014-09-11 10:13:35 +02:00
|
|
|
= user_table->referenced_set.begin();
|
|
|
|
it != user_table->referenced_set.end();
|
|
|
|
++it) {
|
|
|
|
|
2015-02-18 16:20:46 +01:00
|
|
|
foreign_modified = false;
|
2014-09-11 10:13:35 +02:00
|
|
|
dict_foreign_t* foreign = *it;
|
2015-02-18 16:20:46 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (unsigned i = 0; i < foreign->n_fields; i++) {
|
|
|
|
if (strcmp(foreign->referenced_col_names[i], from)) {
|
|
|
|
continue;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
info = pars_info_create();
|
|
|
|
|
|
|
|
pars_info_add_str_literal(info, "id", foreign->id);
|
|
|
|
pars_info_add_int4_literal(info, "nth", i);
|
|
|
|
pars_info_add_str_literal(info, "old", from);
|
|
|
|
pars_info_add_str_literal(info, "new", to);
|
|
|
|
|
|
|
|
error = que_eval_sql(
|
|
|
|
info,
|
|
|
|
"PROCEDURE RENAME_SYS_FOREIGN_R_PROC () IS\n"
|
|
|
|
"BEGIN\n"
|
|
|
|
"UPDATE SYS_FOREIGN_COLS\n"
|
|
|
|
"SET REF_COL_NAME=:new\n"
|
|
|
|
"WHERE ID=:id AND POS=:nth\n"
|
|
|
|
"AND REF_COL_NAME=:old;\n"
|
|
|
|
"END;\n",
|
|
|
|
FALSE, trx);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
goto err_exit;
|
|
|
|
}
|
2015-02-18 16:20:46 +01:00
|
|
|
foreign_modified = true;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2015-02-18 16:20:46 +01:00
|
|
|
|
|
|
|
if (foreign_modified) {
|
|
|
|
fk_evict.push_back(foreign);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (new_clustered) {
|
|
|
|
std::for_each(fk_evict.begin(), fk_evict.end(),
|
|
|
|
dict_foreign_remove_from_cache);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx->op_info = "";
|
|
|
|
DBUG_RETURN(false);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Rename columns in the data dictionary tables.
|
2013-03-25 23:03:13 +01:00
|
|
|
@param ha_alter_info Data used during in-place alter.
|
2014-02-01 09:33:26 +01:00
|
|
|
@param ctx In-place ALTER TABLE context
|
2013-03-25 23:03:13 +01:00
|
|
|
@param table the TABLE
|
|
|
|
@param trx data dictionary transaction
|
2014-02-01 09:33:26 +01:00
|
|
|
@param table_name Table name in MySQL
|
2013-03-25 23:03:13 +01:00
|
|
|
@retval true Failure
|
|
|
|
@retval false Success */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2013-03-25 23:03:13 +01:00
|
|
|
bool
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_rename_columns_try(
|
|
|
|
/*========================*/
|
2013-03-25 23:03:13 +01:00
|
|
|
Alter_inplace_info* ha_alter_info,
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_innobase_inplace_ctx*ctx,
|
2013-03-25 23:03:13 +01:00
|
|
|
const TABLE* table,
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_t* trx,
|
|
|
|
const char* table_name)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
uint i = 0;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx);
|
|
|
|
DBUG_ASSERT(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
for (Field** fp = table->field; *fp; fp++, i++) {
|
2013-07-31 15:41:29 +02:00
|
|
|
if (!((*fp)->flags & FIELD_IS_RENAMED) || !((*fp)->stored_in_db)) {
|
2013-03-25 23:03:13 +01:00
|
|
|
continue;
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
cf_it.rewind();
|
|
|
|
while (Create_field* cf = cf_it++) {
|
|
|
|
if (cf->field == *fp) {
|
2014-02-01 09:33:26 +01:00
|
|
|
if (innobase_rename_column_try(
|
|
|
|
ctx->old_table, trx, table_name, i,
|
2013-03-25 23:03:13 +01:00
|
|
|
cf->field->field_name,
|
2014-02-01 09:33:26 +01:00
|
|
|
cf->field_name,
|
|
|
|
ctx->need_rebuild())) {
|
2013-03-25 23:03:13 +01:00
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
goto processed_field;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
ut_error;
|
|
|
|
processed_field:
|
|
|
|
continue;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
return(false);
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Rename columns in the data dictionary cache
|
|
|
|
as part of commit_cache_norebuild().
|
|
|
|
@param ha_alter_info Data used during in-place alter.
|
|
|
|
@param table the TABLE
|
|
|
|
@param user_table InnoDB table that was being altered */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull))
|
2013-03-25 23:03:13 +01:00
|
|
|
void
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_rename_columns_cache(
|
|
|
|
/*==========================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
const TABLE* table,
|
|
|
|
dict_table_t* user_table)
|
2013-03-25 23:03:13 +01:00
|
|
|
{
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME)) {
|
|
|
|
return;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
List_iterator_fast<Create_field> cf_it(
|
|
|
|
ha_alter_info->alter_info->create_list);
|
|
|
|
uint i = 0;
|
|
|
|
|
|
|
|
for (Field** fp = table->field; *fp; fp++, i++) {
|
|
|
|
if (!((*fp)->flags & FIELD_IS_RENAMED)) {
|
|
|
|
continue;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
cf_it.rewind();
|
|
|
|
while (Create_field* cf = cf_it++) {
|
|
|
|
if (cf->field == *fp) {
|
|
|
|
dict_mem_table_col_rename(user_table, i,
|
|
|
|
cf->field->field_name,
|
|
|
|
cf->field_name);
|
|
|
|
goto processed_field;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
ut_error;
|
|
|
|
processed_field:
|
|
|
|
continue;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Get the auto-increment value of the table on commit.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param old_table MySQL table as it is before the ALTER operation
|
|
|
|
@return the next auto-increment value (0 if not present) */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
ulonglong
|
|
|
|
commit_get_autoinc(
|
|
|
|
/*===============*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
ha_innobase_inplace_ctx*ctx,
|
|
|
|
const TABLE* altered_table,
|
|
|
|
const TABLE* old_table)
|
|
|
|
{
|
|
|
|
ulonglong max_autoinc;
|
|
|
|
|
|
|
|
DBUG_ENTER("commit_get_autoinc");
|
|
|
|
|
|
|
|
if (!altered_table->found_next_number_field) {
|
|
|
|
/* There is no AUTO_INCREMENT column in the table
|
|
|
|
after the ALTER operation. */
|
|
|
|
max_autoinc = 0;
|
|
|
|
} else if (ctx->add_autoinc != ULINT_UNDEFINED) {
|
|
|
|
/* An AUTO_INCREMENT column was added. Get the last
|
|
|
|
value from the sequence, which may be based on a
|
|
|
|
supplied AUTO_INCREMENT value. */
|
|
|
|
max_autoinc = ctx->sequence.last();
|
|
|
|
} else if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::CHANGE_CREATE_OPTION)
|
|
|
|
&& (ha_alter_info->create_info->used_fields
|
|
|
|
& HA_CREATE_USED_AUTO)) {
|
2014-05-05 18:20:28 +02:00
|
|
|
/* An AUTO_INCREMENT value was supplied, but the table was not
|
|
|
|
rebuilt. Get the user-supplied value or the last value from the
|
|
|
|
sequence. */
|
|
|
|
ib_uint64_t max_value_table;
|
|
|
|
dberr_t err;
|
|
|
|
|
|
|
|
Field* autoinc_field =
|
|
|
|
old_table->found_next_number_field;
|
2016-01-13 21:06:29 +01:00
|
|
|
KEY* autoinc_key =
|
|
|
|
old_table->key_info + old_table->s->next_number_index;
|
2014-05-05 18:20:28 +02:00
|
|
|
|
2016-01-13 21:06:29 +01:00
|
|
|
dict_index_t* index = dict_table_get_index_on_name(
|
|
|
|
ctx->old_table, autoinc_key->name);
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
max_autoinc = ha_alter_info->create_info->auto_increment_value;
|
|
|
|
|
|
|
|
dict_table_autoinc_lock(ctx->old_table);
|
2014-05-05 18:20:28 +02:00
|
|
|
|
|
|
|
err = row_search_max_autoinc(
|
|
|
|
index, autoinc_field->field_name, &max_value_table);
|
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
ut_ad(0);
|
|
|
|
max_autoinc = 0;
|
|
|
|
} else if (max_autoinc <= max_value_table) {
|
|
|
|
ulonglong col_max_value;
|
|
|
|
ulonglong offset;
|
|
|
|
|
|
|
|
col_max_value = innobase_get_int_col_max_value(
|
|
|
|
old_table->found_next_number_field);
|
|
|
|
|
|
|
|
offset = ctx->prebuilt->autoinc_offset;
|
|
|
|
max_autoinc = innobase_next_autoinc(
|
|
|
|
max_value_table, 1, 1, offset,
|
|
|
|
col_max_value);
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
|
|
|
dict_table_autoinc_unlock(ctx->old_table);
|
|
|
|
} else {
|
|
|
|
/* An AUTO_INCREMENT value was not specified.
|
|
|
|
Read the old counter value from the table. */
|
|
|
|
ut_ad(old_table->found_next_number_field);
|
|
|
|
dict_table_autoinc_lock(ctx->old_table);
|
|
|
|
max_autoinc = ctx->old_table->autoinc;
|
|
|
|
dict_table_autoinc_unlock(ctx->old_table);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(max_autoinc);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Add or drop foreign key constraints to the data dictionary tables,
|
|
|
|
but do not touch the data dictionary cache.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param trx Data dictionary transaction
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
bool
|
|
|
|
innobase_update_foreign_try(
|
|
|
|
/*========================*/
|
|
|
|
ha_innobase_inplace_ctx*ctx,
|
|
|
|
trx_t* trx,
|
|
|
|
const char* table_name)
|
|
|
|
{
|
|
|
|
ulint foreign_id;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
DBUG_ENTER("innobase_update_foreign_try");
|
|
|
|
DBUG_ASSERT(ctx);
|
|
|
|
|
|
|
|
foreign_id = dict_table_get_highest_foreign_id(ctx->new_table);
|
|
|
|
|
|
|
|
foreign_id++;
|
|
|
|
|
|
|
|
for (i = 0; i < ctx->num_to_add_fk; i++) {
|
|
|
|
dict_foreign_t* fk = ctx->add_fk[i];
|
|
|
|
|
|
|
|
ut_ad(fk->foreign_table == ctx->new_table
|
|
|
|
|| fk->foreign_table == ctx->old_table);
|
|
|
|
|
|
|
|
dberr_t error = dict_create_add_foreign_id(
|
|
|
|
&foreign_id, ctx->old_table->name, fk);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0),
|
|
|
|
fk->id);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!fk->foreign_index) {
|
|
|
|
fk->foreign_index = dict_foreign_find_index(
|
|
|
|
ctx->new_table, ctx->col_names,
|
|
|
|
fk->foreign_col_names,
|
|
|
|
fk->n_fields, fk->referenced_index, TRUE,
|
|
|
|
fk->type
|
|
|
|
& (DICT_FOREIGN_ON_DELETE_SET_NULL
|
2015-08-03 22:09:43 +02:00
|
|
|
| DICT_FOREIGN_ON_UPDATE_SET_NULL),
|
|
|
|
NULL, NULL, NULL);
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!fk->foreign_index) {
|
|
|
|
my_error(ER_FK_INCORRECT_OPTION,
|
|
|
|
MYF(0), table_name, fk->id);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The fk->foreign_col_names[] uses renamed column
|
|
|
|
names, while the columns in ctx->old_table have not
|
|
|
|
been renamed yet. */
|
|
|
|
error = dict_create_add_foreign_to_dictionary(
|
2015-08-03 22:09:43 +02:00
|
|
|
(dict_table_t*)ctx->old_table,ctx->old_table->name, fk, trx);
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
DBUG_EXECUTE_IF(
|
|
|
|
"innodb_test_cannot_add_fk_system",
|
|
|
|
error = DB_ERROR;);
|
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
my_error(ER_FK_FAIL_ADD_SYSTEM, MYF(0),
|
|
|
|
fk->id);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ctx->num_to_drop_fk; i++) {
|
|
|
|
dict_foreign_t* fk = ctx->drop_fk[i];
|
|
|
|
|
|
|
|
DBUG_ASSERT(fk->foreign_table == ctx->old_table);
|
|
|
|
|
|
|
|
if (innobase_drop_foreign_try(trx, table_name, fk->id)) {
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Update the foreign key constraint definitions in the data dictionary cache
|
|
|
|
after the changes to data dictionary tables were committed.
|
|
|
|
@param ctx In-place ALTER TABLE context
|
2014-11-18 17:41:12 +01:00
|
|
|
@param user_thd MySQL connection
|
2014-02-01 09:33:26 +01:00
|
|
|
@return InnoDB error code (should always be DB_SUCCESS) */
|
2016-06-21 14:21:03 +02:00
|
|
|
static MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
dberr_t
|
|
|
|
innobase_update_foreign_cache(
|
|
|
|
/*==========================*/
|
2014-11-18 17:41:12 +01:00
|
|
|
ha_innobase_inplace_ctx* ctx,
|
|
|
|
THD* user_thd)
|
2014-02-01 09:33:26 +01:00
|
|
|
{
|
|
|
|
dict_table_t* user_table;
|
2014-11-18 17:41:12 +01:00
|
|
|
dberr_t err = DB_SUCCESS;
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("innobase_update_foreign_cache");
|
|
|
|
|
|
|
|
user_table = ctx->old_table;
|
|
|
|
|
|
|
|
/* Discard the added foreign keys, because we will
|
|
|
|
load them from the data dictionary. */
|
|
|
|
for (ulint i = 0; i < ctx->num_to_add_fk; i++) {
|
|
|
|
dict_foreign_t* fk = ctx->add_fk[i];
|
|
|
|
dict_foreign_free(fk);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->need_rebuild()) {
|
|
|
|
/* The rebuilt table is already using the renamed
|
|
|
|
column names. No need to pass col_names or to drop
|
|
|
|
constraints from the data dictionary cache. */
|
|
|
|
DBUG_ASSERT(!ctx->col_names);
|
2014-09-11 10:13:35 +02:00
|
|
|
DBUG_ASSERT(user_table->foreign_set.empty());
|
|
|
|
DBUG_ASSERT(user_table->referenced_set.empty());
|
2014-02-01 09:33:26 +01:00
|
|
|
user_table = ctx->new_table;
|
|
|
|
} else {
|
|
|
|
/* Drop the foreign key constraints if the
|
|
|
|
table was not rebuilt. If the table is rebuilt,
|
|
|
|
there would not be any foreign key contraints for
|
|
|
|
it yet in the data dictionary cache. */
|
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_fk; i++) {
|
|
|
|
dict_foreign_t* fk = ctx->drop_fk[i];
|
|
|
|
dict_foreign_remove_from_cache(fk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load the old or added foreign keys from the data dictionary
|
|
|
|
and prevent the table from being evicted from the data
|
|
|
|
dictionary cache (work around the lack of WL#6049). */
|
2014-11-18 17:41:12 +01:00
|
|
|
err = dict_load_foreigns(user_table->name,
|
|
|
|
ctx->col_names, false, true,
|
|
|
|
DICT_ERR_IGNORE_NONE);
|
|
|
|
|
|
|
|
if (err == DB_CANNOT_ADD_CONSTRAINT) {
|
|
|
|
/* It is possible there are existing foreign key are
|
|
|
|
loaded with "foreign_key checks" off,
|
|
|
|
so let's retry the loading with charset_check is off */
|
|
|
|
err = dict_load_foreigns(user_table->name,
|
|
|
|
ctx->col_names, false, false,
|
|
|
|
DICT_ERR_IGNORE_NONE);
|
|
|
|
|
|
|
|
/* The load with "charset_check" off is successful, warn
|
|
|
|
the user that the foreign key has loaded with mis-matched
|
|
|
|
charset */
|
|
|
|
if (err == DB_SUCCESS) {
|
|
|
|
push_warning_printf(
|
|
|
|
user_thd,
|
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
|
|
|
ER_ALTER_INFO,
|
|
|
|
"Foreign key constraints for table '%s'"
|
|
|
|
" are loaded with charset check off",
|
|
|
|
user_table->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(err);
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Commit the changes made during prepare_inplace_alter_table()
|
|
|
|
and inplace_alter_table() inside the data dictionary tables,
|
|
|
|
when rebuilding the table.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param old_table MySQL table as it is before the ALTER operation
|
|
|
|
@param trx Data dictionary transaction
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
bool
|
|
|
|
commit_try_rebuild(
|
|
|
|
/*===============*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
ha_innobase_inplace_ctx*ctx,
|
|
|
|
TABLE* altered_table,
|
|
|
|
const TABLE* old_table,
|
|
|
|
trx_t* trx,
|
|
|
|
const char* table_name)
|
|
|
|
{
|
|
|
|
dict_table_t* rebuilt_table = ctx->new_table;
|
|
|
|
dict_table_t* user_table = ctx->old_table;
|
|
|
|
|
|
|
|
DBUG_ENTER("commit_try_rebuild");
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild());
|
|
|
|
DBUG_ASSERT(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
DBUG_ASSERT(!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::DROP_FOREIGN_KEY)
|
|
|
|
|| ctx->num_to_drop_fk > 0);
|
|
|
|
DBUG_ASSERT(ctx->num_to_drop_fk
|
|
|
|
== ha_alter_info->alter_info->drop_list.elements);
|
|
|
|
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(rebuilt_table);
|
|
|
|
index;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
|
|
|
if (dict_index_is_corrupted(index)) {
|
|
|
|
my_error(ER_INDEX_CORRUPT, MYF(0),
|
|
|
|
index->name);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (innobase_update_foreign_try(ctx, trx, table_name)) {
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
dberr_t error;
|
|
|
|
|
|
|
|
/* Clear the to_be_dropped flag in the data dictionary cache
|
|
|
|
of user_table. */
|
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[i];
|
|
|
|
DBUG_ASSERT(index->table == user_table);
|
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
|
|
|
DBUG_ASSERT(index->to_be_dropped);
|
|
|
|
index->to_be_dropped = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We copied the table. Any indexes that were requested to be
|
|
|
|
dropped were not created in the copy of the table. Apply any
|
|
|
|
last bit of the rebuild log and then rename the tables. */
|
|
|
|
|
|
|
|
if (ctx->online) {
|
|
|
|
DEBUG_SYNC_C("row_log_table_apply2_before");
|
|
|
|
error = row_log_table_apply(
|
|
|
|
ctx->thr, user_table, altered_table);
|
|
|
|
ulint err_key = thr_get_trx(ctx->thr)->error_key_num;
|
|
|
|
|
|
|
|
switch (error) {
|
|
|
|
KEY* dup_key;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
if (err_key == ULINT_UNDEFINED) {
|
|
|
|
/* This should be the hidden index on
|
|
|
|
FTS_DOC_ID. */
|
|
|
|
dup_key = NULL;
|
|
|
|
} else {
|
|
|
|
DBUG_ASSERT(err_key <
|
|
|
|
ha_alter_info->key_count);
|
|
|
|
dup_key = &ha_alter_info
|
|
|
|
->key_info_buffer[err_key];
|
|
|
|
}
|
|
|
|
print_keydup_error(altered_table, dup_key, MYF(0));
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
case DB_ONLINE_LOG_TOO_BIG:
|
|
|
|
my_error(ER_INNODB_ONLINE_LOG_TOO_BIG, MYF(0),
|
2017-01-07 13:24:42 +01:00
|
|
|
get_error_key_name(err_key, ha_alter_info,
|
|
|
|
rebuilt_table));
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_RETURN(true);
|
|
|
|
case DB_INDEX_CORRUPT:
|
|
|
|
my_error(ER_INDEX_CORRUPT, MYF(0),
|
2017-01-07 13:24:42 +01:00
|
|
|
get_error_key_name(err_key, ha_alter_info,
|
|
|
|
rebuilt_table));
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_RETURN(true);
|
|
|
|
default:
|
|
|
|
my_error_innodb(error, table_name, user_table->flags);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME)
|
|
|
|
&& innobase_rename_columns_try(ha_alter_info, ctx, old_table,
|
|
|
|
trx, table_name)) {
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("ib_ddl_crash_before_rename", DBUG_SUICIDE(););
|
|
|
|
|
|
|
|
/* The new table must inherit the flag from the
|
|
|
|
"parent" table. */
|
|
|
|
if (dict_table_is_discarded(user_table)) {
|
|
|
|
rebuilt_table->ibd_file_missing = true;
|
|
|
|
rebuilt_table->flags2 |= DICT_TF2_DISCARDED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We can now rename the old table as a temporary table,
|
|
|
|
rename the new temporary table as the old table and drop the
|
|
|
|
old table. First, we only do this in the data dictionary
|
|
|
|
tables. The actual renaming will be performed in
|
|
|
|
commit_cache_rebuild(), once the data dictionary transaction
|
|
|
|
has been successfully committed. */
|
|
|
|
|
|
|
|
error = row_merge_rename_tables_dict(
|
|
|
|
user_table, rebuilt_table, ctx->tmp_name, trx);
|
|
|
|
|
|
|
|
/* We must be still holding a table handle. */
|
|
|
|
DBUG_ASSERT(user_table->n_ref_count >= 1);
|
|
|
|
|
|
|
|
DBUG_EXECUTE_IF("ib_ddl_crash_after_rename", DBUG_SUICIDE(););
|
|
|
|
DBUG_EXECUTE_IF("ib_rebuild_cannot_rename", error = DB_ERROR;);
|
|
|
|
|
|
|
|
if (user_table->n_ref_count > 1) {
|
|
|
|
/* This should only occur when an innodb_memcached
|
|
|
|
connection with innodb_api_enable_mdl=off was started
|
|
|
|
before commit_inplace_alter_table() locked the data
|
|
|
|
dictionary. We must roll back the ALTER TABLE, because
|
|
|
|
we cannot drop a table while it is being used. */
|
|
|
|
|
|
|
|
/* Normally, n_ref_count must be 1, because purge
|
|
|
|
cannot be executing on this very table as we are
|
|
|
|
holding dict_operation_lock X-latch. */
|
|
|
|
|
|
|
|
error = DB_LOCK_WAIT_TIMEOUT;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (error) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
DBUG_RETURN(false);
|
|
|
|
case DB_TABLESPACE_EXISTS:
|
|
|
|
ut_a(rebuilt_table->n_ref_count == 1);
|
|
|
|
my_error(ER_TABLESPACE_EXISTS, MYF(0), ctx->tmp_name);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
case DB_DUPLICATE_KEY:
|
|
|
|
ut_a(rebuilt_table->n_ref_count == 1);
|
|
|
|
my_error(ER_TABLE_EXISTS_ERROR, MYF(0), ctx->tmp_name);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
default:
|
|
|
|
my_error_innodb(error, table_name, user_table->flags);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Apply the changes made during commit_try_rebuild(),
|
|
|
|
to the data dictionary cache and the file system.
|
|
|
|
@param ctx In-place ALTER TABLE context */
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((nonnull))
|
2014-02-01 09:33:26 +01:00
|
|
|
void
|
|
|
|
commit_cache_rebuild(
|
|
|
|
/*=================*/
|
|
|
|
ha_innobase_inplace_ctx* ctx)
|
|
|
|
{
|
|
|
|
dberr_t error;
|
|
|
|
|
|
|
|
DBUG_ENTER("commit_cache_rebuild");
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild());
|
|
|
|
DBUG_ASSERT(dict_table_is_discarded(ctx->old_table)
|
|
|
|
== dict_table_is_discarded(ctx->new_table));
|
|
|
|
|
|
|
|
const char* old_name = mem_heap_strdup(
|
|
|
|
ctx->heap, ctx->old_table->name);
|
|
|
|
|
|
|
|
/* We already committed and redo logged the renames,
|
|
|
|
so this must succeed. */
|
|
|
|
error = dict_table_rename_in_cache(
|
|
|
|
ctx->old_table, ctx->tmp_name, FALSE);
|
|
|
|
ut_a(error == DB_SUCCESS);
|
|
|
|
|
|
|
|
error = dict_table_rename_in_cache(
|
|
|
|
ctx->new_table, old_name, FALSE);
|
|
|
|
ut_a(error == DB_SUCCESS);
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
2015-12-13 10:11:49 +01:00
|
|
|
/** Store the column number of the columns in a list belonging
|
|
|
|
to indexes which are not being dropped.
|
|
|
|
@param[in] ctx In-place ALTER TABLE context
|
|
|
|
@param[out] drop_col_list list which will be set, containing columns
|
|
|
|
which is part of index being dropped */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
get_col_list_to_be_dropped(
|
|
|
|
ha_innobase_inplace_ctx* ctx,
|
|
|
|
std::set<ulint>& drop_col_list)
|
|
|
|
{
|
|
|
|
for (ulint index_count = 0; index_count < ctx->num_to_drop_index;
|
|
|
|
index_count++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[index_count];
|
|
|
|
|
|
|
|
for (ulint col = 0; col < index->n_user_defined_cols; col++) {
|
|
|
|
ulint col_no = dict_index_get_nth_col_no(index, col);
|
|
|
|
drop_col_list.insert(col_no);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** For each column, which is part of an index which is not going to be
|
|
|
|
dropped, it checks if the column number of the column is same as col_no
|
|
|
|
argument passed.
|
|
|
|
@param[in] table table object
|
|
|
|
@param[in] col_no column number of the column which is to be checked
|
|
|
|
@retval true column exists
|
|
|
|
@retval false column does not exist. */
|
|
|
|
static
|
|
|
|
bool
|
|
|
|
check_col_exists_in_indexes(
|
|
|
|
const dict_table_t* table,
|
|
|
|
ulint col_no)
|
|
|
|
{
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(table); index;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
|
|
|
|
|
|
|
if (index->to_be_dropped) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (ulint col = 0; col < index->n_user_defined_cols; col++) {
|
|
|
|
|
|
|
|
ulint index_col_no = dict_index_get_nth_col_no(
|
|
|
|
index, col);
|
|
|
|
if (col_no == index_col_no) {
|
|
|
|
return(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return(false);
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/** Commit the changes made during prepare_inplace_alter_table()
|
|
|
|
and inplace_alter_table() inside the data dictionary tables,
|
|
|
|
when not rebuilding the table.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param old_table MySQL table as it is before the ALTER operation
|
|
|
|
@param trx Data dictionary transaction
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
bool
|
|
|
|
commit_try_norebuild(
|
|
|
|
/*=================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
ha_innobase_inplace_ctx*ctx,
|
|
|
|
const TABLE* old_table,
|
|
|
|
trx_t* trx,
|
|
|
|
const char* table_name)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("commit_try_norebuild");
|
|
|
|
DBUG_ASSERT(!ctx->need_rebuild());
|
|
|
|
DBUG_ASSERT(trx->dict_operation_lock_mode == RW_X_LATCH);
|
|
|
|
DBUG_ASSERT(!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::DROP_FOREIGN_KEY)
|
|
|
|
|| ctx->num_to_drop_fk > 0);
|
|
|
|
DBUG_ASSERT(ctx->num_to_drop_fk
|
|
|
|
== ha_alter_info->alter_info->drop_list.elements);
|
|
|
|
|
|
|
|
for (ulint i = 0; i < ctx->num_to_add_index; i++) {
|
|
|
|
dict_index_t* index = ctx->add_index[i];
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
DBUG_ASSERT(*index->name == TEMP_INDEX_PREFIX);
|
|
|
|
if (dict_index_is_corrupted(index)) {
|
|
|
|
/* Report a duplicate key
|
|
|
|
error for the index that was
|
|
|
|
flagged corrupted, most likely
|
|
|
|
because a duplicate value was
|
|
|
|
inserted (directly or by
|
|
|
|
rollback) after
|
|
|
|
ha_innobase::inplace_alter_table()
|
|
|
|
completed.
|
|
|
|
TODO: report this as a corruption
|
|
|
|
with a detailed reason once
|
|
|
|
WL#6379 has been implemented. */
|
|
|
|
my_error(ER_DUP_UNKNOWN_IN_INDEX,
|
|
|
|
MYF(0), index->name + 1);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (innobase_update_foreign_try(ctx, trx, table_name)) {
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
dberr_t error;
|
|
|
|
|
|
|
|
/* We altered the table in place. */
|
|
|
|
/* Lose the TEMP_INDEX_PREFIX. */
|
|
|
|
for (ulint i = 0; i < ctx->num_to_add_index; i++) {
|
|
|
|
dict_index_t* index = ctx->add_index[i];
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
DBUG_ASSERT(*index->name
|
|
|
|
== TEMP_INDEX_PREFIX);
|
|
|
|
error = row_merge_rename_index_to_add(
|
|
|
|
trx, ctx->new_table->id, index->id);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
sql_print_error(
|
|
|
|
"InnoDB: rename index to add: %lu\n",
|
|
|
|
(ulong) error);
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
my_error(ER_INTERNAL_ERROR, MYF(0),
|
|
|
|
"rename index to add");
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Drop any indexes that were requested to be dropped.
|
|
|
|
Rename them to TEMP_INDEX_PREFIX in the data
|
|
|
|
dictionary first. We do not bother to rename
|
|
|
|
index->name in the dictionary cache, because the index
|
|
|
|
is about to be freed after row_merge_drop_indexes_dict(). */
|
|
|
|
|
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[i];
|
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
|
|
|
DBUG_ASSERT(index->table == ctx->new_table);
|
|
|
|
DBUG_ASSERT(index->to_be_dropped);
|
|
|
|
|
|
|
|
error = row_merge_rename_index_to_drop(
|
|
|
|
trx, index->table->id, index->id);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
sql_print_error(
|
|
|
|
"InnoDB: rename index to drop: %lu\n",
|
|
|
|
(ulong) error);
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
my_error(ER_INTERNAL_ERROR, MYF(0),
|
|
|
|
"rename index to drop");
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(ha_alter_info->handler_flags
|
|
|
|
& Alter_inplace_info::ALTER_COLUMN_NAME)) {
|
|
|
|
DBUG_RETURN(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(innobase_rename_columns_try(ha_alter_info, ctx,
|
|
|
|
old_table, trx, table_name));
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Commit the changes to the data dictionary cache
|
|
|
|
after a successful commit_try_norebuild() call.
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param table the TABLE before the ALTER
|
|
|
|
@param trx Data dictionary transaction object
|
|
|
|
(will be started and committed)
|
|
|
|
@return whether all replacements were found for dropped indexes */
|
2016-06-21 14:21:03 +02:00
|
|
|
inline MY_ATTRIBUTE((nonnull, warn_unused_result))
|
2014-02-01 09:33:26 +01:00
|
|
|
bool
|
|
|
|
commit_cache_norebuild(
|
|
|
|
/*===================*/
|
|
|
|
ha_innobase_inplace_ctx*ctx,
|
|
|
|
const TABLE* table,
|
|
|
|
trx_t* trx)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("commit_cache_norebuild");
|
|
|
|
|
|
|
|
bool found = true;
|
|
|
|
|
|
|
|
DBUG_ASSERT(!ctx->need_rebuild());
|
|
|
|
|
2015-12-13 10:11:49 +01:00
|
|
|
std::set<ulint> drop_list;
|
|
|
|
std::set<ulint>::const_iterator col_it;
|
|
|
|
|
|
|
|
/* Check if the column, part of an index to be dropped is part of any
|
|
|
|
other index which is not being dropped. If it so, then set the ord_part
|
|
|
|
of the column to 0. */
|
|
|
|
get_col_list_to_be_dropped(ctx, drop_list);
|
|
|
|
|
|
|
|
for(col_it = drop_list.begin(); col_it != drop_list.end(); ++col_it) {
|
|
|
|
if (!check_col_exists_in_indexes(ctx->new_table, *col_it)) {
|
|
|
|
ctx->new_table->cols[*col_it].ord_part = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < ctx->num_to_add_index; i++) {
|
|
|
|
dict_index_t* index = ctx->add_index[i];
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
DBUG_ASSERT(*index->name == TEMP_INDEX_PREFIX);
|
|
|
|
index->name++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ctx->num_to_drop_index) {
|
|
|
|
/* Really drop the indexes that were dropped.
|
|
|
|
The transaction had to be committed first
|
|
|
|
(after renaming the indexes), so that in the
|
|
|
|
event of a crash, crash recovery will drop the
|
|
|
|
indexes, because it drops all indexes whose
|
|
|
|
names start with TEMP_INDEX_PREFIX. Once we
|
|
|
|
have started dropping an index tree, there is
|
|
|
|
no way to roll it back. */
|
|
|
|
|
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[i];
|
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
|
|
|
DBUG_ASSERT(index->table == ctx->new_table);
|
|
|
|
DBUG_ASSERT(index->to_be_dropped);
|
|
|
|
|
|
|
|
/* Replace the indexes in foreign key
|
|
|
|
constraints if needed. */
|
|
|
|
|
|
|
|
if (!dict_foreign_replace_index(
|
|
|
|
index->table, ctx->col_names, index)) {
|
|
|
|
found = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Mark the index dropped
|
|
|
|
in the data dictionary cache. */
|
|
|
|
rw_lock_x_lock(dict_index_get_lock(index));
|
|
|
|
index->page = FIL_NULL;
|
|
|
|
rw_lock_x_unlock(dict_index_get_lock(index));
|
|
|
|
}
|
|
|
|
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
|
|
|
|
row_merge_drop_indexes_dict(trx, ctx->new_table->id);
|
|
|
|
|
|
|
|
for (ulint i = 0; i < ctx->num_to_drop_index; i++) {
|
|
|
|
dict_index_t* index = ctx->drop_index[i];
|
|
|
|
DBUG_ASSERT(*index->name != TEMP_INDEX_PREFIX);
|
|
|
|
DBUG_ASSERT(index->table == ctx->new_table);
|
|
|
|
|
|
|
|
if (index->type & DICT_FTS) {
|
|
|
|
DBUG_ASSERT(index->type == DICT_FTS
|
|
|
|
|| (index->type
|
|
|
|
& DICT_CORRUPT));
|
|
|
|
DBUG_ASSERT(index->table->fts);
|
|
|
|
fts_drop_index(index->table, index, trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
dict_index_remove_from_cache(index->table, index);
|
|
|
|
}
|
|
|
|
|
|
|
|
trx_commit_for_mysql(trx);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(found);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adjust the persistent statistics after non-rebuilding ALTER TABLE.
|
|
|
|
Remove statistics for dropped indexes, add statistics for created indexes
|
|
|
|
and rename statistics for renamed indexes.
|
|
|
|
@param ha_alter_info Data used during in-place alter
|
|
|
|
@param ctx In-place ALTER TABLE context
|
|
|
|
@param altered_table MySQL table that is being altered
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@param thd MySQL connection
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
void
|
|
|
|
alter_stats_norebuild(
|
|
|
|
/*==================*/
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
ha_innobase_inplace_ctx* ctx,
|
|
|
|
TABLE* altered_table,
|
|
|
|
const char* table_name,
|
|
|
|
THD* thd)
|
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
DBUG_ENTER("alter_stats_norebuild");
|
|
|
|
DBUG_ASSERT(!ctx->need_rebuild());
|
|
|
|
|
|
|
|
if (!dict_stats_is_persistent_enabled(ctx->new_table)) {
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* TODO: This will not drop the (unused) statistics for
|
|
|
|
FTS_DOC_ID_INDEX if it was a hidden index, dropped together
|
|
|
|
with the last renamining FULLTEXT index. */
|
|
|
|
for (i = 0; i < ha_alter_info->index_drop_count; i++) {
|
|
|
|
const KEY* key = ha_alter_info->index_drop_buffer[i];
|
|
|
|
|
|
|
|
if (key->flags & HA_FULLTEXT) {
|
|
|
|
/* There are no index cardinality
|
|
|
|
statistics for FULLTEXT indexes. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
char errstr[1024];
|
|
|
|
|
|
|
|
if (dict_stats_drop_index(
|
|
|
|
ctx->new_table->name, key->name,
|
|
|
|
errstr, sizeof errstr) != DB_SUCCESS) {
|
|
|
|
push_warning(thd,
|
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
|
|
|
ER_LOCK_WAIT_TIMEOUT, errstr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < ctx->num_to_add_index; i++) {
|
|
|
|
dict_index_t* index = ctx->add_index[i];
|
|
|
|
DBUG_ASSERT(index->table == ctx->new_table);
|
|
|
|
|
|
|
|
if (!(index->type & DICT_FTS)) {
|
|
|
|
dict_stats_init(ctx->new_table);
|
|
|
|
dict_stats_update_for_index(index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Adjust the persistent statistics after rebuilding ALTER TABLE.
|
|
|
|
Remove statistics for dropped indexes, add statistics for created indexes
|
|
|
|
and rename statistics for renamed indexes.
|
|
|
|
@param table InnoDB table that was rebuilt by ALTER TABLE
|
|
|
|
@param table_name Table name in MySQL
|
|
|
|
@param thd MySQL connection
|
|
|
|
*/
|
|
|
|
static
|
|
|
|
void
|
|
|
|
alter_stats_rebuild(
|
|
|
|
/*================*/
|
|
|
|
dict_table_t* table,
|
|
|
|
const char* table_name,
|
|
|
|
THD* thd)
|
|
|
|
{
|
|
|
|
DBUG_ENTER("alter_stats_rebuild");
|
|
|
|
|
|
|
|
if (dict_table_is_discarded(table)
|
|
|
|
|| !dict_stats_is_persistent_enabled(table)) {
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
dberr_t ret;
|
|
|
|
|
|
|
|
ret = dict_stats_update(table, DICT_STATS_RECALC_PERSISTENT);
|
|
|
|
|
|
|
|
if (ret != DB_SUCCESS) {
|
|
|
|
push_warning_printf(
|
|
|
|
thd,
|
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
|
|
|
ER_ALTER_INFO,
|
|
|
|
"Error updating stats for table '%s' "
|
|
|
|
"after table rebuild: %s",
|
|
|
|
table_name, ut_strerr(ret));
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
# define DBUG_INJECT_CRASH(prefix, count) \
|
|
|
|
do { \
|
|
|
|
char buf[32]; \
|
|
|
|
ut_snprintf(buf, sizeof buf, prefix "_%u", count); \
|
|
|
|
DBUG_EXECUTE_IF(buf, DBUG_SUICIDE();); \
|
|
|
|
} while (0)
|
|
|
|
#else
|
|
|
|
# define DBUG_INJECT_CRASH(prefix, count)
|
|
|
|
#endif
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/** Commit or rollback the changes made during
|
|
|
|
prepare_inplace_alter_table() and inplace_alter_table() inside
|
|
|
|
the storage engine. Note that the allowed level of concurrency
|
|
|
|
during this operation will be the same as for
|
|
|
|
inplace_alter_table() and thus might be higher than during
|
|
|
|
prepare_inplace_alter_table(). (E.g concurrent writes were
|
|
|
|
blocked during prepare, but might not be during commit).
|
|
|
|
@param altered_table TABLE object for new version of table.
|
|
|
|
@param ha_alter_info Structure describing changes to be done
|
|
|
|
by ALTER TABLE and holding data used during in-place alter.
|
|
|
|
@param commit true => Commit, false => Rollback.
|
|
|
|
@retval true Failure
|
|
|
|
@retval false Success
|
|
|
|
*/
|
|
|
|
UNIV_INTERN
|
|
|
|
bool
|
|
|
|
ha_innobase::commit_inplace_alter_table(
|
|
|
|
/*====================================*/
|
|
|
|
TABLE* altered_table,
|
|
|
|
Alter_inplace_info* ha_alter_info,
|
|
|
|
bool commit)
|
|
|
|
{
|
2015-12-13 10:11:49 +01:00
|
|
|
dberr_t error;
|
2014-02-01 09:33:26 +01:00
|
|
|
ha_innobase_inplace_ctx* ctx0
|
2013-03-25 23:03:13 +01:00
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(ha_alter_info->handler_ctx);
|
2014-02-01 09:33:26 +01:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
uint crash_inject_count = 1;
|
|
|
|
uint crash_fail_inject_count = 1;
|
|
|
|
uint failure_inject_count = 1;
|
|
|
|
#endif
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("commit_inplace_alter_table");
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!srv_read_only_mode);
|
|
|
|
DBUG_ASSERT(!ctx0 || ctx0->prebuilt == prebuilt);
|
|
|
|
DBUG_ASSERT(!ctx0 || ctx0->old_table == prebuilt->table);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
DEBUG_SYNC_C("innodb_commit_inplace_alter_table_enter");
|
|
|
|
|
|
|
|
DEBUG_SYNC_C("innodb_commit_inplace_alter_table_wait");
|
|
|
|
|
|
|
|
if (!commit) {
|
|
|
|
/* A rollback is being requested. So far we may at
|
|
|
|
most have created some indexes. If any indexes were to
|
2014-02-01 09:33:26 +01:00
|
|
|
be dropped, they would actually be dropped in this
|
|
|
|
method if commit=true. */
|
|
|
|
DBUG_RETURN(rollback_inplace_alter_table(
|
|
|
|
ha_alter_info, table, prebuilt));
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (!(ha_alter_info->handler_flags & ~INNOBASE_INPLACE_IGNORE)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!ctx0);
|
|
|
|
MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
|
2014-05-08 10:01:31 +02:00
|
|
|
ha_alter_info->group_commit_ctx = NULL;
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_RETURN(false);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(ctx0);
|
|
|
|
|
|
|
|
inplace_alter_handler_ctx** ctx_array;
|
|
|
|
inplace_alter_handler_ctx* ctx_single[2];
|
|
|
|
|
2014-05-08 10:01:31 +02:00
|
|
|
if (ha_alter_info->group_commit_ctx) {
|
|
|
|
ctx_array = ha_alter_info->group_commit_ctx;
|
|
|
|
} else {
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx_single[0] = ctx0;
|
|
|
|
ctx_single[1] = NULL;
|
|
|
|
ctx_array = ctx_single;
|
2014-05-08 10:01:31 +02:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
DBUG_ASSERT(ctx0 == ctx_array[0]);
|
|
|
|
ut_ad(prebuilt->table == ctx0->old_table);
|
2014-05-08 10:01:31 +02:00
|
|
|
ha_alter_info->group_commit_ctx = NULL;
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
/* Free the ctx->trx of other partitions, if any. We will only
|
|
|
|
use the ctx0->trx here. Others may have been allocated in
|
|
|
|
the prepare stage. */
|
|
|
|
|
|
|
|
for (inplace_alter_handler_ctx** pctx = &ctx_array[1]; *pctx;
|
|
|
|
pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
|
|
|
|
|
|
|
if (ctx->trx) {
|
|
|
|
trx_free_for_mysql(ctx->trx);
|
|
|
|
ctx->trx = NULL;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_start_if_not_started_xa(prebuilt->trx);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array; *pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
|
|
|
DBUG_ASSERT(ctx->prebuilt->trx == prebuilt->trx);
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Exclusively lock the table, to ensure that no other
|
|
|
|
transaction is holding locks on the table while we
|
|
|
|
change the table definition. The MySQL meta-data lock
|
|
|
|
should normally guarantee that no conflicting locks
|
|
|
|
exist. However, FOREIGN KEY constraints checks and any
|
|
|
|
transactions collected during crash recovery could be
|
|
|
|
holding InnoDB locks only, not MySQL locks. */
|
2014-02-01 09:33:26 +01:00
|
|
|
|
2015-12-13 10:11:49 +01:00
|
|
|
error = row_merge_lock_table(
|
2014-02-01 09:33:26 +01:00
|
|
|
prebuilt->trx, ctx->old_table, LOCK_X);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (error != DB_SUCCESS) {
|
2014-02-01 09:33:26 +01:00
|
|
|
my_error_innodb(
|
|
|
|
error, table_share->table_name.str, 0);
|
2013-03-25 23:03:13 +01:00
|
|
|
DBUG_RETURN(true);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2010-05-12 13:19:26 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DEBUG_SYNC(user_thd, "innodb_alter_commit_after_lock_table");
|
|
|
|
|
|
|
|
const bool new_clustered = ctx0->need_rebuild();
|
|
|
|
trx_t* trx = ctx0->trx;
|
|
|
|
bool fail = false;
|
|
|
|
|
|
|
|
if (new_clustered) {
|
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild());
|
|
|
|
|
|
|
|
if (ctx->old_table->fts) {
|
|
|
|
ut_ad(!ctx->old_table->fts->add_wq);
|
|
|
|
fts_optimize_remove_table(
|
|
|
|
ctx->old_table);
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 20:17:43 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
if (ctx->new_table->fts) {
|
|
|
|
ut_ad(!ctx->new_table->fts->add_wq);
|
|
|
|
fts_optimize_remove_table(
|
|
|
|
ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!trx) {
|
|
|
|
DBUG_ASSERT(!new_clustered);
|
2013-03-25 23:03:13 +01:00
|
|
|
trx = innobase_trx_allocate(user_thd);
|
2014-02-01 09:33:26 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
|
|
|
|
/* Latch the InnoDB data dictionary exclusively so that no deadlocks
|
|
|
|
or lock waits can happen in it during the data dictionary operation. */
|
|
|
|
row_mysql_lock_data_dictionary(trx);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Prevent the background statistics collection from accessing
|
|
|
|
the tables. */
|
|
|
|
for (;;) {
|
|
|
|
bool retry = false;
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(new_clustered == ctx->need_rebuild());
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered
|
|
|
|
&& !dict_stats_stop_bg(ctx->old_table)) {
|
|
|
|
retry = true;
|
|
|
|
}
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!dict_stats_stop_bg(ctx->new_table)) {
|
|
|
|
retry = true;
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (!retry) {
|
|
|
|
break;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
DICT_STATS_BG_YIELD(trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Apply the changes to the data dictionary tables, for all
|
|
|
|
partitions. */
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx && !fail; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(new_clustered == ctx->need_rebuild());
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ctx->max_autoinc = commit_get_autoinc(
|
|
|
|
ha_alter_info, ctx, altered_table, table);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (ctx->need_rebuild()) {
|
|
|
|
ctx->tmp_name = dict_mem_create_temporary_tablename(
|
|
|
|
ctx->heap, ctx->new_table->name,
|
|
|
|
ctx->new_table->id);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
fail = commit_try_rebuild(
|
|
|
|
ha_alter_info, ctx, altered_table, table,
|
|
|
|
trx, table_share->table_name.str);
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
2014-02-01 09:33:26 +01:00
|
|
|
fail = commit_try_norebuild(
|
|
|
|
ha_alter_info, ctx, table, trx,
|
|
|
|
table_share->table_name.str);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
|
|
|
#ifndef DBUG_OFF
|
|
|
|
{
|
|
|
|
/* Generate a dynamic dbug text. */
|
|
|
|
char buf[32];
|
|
|
|
ut_snprintf(buf, sizeof buf, "ib_commit_inplace_fail_%u",
|
|
|
|
failure_inject_count++);
|
|
|
|
DBUG_EXECUTE_IF(buf,
|
|
|
|
my_error(ER_INTERNAL_ERROR, MYF(0),
|
|
|
|
"Injected error!");
|
|
|
|
fail = true;
|
|
|
|
);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Commit or roll back the changes to the data dictionary. */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (fail) {
|
|
|
|
trx_rollback_for_mysql(trx);
|
|
|
|
} else if (!new_clustered) {
|
|
|
|
trx_commit_for_mysql(trx);
|
|
|
|
} else {
|
|
|
|
mtr_t mtr;
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
|
|
|
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild());
|
2015-12-13 10:11:49 +01:00
|
|
|
/* Check for any possible problems for any
|
|
|
|
file operations that will be performed in
|
|
|
|
commit_cache_rebuild(), and if none, generate
|
|
|
|
the redo log for these operations. */
|
|
|
|
error = fil_mtr_rename_log(ctx->old_table,
|
|
|
|
ctx->new_table,
|
|
|
|
ctx->tmp_name, &mtr);
|
|
|
|
if (error != DB_SUCCESS) {
|
|
|
|
/* Out of memory or a problem will occur
|
|
|
|
when renaming files. */
|
|
|
|
fail = true;
|
|
|
|
my_error_innodb(error, ctx->old_table->name,
|
|
|
|
ctx->old_table->flags);
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Test what happens on crash if the redo logs
|
|
|
|
are flushed to disk here. The log records
|
|
|
|
about the rename should not be committed, and
|
|
|
|
the data dictionary transaction should be
|
|
|
|
rolled back, restoring the old table. */
|
|
|
|
DBUG_EXECUTE_IF("innodb_alter_commit_crash_before_commit",
|
|
|
|
log_buffer_flush_to_disk();
|
|
|
|
DBUG_SUICIDE(););
|
|
|
|
ut_ad(!trx->fts_trx);
|
|
|
|
|
2015-12-13 10:11:49 +01:00
|
|
|
if (fail) {
|
|
|
|
mtr_set_log_mode(&mtr, MTR_LOG_NO_REDO);
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
trx_rollback_for_mysql(trx);
|
|
|
|
} else {
|
|
|
|
/* The following call commits the
|
|
|
|
mini-transaction, making the data dictionary
|
|
|
|
transaction committed at mtr.end_lsn. The
|
|
|
|
transaction becomes 'durable' by the time when
|
|
|
|
log_buffer_flush_to_disk() returns. In the
|
|
|
|
logical sense the commit in the file-based
|
|
|
|
data structures happens here. */
|
|
|
|
ut_ad(trx_state_eq(trx, TRX_STATE_ACTIVE));
|
|
|
|
ut_ad(trx->insert_undo || trx->update_undo);
|
|
|
|
|
|
|
|
trx_commit_low(trx, &mtr);
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
|
|
|
|
/* If server crashes here, the dictionary in
|
|
|
|
InnoDB and MySQL will differ. The .ibd files
|
|
|
|
and the .frm files must be swapped manually by
|
|
|
|
the administrator. No loss of data. */
|
|
|
|
DBUG_EXECUTE_IF("innodb_alter_commit_crash_after_commit",
|
|
|
|
log_buffer_flush_to_disk();
|
|
|
|
DBUG_SUICIDE(););
|
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Flush the log to reduce probability that the .frm files and
|
|
|
|
the InnoDB data dictionary get out-of-sync if the user runs
|
|
|
|
with innodb_flush_log_at_trx_commit = 0 */
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
log_buffer_flush_to_disk();
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* At this point, the changes to the persistent storage have
|
|
|
|
been committed or rolled back. What remains to be done is to
|
|
|
|
update the in-memory structures, close some handles, release
|
|
|
|
temporary files, and (unless we rolled back) update persistent
|
|
|
|
statistics. */
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>(*pctx);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
|
2011-06-01 10:06:55 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered) {
|
|
|
|
innobase_online_rebuild_log_free(ctx->old_table);
|
2011-06-01 10:06:55 +02:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (fail) {
|
2013-03-25 23:03:13 +01:00
|
|
|
if (new_clustered) {
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_close(ctx->new_table,
|
|
|
|
TRUE, FALSE);
|
|
|
|
|
|
|
|
#if defined UNIV_DEBUG || defined UNIV_DDL_DEBUG
|
|
|
|
/* Nobody should have initialized the
|
|
|
|
stats of the newly created table
|
|
|
|
yet. When this is the case, we know
|
|
|
|
that it has not been added for
|
|
|
|
background stats gathering. */
|
|
|
|
ut_a(!ctx->new_table->stat_initialized);
|
|
|
|
#endif /* UNIV_DEBUG || UNIV_DDL_DEBUG */
|
|
|
|
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_TABLE);
|
|
|
|
row_merge_drop_table(trx, ctx->new_table);
|
|
|
|
trx_commit_for_mysql(trx);
|
|
|
|
ctx->new_table = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
} else {
|
2014-02-01 09:33:26 +01:00
|
|
|
/* We failed, but did not rebuild the table.
|
|
|
|
Roll back any ADD INDEX, or get rid of garbage
|
|
|
|
ADD INDEX that was left over from a previous
|
|
|
|
ALTER TABLE statement. */
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
|
|
|
|
innobase_rollback_sec_index(
|
|
|
|
ctx->new_table, table, TRUE, trx);
|
|
|
|
trx_commit_for_mysql(trx);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash_fail",
|
|
|
|
crash_fail_inject_count++);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
continue;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_copy_frm_flags_from_table_share(
|
|
|
|
ctx->new_table, altered_table->s);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered) {
|
|
|
|
/* We will reload and refresh the
|
|
|
|
in-memory foreign key constraint
|
|
|
|
metadata. This is a rename operation
|
|
|
|
in preparing for dropping the old
|
|
|
|
table. Set the table to_be_dropped bit
|
|
|
|
here, so to make sure DML foreign key
|
|
|
|
constraint check does not use the
|
|
|
|
stale dict_foreign_t. This is done
|
|
|
|
because WL#6049 (FK MDL) has not been
|
|
|
|
implemented yet. */
|
|
|
|
ctx->old_table->to_be_dropped = true;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Rename the tablespace files. */
|
|
|
|
commit_cache_rebuild(ctx);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-11-18 17:41:12 +01:00
|
|
|
error = innobase_update_foreign_cache(ctx, user_thd);
|
2013-03-25 23:03:13 +01:00
|
|
|
if (error != DB_SUCCESS) {
|
2014-02-01 09:33:26 +01:00
|
|
|
goto foreign_fail;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
} else {
|
2014-11-18 17:41:12 +01:00
|
|
|
error = innobase_update_foreign_cache(ctx, user_thd);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (error != DB_SUCCESS) {
|
2014-02-01 09:33:26 +01:00
|
|
|
foreign_fail:
|
|
|
|
/* The data dictionary cache
|
|
|
|
should be corrupted now. The
|
|
|
|
best solution should be to
|
|
|
|
kill and restart the server,
|
|
|
|
but the *.frm file has not
|
|
|
|
been replaced yet. */
|
|
|
|
my_error(ER_CANNOT_ADD_FOREIGN,
|
|
|
|
MYF(0));
|
2013-03-25 23:03:13 +01:00
|
|
|
sql_print_error(
|
2014-02-01 09:33:26 +01:00
|
|
|
"InnoDB: dict_load_foreigns()"
|
|
|
|
" returned %u for %s",
|
|
|
|
(unsigned) error,
|
|
|
|
thd_query_string(user_thd)
|
|
|
|
->str);
|
|
|
|
ut_ad(0);
|
|
|
|
} else {
|
|
|
|
if (!commit_cache_norebuild(
|
|
|
|
ctx, table, trx)) {
|
|
|
|
ut_a(!prebuilt->trx->check_foreigns);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
innobase_rename_columns_cache(
|
|
|
|
ha_alter_info, table,
|
|
|
|
ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Invalidate the index translation table. In partitioned
|
|
|
|
tables, there is one TABLE_SHARE (and also only one TABLE)
|
|
|
|
covering all partitions. */
|
|
|
|
share->idx_trans_tbl.index_count = 0;
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (trx == ctx0->trx) {
|
|
|
|
ctx0->trx = NULL;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Tell the InnoDB server that there might be work for
|
|
|
|
utility threads: */
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
srv_active_wake_master_thread();
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (fail) {
|
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(*pctx);
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
ctx->old_table,
|
|
|
|
CHECK_ABORTED_OK));
|
|
|
|
ut_a(fts_check_cached_index(ctx->old_table));
|
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash_fail",
|
|
|
|
crash_fail_inject_count++);
|
|
|
|
}
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_mysql_unlock_data_dictionary(trx);
|
|
|
|
trx_free_for_mysql(trx);
|
|
|
|
DBUG_RETURN(true);
|
|
|
|
}
|
2008-01-09 14:03:51 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Release the table locks. */
|
|
|
|
trx_commit_for_mysql(prebuilt->trx);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_EXECUTE_IF("ib_ddl_crash_after_user_trx_commit", DBUG_SUICIDE(););
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(*pctx);
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild() == new_clustered);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (altered_table->found_next_number_field) {
|
|
|
|
dict_table_t* t = ctx->new_table;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
dict_table_autoinc_lock(t);
|
|
|
|
dict_table_autoinc_initialize(t, ctx->max_autoinc);
|
|
|
|
dict_table_autoinc_unlock(t);
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
bool add_fts = false;
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* Publish the created fulltext index, if any.
|
|
|
|
Note that a fulltext index can be created without
|
|
|
|
creating the clustered index, if there already exists
|
|
|
|
a suitable FTS_DOC_ID column. If not, one will be
|
|
|
|
created, implying new_clustered */
|
2014-02-01 09:33:26 +01:00
|
|
|
for (ulint i = 0; i < ctx->num_to_add_index; i++) {
|
|
|
|
dict_index_t* index = ctx->add_index[i];
|
2013-03-25 23:03:13 +01:00
|
|
|
|
|
|
|
if (index->type & DICT_FTS) {
|
|
|
|
DBUG_ASSERT(index->type == DICT_FTS);
|
2014-02-26 19:23:04 +01:00
|
|
|
/* We reset DICT_TF2_FTS here because the bit
|
|
|
|
is left unset when a drop proceeds the add. */
|
|
|
|
DICT_TF2_FLAG_SET(ctx->new_table, DICT_TF2_FTS);
|
2014-02-01 09:33:26 +01:00
|
|
|
fts_add_index(index, ctx->new_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
add_fts = true;
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
2008-09-17 21:52:30 +02:00
|
|
|
}
|
2008-01-09 14:03:51 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
ctx->new_table, CHECK_ALL_COMPLETE));
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (add_fts) {
|
|
|
|
fts_optimize_add_table(ctx->new_table);
|
|
|
|
}
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
ut_d(dict_table_check_for_dup_indexes(
|
|
|
|
ctx->new_table, CHECK_ABORTED_OK));
|
|
|
|
ut_a(fts_check_cached_index(ctx->new_table));
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered) {
|
|
|
|
/* Since the table has been rebuilt, we remove
|
|
|
|
all persistent statistics corresponding to the
|
|
|
|
old copy of the table (which was renamed to
|
|
|
|
ctx->tmp_name). */
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
char errstr[1024];
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(0 == strcmp(ctx->old_table->name,
|
|
|
|
ctx->tmp_name));
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (dict_stats_drop_table(
|
|
|
|
ctx->new_table->name,
|
|
|
|
errstr, sizeof(errstr))
|
|
|
|
!= DB_SUCCESS) {
|
|
|
|
push_warning_printf(
|
|
|
|
user_thd,
|
|
|
|
Sql_condition::WARN_LEVEL_WARN,
|
|
|
|
ER_ALTER_INFO,
|
|
|
|
"Deleting persistent statistics"
|
|
|
|
" for rebuilt table '%s' in"
|
|
|
|
" InnoDB failed: %s",
|
|
|
|
table->s->table_name.str,
|
|
|
|
errstr);
|
2008-09-17 21:52:30 +02:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_EXECUTE_IF("ib_ddl_crash_before_commit",
|
|
|
|
DBUG_SUICIDE(););
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
trx_t* const user_trx = prebuilt->trx;
|
2008-09-17 21:52:30 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
row_prebuilt_free(ctx->prebuilt, TRUE);
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Drop the copy of the old table, which was
|
|
|
|
renamed to ctx->tmp_name at the atomic DDL
|
|
|
|
transaction commit. If the system crashes
|
|
|
|
before this is completed, some orphan tables
|
|
|
|
with ctx->tmp_name may be recovered. */
|
|
|
|
trx_start_for_ddl(trx, TRX_DICT_OP_TABLE);
|
|
|
|
row_merge_drop_table(trx, ctx->old_table);
|
2013-03-25 23:03:13 +01:00
|
|
|
trx_commit_for_mysql(trx);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* Rebuild the prebuilt object. */
|
|
|
|
ctx->prebuilt = row_create_prebuilt(
|
|
|
|
ctx->new_table, altered_table->s->reclength);
|
|
|
|
trx_start_if_not_started(user_trx);
|
|
|
|
user_trx->will_lock++;
|
|
|
|
prebuilt->trx = user_trx;
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
row_mysql_unlock_data_dictionary(trx);
|
|
|
|
trx_free_for_mysql(trx);
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* TODO: The following code could be executed
|
|
|
|
while allowing concurrent access to the table
|
|
|
|
(MDL downgrade). */
|
2013-03-25 23:03:13 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
if (new_clustered) {
|
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(*pctx);
|
|
|
|
DBUG_ASSERT(ctx->need_rebuild());
|
|
|
|
|
|
|
|
alter_stats_rebuild(
|
|
|
|
ctx->new_table, table->s->table_name.str,
|
|
|
|
user_thd);
|
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
2012-08-01 16:27:34 +02:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
} else {
|
|
|
|
for (inplace_alter_handler_ctx** pctx = ctx_array;
|
|
|
|
*pctx; pctx++) {
|
|
|
|
ha_innobase_inplace_ctx* ctx
|
|
|
|
= static_cast<ha_innobase_inplace_ctx*>
|
|
|
|
(*pctx);
|
|
|
|
DBUG_ASSERT(!ctx->need_rebuild());
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
alter_stats_norebuild(
|
|
|
|
ha_alter_info, ctx, altered_table,
|
|
|
|
table->s->table_name.str, user_thd);
|
|
|
|
DBUG_INJECT_CRASH("ib_commit_inplace_crash",
|
|
|
|
crash_inject_count++);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
branches/zip: Fast index creation: Remove the ROW_PREBUILT_OBSOLETE nonsense.
Active transactions must not switch table or index definitions on the fly,
for several reasons, including the following:
* copied indexes do not carry any history or locking information;
that is, rollbacks, read views, and record locking would be broken
* huge potential for race conditions, inconsistent reads and writes,
loss of data, and corruption
Instead of trying to track down if the table was changed during a transaction,
acquire appropriate locks that protect the creation and dropping of indexes.
innodb-index.test: Test the locking of CREATE INDEX and DROP INDEX. Test
that consistent reads work across dropped indexes.
lock_rec_insert_check_and_lock(): Relax the lock_table_has() assertion.
When inserting a record into an index, the table must be at least IX-locked.
However, when an index is being created, an IS-lock on the table is
sufficient.
row_merge_lock_table(): Add the parameter enum lock_mode mode, which must
be LOCK_X or LOCK_S.
row_merge_drop_table(): Assert that n_mysql_handles_opened == 0.
Unconditionally drop the table.
ha_innobase::add_index(): Acquire an X or S lock on the table, as appropriate.
After acquiring an X lock, assert that n_mysql_handles_opened == 1.
Remove the comments about dropping tables in the background.
ha_innobase::final_drop_index(): Acquire an X lock on the table.
dict_table_t: Remove version_number, to_be_dropped, and prebuilts.
ins_node_t: Remove table_version_number.
enum lock_mode: Move the definition from lock0lock.h to lock0types.h.
ROW_PREBUILT_OBSOLETE, row_update_prebuilt(), row_prebuilt_table_obsolete():
Remove.
row_prebuilt_t: Remove the declaration from row0types.h.
row_drop_table_for_mysql_no_commit(): Always print a warning if a table
was added to the background drop queue.
2007-12-17 16:49:59 +01:00
|
|
|
}
|
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
/* TODO: Also perform DROP TABLE and DROP INDEX after
|
|
|
|
the MDL downgrade. */
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
#ifndef DBUG_OFF
|
|
|
|
dict_index_t* clust_index = dict_table_get_first_index(
|
|
|
|
prebuilt->table);
|
|
|
|
DBUG_ASSERT(!clust_index->online_log);
|
|
|
|
DBUG_ASSERT(dict_index_get_online_status(clust_index)
|
|
|
|
== ONLINE_INDEX_COMPLETE);
|
|
|
|
|
|
|
|
for (dict_index_t* index = dict_table_get_first_index(
|
|
|
|
prebuilt->table);
|
|
|
|
index;
|
|
|
|
index = dict_table_get_next_index(index)) {
|
2014-02-01 09:33:26 +01:00
|
|
|
DBUG_ASSERT(!index->to_be_dropped);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2014-02-01 09:33:26 +01:00
|
|
|
#endif /* DBUG_OFF */
|
branches/innodb+: Merge revisions 6504:6560 from branches/zip:
------------------------------------------------------------------------
r6521 | marko | 2010-01-27 10:49:01 +0200 (Wed, 27 Jan 2010) | 17 lines
branches/zip: Drop temporary tables at startup.
This addresses the third aspect of Bug #41609.
row_mysql_drop_temp_tables(): New function, to drop all temporary
tables. These can be distinguished by the least significant bit of
MIX_LEN. However, we will skip ROW_FORMAT=REDUNDANT tables, because in
the records for those tables, that bit may be garbage.
recv_recovery_from_checkpoint_finish(): Invoke
row_mysql_drop_temp_tables(). Normally, if the .frm files for the
temporary tables exist at startup, MySQL will ask InnoDB to drop the
temporary tables. However, if the files are deleted, for instance, by
the boot scripts of the operating system, the tables would remain in
the InnoDB data dictionary unless someone digs them up by
innodb_table_monitor and creates .frm files for dropping the tables.
rb://221 approved by Sunny Bains.
------------------------------------------------------------------------
r6525 | marko | 2010-01-28 16:23:15 +0200 (Thu, 28 Jan 2010) | 11 lines
branches/zip: buf_LRU_invalidate_tablespace(): Do not unnecessarily
acquire the block_mutex for every block in the LRU list. Only acquire
it when holding buf_pool_mutex is not sufficient. This should speed up
the function and considerably reduce traffic on the memory bus and
caches.
I noticed this deficiency when working on Issue #157.
This deficiency popped up again in Issue #449 (Bug #35077),
which this fix does not fully address.
rb://78 revision 1 approved by Heikki Tuuri.
------------------------------------------------------------------------
r6526 | jyang | 2010-01-28 18:12:40 +0200 (Thu, 28 Jan 2010) | 8 lines
branches/zip: Add index translation table to map mysql index
number to InnoDB index structure directly. Fix Bug #47622:
"the new index is added before the existing ones in MySQL,
but after one in SE".
rb://215, approved by Marko
------------------------------------------------------------------------
r6527 | vasil | 2010-01-29 14:39:48 +0200 (Fri, 29 Jan 2010) | 6 lines
branches/zip:
Extend the comment about row_mysql_handle_errors().
Suggested by: Heikki
------------------------------------------------------------------------
r6533 | calvin | 2010-01-29 23:31:59 +0200 (Fri, 29 Jan 2010) | 4 lines
branches/zip: remove duplicated copyright and license info.
------------------------------------------------------------------------
r6534 | sunny | 2010-01-29 23:42:49 +0200 (Fri, 29 Jan 2010) | 15 lines
branches/zip: Two changes to fix the problem:
1. First scan the joining transaction's locks and check if no other
transaction is waiting for a lock held by the joining transaction.
If no other transaction is waiting then no deadlock an occur and
we avoid doing an exhaustive search.
2. Change the direction of the lock traversal from backward to forward.
Previously we traversed backward from the lock that has to wait, the function
to that fetched the previous node was very inefficient resulting in O(n^2)
access to the rec lock list.
Fix Bug #49047 InnoDB deadlock detection is CPU intensive with many locks on a single row.
rb://218
------------------------------------------------------------------------
r6539 | marko | 2010-02-01 11:31:12 +0200 (Mon, 01 Feb 2010) | 75 lines
branches/zip: Merge revisions 6471:6538 from branches/5.1:
------------------------------------------------------------------------
r6488 | sunny | 2010-01-21 02:55:08 +0200 (Thu, 21 Jan 2010) | 2 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
into a separate test/result files.
------------------------------------------------------------------------
r6489 | sunny | 2010-01-21 02:57:50 +0200 (Thu, 21 Jan 2010) | 2 lines
Changed paths:
A /branches/5.1/mysql-test/innodb-autoinc-44030.result
A /branches/5.1/mysql-test/innodb-autoinc-44030.test
branches/5.1: Factor out test for bug#44030 from innodb-autoinc.test
into a separate test/result files.
------------------------------------------------------------------------
r6492 | sunny | 2010-01-21 09:38:35 +0200 (Thu, 21 Jan 2010) | 1 line
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc-44030.test
branches/5.1: Add reference to bug#47621 in the comment.
------------------------------------------------------------------------
r6535 | sunny | 2010-01-30 00:08:40 +0200 (Sat, 30 Jan 2010) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Undo the change from r6424. We need to return DB_SUCCESS even
if we were unable to initialize the tabe autoinc value. This is required for
the open to succeed. The only condition we currently treat as a hard error
is if the autoinc field instance passed in by MySQL is NULL.
Previously if the table autoinc value was 0 and the next value was requested
we had an assertion that would fail. Change that assertion and treat a value
of 0 to mean that the autoinc system is unavailable. Generation of next
value will now return failure.
rb://237
------------------------------------------------------------------------
r6536 | sunny | 2010-01-30 00:13:42 +0200 (Sat, 30 Jan 2010) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Check *first_value everytime against the column max
value and set *first_value to next autoinc if it's > col max value.
ie. not rely on what is passed in from MySQL.
[49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
rb://236
------------------------------------------------------------------------
r6537 | sunny | 2010-01-30 00:35:00 +0200 (Sat, 30 Jan 2010) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Undo r6536.
------------------------------------------------------------------------
r6538 | sunny | 2010-01-30 00:43:06 +0200 (Sat, 30 Jan 2010) | 6 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Check *first_value every time against the column max
value and set *first_value to next autoinc if it's > col max value.
ie. not rely on what is passed in from MySQL.
[49497] Error 1467 (ER_AUTOINC_READ_FAILED) on inserting a negative value
rb://236
------------------------------------------------------------------------
------------------------------------------------------------------------
r6540 | marko | 2010-02-01 11:35:13 +0200 (Mon, 01 Feb 2010) | 1 line
branches/zip: ChangeLog: Document the merge of 6471:6538 from branches/5.1.
------------------------------------------------------------------------
r6546 | jyang | 2010-02-03 11:05:24 +0200 (Wed, 03 Feb 2010) | 9 lines
branches/zip: Relax assertion on the number of index defined
in InnoDB must be comparable with that of MySQL to tolerate
possible dictionary inconsistency. Fix Mantis issue #455,
"UNIV_DEBUG+ assert ha_innodb.cc:3152 ib_num_index >=
mysql_num_index".
rb://248 Approved by Marko.
------------------------------------------------------------------------
r6547 | marko | 2010-02-03 14:43:38 +0200 (Wed, 03 Feb 2010) | 14 lines
branches/zip: Clean up CHECK TABLE error handling. (Issue #220)
ha_innobase::change_active_index(): Clean up code formatting.
ha_innobase::check(): Incorporate the code from
row_check_table_for_mysql(). Report errors to the client connection
instead of writing them to the error log.
row_check_table_for_mysql(): Remove.
row_check_index_for_mysql(): Renamed from row_scan_and_check_index().
Let the caller initialize prebuilt, and assume that the index is usable.
rb://178 approved by Sunny Bains
------------------------------------------------------------------------
r6548 | marko | 2010-02-03 15:01:39 +0200 (Wed, 03 Feb 2010) | 11 lines
branches/zip: buf_LRU_invalidate_tablespace(): Ensure that prev_bpage
is not relocated when freeing a compressed block. This avoids the
costly rescan of the LRU list. (Bug #35077, Issue #449)
At most one buffer-fix will be active at a time, affecting two blocks:
the buf_page_t and the compressed page frame. This should not block
the memory defragmentation in buf0buddy.c too much. In fact, it may
avoid unnecessary copying if also prev_bpage belongs to the tablespace
that is being invalidated.
rb://240
------------------------------------------------------------------------
r6559 | marko | 2010-02-04 13:21:18 +0200 (Thu, 04 Feb 2010) | 14 lines
branches/zip: Pass the file name and line number of the caller of the
b-tree cursor functions to the buffer pool requests, in order to make
the latch diagnostics more accurate.
buf_page_optimistic_get_func(): Renamed to buf_page_optimistic_get().
btr_page_get_father_node_ptr(), btr_insert_on_non_leaf_level(),
btr_pcur_open(), btr_pcur_open_with_no_init(), btr_pcur_open_on_user_rec(),
btr_pcur_open_at_rnd_pos(), btr_pcur_restore_position(),
btr_cur_open_at_index_side(), btr_cur_open_at_rnd_pos():
Rename the function to _func and add the parameters file, line.
Define wrapper macros with __FILE__, __LINE__.
btr_cur_search_to_nth_level(): Add the parameters file, line.
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
2010-02-04 15:29:14 +01:00
|
|
|
|
2014-02-01 09:33:26 +01:00
|
|
|
MONITOR_ATOMIC_DEC(MONITOR_PENDING_ALTER_TABLE);
|
|
|
|
DBUG_RETURN(false);
|
2013-03-25 23:03:13 +01:00
|
|
|
}
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/**
|
|
|
|
@param thd - the session
|
|
|
|
@param start_value - the lower bound
|
|
|
|
@param max_value - the upper bound (inclusive) */
|
2014-02-01 09:33:26 +01:00
|
|
|
UNIV_INTERN
|
2013-03-25 23:03:13 +01:00
|
|
|
ib_sequence_t::ib_sequence_t(
|
|
|
|
THD* thd,
|
|
|
|
ulonglong start_value,
|
|
|
|
ulonglong max_value)
|
|
|
|
:
|
|
|
|
m_max_value(max_value),
|
|
|
|
m_increment(0),
|
|
|
|
m_offset(0),
|
|
|
|
m_next_value(start_value),
|
|
|
|
m_eof(false)
|
|
|
|
{
|
|
|
|
if (thd != 0 && m_max_value > 0) {
|
2012-08-01 16:27:34 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
thd_get_autoinc(thd, &m_offset, &m_increment);
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
if (m_increment > 1 || m_offset > 1) {
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/* If there is an offset or increment specified
|
|
|
|
then we need to work out the exact next value. */
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
m_next_value = innobase_next_autoinc(
|
|
|
|
start_value, 1,
|
|
|
|
m_increment, m_offset, m_max_value);
|
2007-11-29 11:34:55 +01:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
} else if (start_value == 0) {
|
|
|
|
/* The next value can never be 0. */
|
|
|
|
m_next_value = 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
m_eof = true;
|
|
|
|
}
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
/**
|
|
|
|
Postfix increment
|
|
|
|
@return the next value to insert */
|
2014-02-01 09:33:26 +01:00
|
|
|
UNIV_INTERN
|
2013-03-25 23:03:13 +01:00
|
|
|
ulonglong
|
|
|
|
ib_sequence_t::operator++(int) UNIV_NOTHROW
|
|
|
|
{
|
|
|
|
ulonglong current = m_next_value;
|
|
|
|
|
|
|
|
ut_ad(!m_eof);
|
|
|
|
ut_ad(m_max_value > 0);
|
|
|
|
|
|
|
|
m_next_value = innobase_next_autoinc(
|
|
|
|
current, 1, m_increment, m_offset, m_max_value);
|
|
|
|
|
|
|
|
if (m_next_value == m_max_value && current == m_next_value) {
|
|
|
|
m_eof = true;
|
|
|
|
}
|
2007-09-13 11:31:54 +02:00
|
|
|
|
2013-03-25 23:03:13 +01:00
|
|
|
return(current);
|
2007-09-13 11:31:54 +02:00
|
|
|
}
|