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 08:32:21 +00:00
|
|
|
/*****************************************************************************
|
|
|
|
|
|
|
|
Copyright (c) 2007, 2009, Innobase Oy. All Rights Reserved.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify it under
|
|
|
|
the terms of the GNU General Public License as published by the Free Software
|
|
|
|
Foundation; version 2 of the License.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
|
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License along with
|
|
|
|
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
|
Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/******************************************************
|
|
|
|
INFORMATION SCHEMA innodb_trx, innodb_locks and
|
|
|
|
innodb_lock_waits tables fetch code.
|
|
|
|
|
|
|
|
The code below fetches information needed to fill those
|
|
|
|
3 dynamic tables and uploads it into a "transactions
|
|
|
|
table cache" for later retrieval.
|
|
|
|
|
|
|
|
Created July 17, 2007 Vasil Dimov
|
|
|
|
*******************************************************/
|
|
|
|
|
|
|
|
#include <mysql/plugin.h>
|
|
|
|
|
2007-11-07 14:14:33 +00:00
|
|
|
#include "mysql_addons.h"
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
#include "univ.i"
|
2007-10-29 13:03:53 +00:00
|
|
|
#include "buf0buf.h"
|
|
|
|
#include "dict0dict.h"
|
2007-09-24 12:25:06 +00:00
|
|
|
#include "ha0storage.h"
|
2007-12-17 10:10:39 +00:00
|
|
|
#include "ha_prototypes.h"
|
2007-09-20 11:23:44 +00:00
|
|
|
#include "hash0hash.h"
|
|
|
|
#include "lock0iter.h"
|
|
|
|
#include "lock0lock.h"
|
|
|
|
#include "mem0mem.h"
|
2007-10-29 13:03:53 +00:00
|
|
|
#include "page0page.h"
|
|
|
|
#include "rem0rec.h"
|
|
|
|
#include "row0row.h"
|
2007-09-20 11:23:44 +00:00
|
|
|
#include "srv0srv.h"
|
|
|
|
#include "sync0rw.h"
|
|
|
|
#include "sync0sync.h"
|
|
|
|
#include "sync0types.h"
|
|
|
|
#include "trx0i_s.h"
|
|
|
|
#include "trx0sys.h"
|
|
|
|
#include "trx0trx.h"
|
|
|
|
#include "ut0mem.h"
|
|
|
|
#include "ut0ut.h"
|
|
|
|
|
|
|
|
#define TABLE_CACHE_INITIAL_ROWSNUM 1024
|
|
|
|
|
|
|
|
/* Table cache's rows are stored in a set of chunks. When a new row is
|
|
|
|
added a new chunk is allocated if necessary. MEM_CHUNKS_IN_TABLE_CACHE
|
|
|
|
specifies the maximum number of chunks.
|
|
|
|
Assuming that the first one is 1024 rows (TABLE_CACHE_INITIAL_ROWSNUM)
|
|
|
|
and each subsequent is N/2 where N is the number of rows we have
|
|
|
|
allocated till now, then 39th chunk would have 1677416425 number of rows
|
|
|
|
and all chunks would have 3354832851 number of rows. */
|
|
|
|
#define MEM_CHUNKS_IN_TABLE_CACHE 39
|
|
|
|
|
|
|
|
/* The following are some testing auxiliary macros. Do not enable them
|
|
|
|
in a production environment. */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* If this is enabled then lock folds will always be different
|
|
|
|
resulting in equal rows being put in a different cells of the hash
|
|
|
|
table. Checking for duplicates will be flawed because different
|
|
|
|
fold will be calculated when a row is searched in the hash table. */
|
|
|
|
#define TEST_LOCK_FOLD_ALWAYS_DIFFERENT
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
2007-09-22 08:36:59 +00:00
|
|
|
/* This effectively kills the search-for-duplicate-before-adding-a-row
|
|
|
|
function, but searching in the hash is still performed. It will always
|
|
|
|
be assumed that lock is not present and insertion will be performed in
|
|
|
|
the hash table. */
|
2007-09-20 11:23:44 +00:00
|
|
|
#define TEST_NO_LOCKS_ROW_IS_EVER_EQUAL_TO_LOCK_T
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* This aggressively repeats adding each row many times. Depending on
|
|
|
|
the above settings this may be noop or may result in lots of rows being
|
|
|
|
added. */
|
|
|
|
#define TEST_ADD_EACH_LOCKS_ROW_MANY_TIMES
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* Very similar to TEST_NO_LOCKS_ROW_IS_EVER_EQUAL_TO_LOCK_T but hash
|
|
|
|
table search is not performed at all. */
|
|
|
|
#define TEST_DO_NOT_CHECK_FOR_DUPLICATE_ROWS
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* Do not insert each row into the hash table, duplicates may appear
|
|
|
|
if this is enabled, also if this is enabled searching into the hash is
|
|
|
|
noop because it will be empty. */
|
|
|
|
#define TEST_DO_NOT_INSERT_INTO_THE_HASH_TABLE
|
|
|
|
#endif
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
#define MAX_ALLOWED_FOR_STORAGE(cache) \
|
|
|
|
(TRX_I_S_MEM_LIMIT \
|
|
|
|
- (cache)->mem_allocd)
|
|
|
|
|
|
|
|
#define MAX_ALLOWED_FOR_ALLOC(cache) \
|
|
|
|
(TRX_I_S_MEM_LIMIT \
|
|
|
|
- (cache)->mem_allocd \
|
|
|
|
- ha_storage_get_size((cache)->storage))
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* Memory for each table in the intermediate buffer is allocated in
|
|
|
|
separate chunks. These chunks are considered to be concatenated to
|
|
|
|
represent one flat array of rows. */
|
|
|
|
typedef struct i_s_mem_chunk_struct {
|
|
|
|
ulint offset; /* offset, in number of rows */
|
|
|
|
ulint rows_allocd; /* the size of this chunk, in number
|
|
|
|
of rows */
|
|
|
|
void* base; /* start of the chunk */
|
|
|
|
} i_s_mem_chunk_t;
|
|
|
|
|
|
|
|
/* This represents one table's cache. */
|
|
|
|
typedef struct i_s_table_cache_struct {
|
2008-05-14 15:43:19 +00:00
|
|
|
ulint rows_used; /* number of used rows */
|
|
|
|
ulint rows_allocd; /* number of allocated rows */
|
2007-09-20 11:23:44 +00:00
|
|
|
ulint row_size; /* size of a single row */
|
|
|
|
i_s_mem_chunk_t chunks[MEM_CHUNKS_IN_TABLE_CACHE]; /* array of
|
|
|
|
memory chunks that stores the
|
|
|
|
rows */
|
|
|
|
} i_s_table_cache_t;
|
|
|
|
|
|
|
|
/* This structure describes the intermediate buffer */
|
|
|
|
struct trx_i_s_cache_struct {
|
|
|
|
rw_lock_t rw_lock; /* read-write lock protecting
|
|
|
|
the rest of this structure */
|
|
|
|
ullint last_read; /* last time the cache was read;
|
|
|
|
measured in microseconds since
|
|
|
|
epoch */
|
|
|
|
mutex_t last_read_mutex;/* mutex protecting the
|
|
|
|
last_read member - it is updated
|
|
|
|
inside a shared lock of the
|
|
|
|
rw_lock member */
|
|
|
|
i_s_table_cache_t innodb_trx; /* innodb_trx table */
|
|
|
|
i_s_table_cache_t innodb_locks; /* innodb_locks table */
|
|
|
|
i_s_table_cache_t innodb_lock_waits;/* innodb_lock_waits table */
|
|
|
|
/* the hash table size is LOCKS_HASH_CELLS_NUM * sizeof(void*) bytes */
|
2007-09-24 12:25:06 +00:00
|
|
|
#define LOCKS_HASH_CELLS_NUM 10000
|
2007-09-20 11:23:44 +00:00
|
|
|
hash_table_t* locks_hash; /* hash table used to eliminate
|
|
|
|
duplicate entries in the
|
|
|
|
innodb_locks table */
|
2007-09-24 12:25:06 +00:00
|
|
|
#define CACHE_STORAGE_INITIAL_SIZE 1024
|
|
|
|
#define CACHE_STORAGE_HASH_CELLS 2048
|
|
|
|
ha_storage_t* storage; /* storage for external volatile
|
|
|
|
data that can possibly not be
|
|
|
|
available later, when we release
|
|
|
|
the kernel mutex */
|
2007-11-16 13:12:13 +00:00
|
|
|
ulint mem_allocd; /* the amount of memory
|
|
|
|
allocated with mem_alloc*() */
|
|
|
|
ibool is_truncated; /* this is TRUE if the memory
|
|
|
|
limit was hit and thus the data
|
|
|
|
in the cache is truncated */
|
2007-09-20 11:23:44 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* This is the intermediate buffer where data needed to fill the
|
|
|
|
INFORMATION SCHEMA tables is fetched and later retrieved by the C++
|
|
|
|
code in handler/i_s.cc. */
|
|
|
|
static trx_i_s_cache_t trx_i_s_cache_static;
|
2008-02-06 16:11:46 +00:00
|
|
|
UNIV_INTERN trx_i_s_cache_t* trx_i_s_cache = &trx_i_s_cache_static;
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
For a record lock that is in waiting state retrieves the only bit that
|
2009-05-25 06:46:10 +00:00
|
|
|
is set, for a table lock returns ULINT_UNDEFINED.
|
|
|
|
@return record number within the heap */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
wait_lock_get_heap_no(
|
|
|
|
/*==================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const lock_t* lock) /*!< in: lock */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
ulint ret;
|
|
|
|
|
|
|
|
switch (lock_get_type(lock)) {
|
|
|
|
case LOCK_REC:
|
|
|
|
ret = lock_rec_find_set_bit(lock);
|
|
|
|
ut_a(ret != ULINT_UNDEFINED);
|
|
|
|
break;
|
|
|
|
case LOCK_TABLE:
|
|
|
|
ret = ULINT_UNDEFINED;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Initializes the members of a table cache. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
table_cache_init(
|
|
|
|
/*=============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
i_s_table_cache_t* table_cache, /*!< out: table cache */
|
|
|
|
size_t row_size) /*!< in: the size of a
|
2007-09-20 11:23:44 +00:00
|
|
|
row */
|
|
|
|
{
|
2007-09-22 08:34:26 +00:00
|
|
|
ulint i;
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
table_cache->rows_used = 0;
|
|
|
|
table_cache->rows_allocd = 0;
|
|
|
|
table_cache->row_size = row_size;
|
|
|
|
|
2007-09-22 08:34:26 +00:00
|
|
|
for (i = 0; i < MEM_CHUNKS_IN_TABLE_CACHE; i++) {
|
|
|
|
|
|
|
|
/* the memory is actually allocated in
|
|
|
|
table_cache_create_empty_row() */
|
|
|
|
table_cache->chunks[i].base = NULL;
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Returns an empty row from a table cache. The row is allocated if no more
|
2007-11-16 13:12:13 +00:00
|
|
|
empty rows are available. The number of used rows is incremented.
|
|
|
|
If the memory limit is hit then NULL is returned and nothing is
|
2009-05-25 06:46:10 +00:00
|
|
|
allocated.
|
|
|
|
@return empty row, or NULL if out of memory */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
void*
|
|
|
|
table_cache_create_empty_row(
|
|
|
|
/*=========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
i_s_table_cache_t* table_cache, /*!< in/out: table cache */
|
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache to record
|
2007-11-16 13:12:13 +00:00
|
|
|
how many bytes are
|
|
|
|
allocated */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
void* row;
|
|
|
|
|
|
|
|
ut_a(table_cache->rows_used <= table_cache->rows_allocd);
|
|
|
|
|
|
|
|
if (table_cache->rows_used == table_cache->rows_allocd) {
|
|
|
|
|
|
|
|
/* rows_used == rows_allocd means that new chunk needs
|
|
|
|
to be allocated: either no more empty rows in the
|
|
|
|
last allocated chunk or nothing has been allocated yet
|
|
|
|
(rows_num == rows_allocd == 0); */
|
|
|
|
|
2007-09-22 08:34:26 +00:00
|
|
|
i_s_mem_chunk_t* chunk;
|
|
|
|
ulint req_bytes;
|
|
|
|
ulint got_bytes;
|
|
|
|
ulint req_rows;
|
|
|
|
ulint got_rows;
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* find the first not allocated chunk */
|
|
|
|
for (i = 0; i < MEM_CHUNKS_IN_TABLE_CACHE; i++) {
|
|
|
|
|
|
|
|
if (table_cache->chunks[i].base == NULL) {
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* i == MEM_CHUNKS_IN_TABLE_CACHE means that all chunks
|
|
|
|
have been allocated :-X */
|
|
|
|
ut_a(i < MEM_CHUNKS_IN_TABLE_CACHE);
|
|
|
|
|
2007-09-22 08:34:26 +00:00
|
|
|
/* allocate the chunk we just found */
|
|
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
|
|
|
|
/* first chunk, nothing is allocated yet */
|
|
|
|
req_rows = TABLE_CACHE_INITIAL_ROWSNUM;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
/* Memory is increased by the formula
|
|
|
|
new = old + old / 2; We are trying not to be
|
|
|
|
aggressive here (= using the common new = old * 2)
|
|
|
|
because the allocated memory will not be freed
|
|
|
|
until InnoDB exit (it is reused). So it is better
|
|
|
|
to once allocate the memory in more steps, but
|
|
|
|
have less unused/wasted memory than to use less
|
|
|
|
steps in allocation (which is done once in a
|
|
|
|
lifetime) but end up with lots of unused/wasted
|
|
|
|
memory. */
|
|
|
|
req_rows = table_cache->rows_allocd / 2;
|
|
|
|
}
|
|
|
|
req_bytes = req_rows * table_cache->row_size;
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
if (req_bytes > MAX_ALLOWED_FOR_ALLOC(cache)) {
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
2007-09-22 08:34:26 +00:00
|
|
|
chunk = &table_cache->chunks[i];
|
|
|
|
|
|
|
|
chunk->base = mem_alloc2(req_bytes, &got_bytes);
|
|
|
|
|
|
|
|
got_rows = got_bytes / table_cache->row_size;
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
cache->mem_allocd += got_bytes;
|
|
|
|
|
2007-09-22 08:34:26 +00:00
|
|
|
#if 0
|
|
|
|
printf("allocating chunk %d req bytes=%lu, got bytes=%lu, "
|
|
|
|
"row size=%lu, "
|
|
|
|
"req rows=%lu, got rows=%lu\n",
|
|
|
|
i, req_bytes, got_bytes,
|
|
|
|
table_cache->row_size,
|
|
|
|
req_rows, got_rows);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
chunk->rows_allocd = got_rows;
|
|
|
|
|
|
|
|
table_cache->rows_allocd += got_rows;
|
|
|
|
|
|
|
|
/* adjust the offset of the next chunk */
|
|
|
|
if (i < MEM_CHUNKS_IN_TABLE_CACHE - 1) {
|
|
|
|
|
|
|
|
table_cache->chunks[i + 1].offset
|
|
|
|
= chunk->offset + chunk->rows_allocd;
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
/* return the first empty row in the newly allocated
|
|
|
|
chunk */
|
2007-09-22 08:34:26 +00:00
|
|
|
row = chunk->base;
|
2007-09-20 11:23:44 +00:00
|
|
|
} else {
|
|
|
|
|
|
|
|
char* chunk_start;
|
|
|
|
ulint offset;
|
|
|
|
|
|
|
|
/* there is an empty row, no need to allocate new
|
|
|
|
chunks */
|
|
|
|
|
|
|
|
/* find the first chunk that contains allocated but
|
|
|
|
empty/unused rows */
|
|
|
|
for (i = 0; i < MEM_CHUNKS_IN_TABLE_CACHE; i++) {
|
|
|
|
|
|
|
|
if (table_cache->chunks[i].offset
|
|
|
|
+ table_cache->chunks[i].rows_allocd
|
|
|
|
> table_cache->rows_used) {
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* i == MEM_CHUNKS_IN_TABLE_CACHE means that all chunks
|
|
|
|
are full, but
|
|
|
|
table_cache->rows_used != table_cache->rows_allocd means
|
|
|
|
exactly the opposite - there are allocated but
|
|
|
|
empty/unused rows :-X */
|
|
|
|
ut_a(i < MEM_CHUNKS_IN_TABLE_CACHE);
|
|
|
|
|
|
|
|
chunk_start = (char*) table_cache->chunks[i].base;
|
|
|
|
offset = table_cache->rows_used
|
|
|
|
- table_cache->chunks[i].offset;
|
|
|
|
|
|
|
|
row = chunk_start + offset * table_cache->row_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
table_cache->rows_used++;
|
|
|
|
|
|
|
|
return(row);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2007-11-16 13:12:13 +00:00
|
|
|
Fills i_s_trx_row_t object.
|
2009-05-25 06:46:10 +00:00
|
|
|
If memory can not be allocated then FALSE is returned.
|
|
|
|
@return FALSE if allocation fails */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
2007-09-20 11:23:44 +00:00
|
|
|
fill_trx_row(
|
|
|
|
/*=========*/
|
2009-05-25 06:46:10 +00:00
|
|
|
i_s_trx_row_t* row, /*!< out: result object
|
2007-09-20 11:23:44 +00:00
|
|
|
that's filled */
|
2009-05-25 06:46:10 +00:00
|
|
|
const trx_t* trx, /*!< in: transaction to
|
2007-09-20 11:23:44 +00:00
|
|
|
get data from */
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* requested_lock_row,/*!< in: pointer to the
|
2007-09-20 11:23:44 +00:00
|
|
|
corresponding row in
|
|
|
|
innodb_locks if trx is
|
|
|
|
waiting or NULL if trx
|
|
|
|
is not waiting */
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache into
|
2007-11-07 20:38:07 +00:00
|
|
|
which to copy volatile
|
|
|
|
strings */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
row->trx_id = trx_get_id(trx);
|
|
|
|
row->trx_started = (ib_time_t) trx->start_time;
|
|
|
|
row->trx_state = trx_get_que_state_str(trx);
|
|
|
|
|
|
|
|
if (trx->wait_lock != NULL) {
|
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
ut_a(requested_lock_row != NULL);
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
row->requested_lock_row = requested_lock_row;
|
2007-09-20 11:23:44 +00:00
|
|
|
row->trx_wait_started = (ib_time_t) trx->wait_started;
|
|
|
|
} else {
|
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
ut_a(requested_lock_row == NULL);
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
row->requested_lock_row = NULL;
|
2007-09-20 11:23:44 +00:00
|
|
|
row->trx_wait_started = 0;
|
|
|
|
}
|
|
|
|
|
2008-01-16 06:45:16 +00:00
|
|
|
row->trx_weight = (ullint) ut_conv_dulint_to_longlong(TRX_WEIGHT(trx));
|
|
|
|
|
2008-08-09 00:15:46 +00:00
|
|
|
if (trx->mysql_thd != NULL) {
|
|
|
|
row->trx_mysql_thread_id
|
branches/innodb+: Merge revisions 3312:3459 from branches/zip:
------------------------------------------------------------------------
r3328 | marko | 2008-12-02 10:16:05 +0200 (Tue, 02 Dec 2008) | 7 lines
branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf
from the free list, zero out the DB_TRX_ID and DB_ROLL_PTR of the
deleted record if the new record would not overwrite these
fields. This fixes a harmless content mismatch reported by
page_zip_validate() that was reported as Issue #111.
rb://55 approved by Sunny Bains.
------------------------------------------------------------------------
r3329 | vasil | 2008-12-02 12:03:17 +0200 (Tue, 02 Dec 2008) | 4 lines
branches/zip:
Add entry in the ChangeLog for the release of 1.0.2.
------------------------------------------------------------------------
r3331 | vasil | 2008-12-02 12:09:20 +0200 (Tue, 02 Dec 2008) | 5 lines
branches/zip:
Remove an entry from the ChnageLog for a change that was made before
the release of 1.0.2 but was not included in that release.
------------------------------------------------------------------------
r3333 | vasil | 2008-12-02 12:11:54 +0200 (Tue, 02 Dec 2008) | 4 lines
branches/zip:
Now that 1.0.2 is out, the current tree is version 1.0.3.
------------------------------------------------------------------------
r3336 | vasil | 2008-12-02 13:34:36 +0200 (Tue, 02 Dec 2008) | 5 lines
branches/zip:
Resurrect a ChangeLog entry that I removed in c3331 with a fake date
so it does not appear that it has been included in 1.0.2.
------------------------------------------------------------------------
r3361 | vasil | 2008-12-04 18:10:08 +0200 (Thu, 04 Dec 2008) | 9 lines
branches/zip:
Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it
Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
since MySQL implemented the former, see http://bugs.mysql.com/30930.
Approved by: Marko (https://svn.innodb.com/rb/r/40, rb://40)
------------------------------------------------------------------------
r3362 | vasil | 2008-12-04 18:49:24 +0200 (Thu, 04 Dec 2008) | 15 lines
branches/zip:
Revert our temporary fix for Bug#40360 Binlog related errors with binlog off
This bug was fixed in MySQL code.
Our fix went into r2944 and r2947, but this patch does not entirely revert
those revisions because we want to leave the test case that was introduced
and also r2944 itself reverted r2935 and r2936. So if we completely revert
r2944 and r2947 then we would loose the test and will restore r2935 and
r2936.
This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql
add an equivallent, see Bug#40360
------------------------------------------------------------------------
r3404 | marko | 2008-12-05 10:02:54 +0200 (Fri, 05 Dec 2008) | 5 lines
branches/zip: row_undo_mod_del_mark_or_remove_sec_low(): Do not
complain if the record is not found. Explain that this is possible
when a deadlock occurs during an update. Heikki investigated this
in Issue #134.
------------------------------------------------------------------------
r3432 | marko | 2008-12-08 14:14:01 +0200 (Mon, 08 Dec 2008) | 4 lines
branches/zip: ibuf_merge_or_delete_for_page(): Remove the redundant
checks for ibuf_fixed_addr_page() || fsp_descr_page(). The one at
the beginning of the function is enough.
------------------------------------------------------------------------
r3456 | marko | 2008-12-09 10:31:26 +0200 (Tue, 09 Dec 2008) | 3 lines
branches/zip: row_purge_remove_sec_if_poss_low(): Allocate mtr_vers
from the stack, not with mem_alloc().
------------------------------------------------------------------------
r3459 | vasil | 2008-12-09 11:49:03 +0200 (Tue, 09 Dec 2008) | 152 lines
branches/zip:
Merge 2929:3458 from branches/5.1 (resolving conflict in c3257,
note also that r3363 reverted r2933 so there are not changes in
mysql-test/innodb-autoinc.result with the current merge):
------------------------------------------------------------------------
r2933 | calvin | 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) | 10 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: correct the result file innodb-autoinc.result
Change the followings:
auto_increment_increment
auto_increment_offset
to
auto-increment-increment
auto-increment-offset
------------------------------------------------------------------------
r2981 | marko | 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) | 5 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading
comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while
the "latin1" character set (normally ISO-8859-1, but in MySQL it actually
refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1)
takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset).
------------------------------------------------------------------------
r3114 | calvin | 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: fix bug#40386: Not flushing query cache after truncate
ha_statistics.records can not be 0 unless the table is empty, set to
1 instead. The original problem of bug#29507 is fixed in the server.
Additional test was done with the fix of bug#29507 in the server.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r3257 | inaam | 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/trx/trx0trx.c
branches/5.1 bug#40760
The config param innodb_thread_concurrency is dynamically set and is
read when a thread enters/exits innodb. If the value is changed between
the enter and exit time the behaviour becomes erratic.
The fix is not to use srv_thread_concurrency when exiting, instead use
the flag trx->declared_to_be_inside_innodb.
rb://57
Approved by: Marko
------------------------------------------------------------------------
r3363 | calvin | 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) | 13 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: revert the changes in r2933
The changes in r2933 causes test failure on Linux.
More investigation is needed for Windows.
Change the followings in innodb-autoinc.result:
auto-increment-increment
auto-increment-offset
back to:
auto_increment_increment
auto_increment_offset
------------------------------------------------------------------------
r3412 | vasil | 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) | 7 lines
Changed paths:
M /branches/5.1/trx/trx0undo.c
branches/5.1:
Add the traditional 2 spaces after the timestamp so the message does
not look like:
070223 13:26:01InnoDB: Warning: canno....
------------------------------------------------------------------------
r3458 | vasil | 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) | 51 lines
Changed paths:
M /branches/5.1/mysql-test/innodb_bug34300.test
branches/5.1:
Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test:
main.innodb_bug34300 [ fail ]
mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
Aborting: main.innodb_bug34300 failed in default mode.
The changeset is this:
------------------------------------------------------------
revno: 2709.1.10
committer: Staale Smedseng <staale.smedseng@sun.com>
branch nick: b22891-51-bugteam
timestamp: Thu 2008-11-20 08:51:48 +0100
message:
A fix for Bug#22891 "session level max_allowed_packet can be
set but is ignored".
This patch makes @@session.max_allowed_packed and
@@session.net_buffer_length read-only as suggested in the bug
report. The user will have to use SET GLOBAL (and reconnect)
to alter the session values of these variables.
The error string ER_VARIABLE_IS_READONLY is introduced.
Tests are modified accordingly.
modified:
mysql-test/r/func_compress.result
mysql-test/r/max_allowed_packet_basic.result
mysql-test/r/max_allowed_packet_func.result
mysql-test/r/net_buffer_length_basic.result
mysql-test/r/packet.result
mysql-test/r/union.result
mysql-test/r/variables.result
mysql-test/t/func_compress.test
mysql-test/t/innodb_bug34300.test
mysql-test/t/max_allowed_packet_basic.test
mysql-test/t/max_allowed_packet_func.test
mysql-test/t/net_buffer_length_basic.test
mysql-test/t/packet.test
mysql-test/t/union.test
mysql-test/t/variables.test
sql/set_var.cc
sql/set_var.h
sql/share/errmsg.txt
------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
2008-12-09 11:09:06 +00:00
|
|
|
= thd_get_thread_id(trx->mysql_thd);
|
2008-08-09 00:15:46 +00:00
|
|
|
} else {
|
|
|
|
/* For internal transactions e.g., purge and transactions
|
|
|
|
being recovered at startup there is no associated MySQL
|
|
|
|
thread data structure. */
|
|
|
|
row->trx_mysql_thread_id = 0;
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-07 20:38:07 +00:00
|
|
|
if (trx->mysql_query_str != NULL && *trx->mysql_query_str != NULL) {
|
|
|
|
|
|
|
|
if (strlen(*trx->mysql_query_str)
|
|
|
|
> TRX_I_S_TRX_QUERY_MAX_LEN) {
|
|
|
|
|
|
|
|
char query[TRX_I_S_TRX_QUERY_MAX_LEN + 1];
|
|
|
|
|
|
|
|
memcpy(query, *trx->mysql_query_str,
|
|
|
|
TRX_I_S_TRX_QUERY_MAX_LEN);
|
|
|
|
query[TRX_I_S_TRX_QUERY_MAX_LEN] = '\0';
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
row->trx_query = ha_storage_put_memlim(
|
2007-11-07 20:38:07 +00:00
|
|
|
cache->storage, query,
|
2007-11-16 13:12:13 +00:00
|
|
|
TRX_I_S_TRX_QUERY_MAX_LEN + 1,
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
2007-11-07 20:38:07 +00:00
|
|
|
} else {
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
row->trx_query = ha_storage_put_str_memlim(
|
|
|
|
cache->storage, *trx->mysql_query_str,
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (row->trx_query == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
2007-11-07 20:38:07 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
row->trx_query = NULL;
|
|
|
|
}
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
return(TRUE);
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
2007-10-29 13:03:53 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Format the nth field of "rec" and put it in "buf". The result is always
|
|
|
|
'\0'-terminated. Returns the number of bytes that were written to "buf"
|
2009-05-25 06:46:10 +00:00
|
|
|
(including the terminating '\0').
|
|
|
|
@return end of the result */
|
2007-10-29 13:03:53 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
put_nth_field(
|
|
|
|
/*==========*/
|
2009-05-25 06:46:10 +00:00
|
|
|
char* buf, /*!< out: buffer */
|
|
|
|
ulint buf_size,/*!< in: buffer size in bytes */
|
|
|
|
ulint n, /*!< in: number of field */
|
|
|
|
const dict_index_t* index, /*!< in: index */
|
|
|
|
const rec_t* rec, /*!< in: record */
|
|
|
|
const ulint* offsets)/*!< in: record offsets, returned
|
2007-10-29 13:03:53 +00:00
|
|
|
by rec_get_offsets() */
|
|
|
|
{
|
|
|
|
const byte* data;
|
|
|
|
ulint data_len;
|
|
|
|
dict_field_t* dict_field;
|
|
|
|
ulint ret;
|
|
|
|
|
|
|
|
ut_ad(rec_offs_validate(rec, NULL, offsets));
|
|
|
|
|
|
|
|
if (buf_size == 0) {
|
|
|
|
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
/* we must append ", " before the actual data */
|
|
|
|
|
|
|
|
if (buf_size < 3) {
|
|
|
|
|
|
|
|
buf[0] = '\0';
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(buf, ", ", 3);
|
|
|
|
|
|
|
|
buf += 2;
|
|
|
|
buf_size -= 2;
|
|
|
|
ret += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now buf_size >= 1 */
|
|
|
|
|
|
|
|
data = rec_get_nth_field(rec, offsets, n, &data_len);
|
|
|
|
|
|
|
|
dict_field = dict_index_get_nth_field(index, n);
|
|
|
|
|
|
|
|
ret += row_raw_format((const char*) data, data_len,
|
|
|
|
dict_field, buf, buf_size);
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2007-11-16 13:12:13 +00:00
|
|
|
Fills the "lock_data" member of i_s_locks_row_t object.
|
2009-05-25 06:46:10 +00:00
|
|
|
If memory can not be allocated then FALSE is returned.
|
|
|
|
@return FALSE if allocation fails */
|
2007-10-29 13:03:53 +00:00
|
|
|
static
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
2007-10-29 13:03:53 +00:00
|
|
|
fill_lock_data(
|
|
|
|
/*===========*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const char** lock_data,/*!< out: "lock_data" to fill */
|
|
|
|
const lock_t* lock, /*!< in: lock used to find the data */
|
|
|
|
ulint heap_no,/*!< in: rec num used to find the data */
|
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache where to store
|
2007-10-29 13:03:53 +00:00
|
|
|
volatile data */
|
|
|
|
{
|
|
|
|
mtr_t mtr;
|
|
|
|
|
|
|
|
const buf_block_t* block;
|
|
|
|
const page_t* page;
|
|
|
|
const rec_t* rec;
|
|
|
|
|
|
|
|
ut_a(lock_get_type(lock) == LOCK_REC);
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
block = buf_page_try_get(lock_rec_get_space_id(lock),
|
|
|
|
lock_rec_get_page_no(lock),
|
|
|
|
&mtr);
|
|
|
|
|
|
|
|
if (block == NULL) {
|
|
|
|
|
|
|
|
*lock_data = NULL;
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
return(TRUE);
|
2007-10-29 13:03:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
page = (const page_t*) buf_block_get_frame(block);
|
|
|
|
|
|
|
|
rec = page_find_rec_with_heap_no(page, heap_no);
|
|
|
|
|
|
|
|
if (page_rec_is_infimum(rec)) {
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
*lock_data = ha_storage_put_str_memlim(
|
|
|
|
cache->storage, "infimum pseudo-record",
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
2007-10-29 13:03:53 +00:00
|
|
|
} else if (page_rec_is_supremum(rec)) {
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
*lock_data = ha_storage_put_str_memlim(
|
|
|
|
cache->storage, "supremum pseudo-record",
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
2007-10-29 13:03:53 +00:00
|
|
|
} else {
|
|
|
|
|
|
|
|
const dict_index_t* index;
|
|
|
|
ulint n_fields;
|
|
|
|
mem_heap_t* heap;
|
|
|
|
ulint offsets_onstack[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets;
|
|
|
|
char buf[TRX_I_S_LOCK_DATA_MAX_LEN];
|
|
|
|
ulint buf_used;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
rec_offs_init(offsets_onstack);
|
|
|
|
offsets = offsets_onstack;
|
|
|
|
|
|
|
|
index = lock_rec_get_index(lock);
|
|
|
|
|
|
|
|
n_fields = dict_index_get_n_unique(index);
|
|
|
|
|
|
|
|
ut_a(n_fields > 0);
|
|
|
|
|
|
|
|
heap = NULL;
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets, n_fields,
|
|
|
|
&heap);
|
|
|
|
|
|
|
|
/* format and store the data */
|
|
|
|
|
|
|
|
buf_used = 0;
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
|
|
|
|
buf_used += put_nth_field(
|
|
|
|
buf + buf_used, sizeof(buf) - buf_used,
|
|
|
|
i, index, rec, offsets) - 1;
|
|
|
|
}
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
*lock_data = (const char*) ha_storage_put_memlim(
|
|
|
|
cache->storage, buf, buf_used + 1,
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
2007-10-29 13:03:53 +00:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(heap != NULL)) {
|
|
|
|
|
|
|
|
/* this means that rec_get_offsets() has created a new
|
|
|
|
heap and has stored offsets in it; check that this is
|
|
|
|
really the case and free the heap */
|
|
|
|
ut_a(offsets != offsets_onstack);
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
if (*lock_data == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
2007-10-29 13:03:53 +00:00
|
|
|
}
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/***********************************************************************
|
2007-11-16 13:12:13 +00:00
|
|
|
Fills i_s_locks_row_t object. Returns its first argument.
|
2009-05-25 06:46:10 +00:00
|
|
|
If memory can not be allocated then FALSE is returned.
|
|
|
|
@return FALSE if allocation fails */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
2007-09-20 11:23:44 +00:00
|
|
|
fill_locks_row(
|
|
|
|
/*===========*/
|
2009-05-25 06:46:10 +00:00
|
|
|
i_s_locks_row_t* row, /*!< out: result object that's filled */
|
|
|
|
const lock_t* lock, /*!< in: lock to get data from */
|
|
|
|
ulint heap_no,/*!< in: lock's record number
|
2007-09-20 11:23:44 +00:00
|
|
|
or ULINT_UNDEFINED if the lock
|
|
|
|
is a table lock */
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache into which to copy
|
2007-09-24 12:25:06 +00:00
|
|
|
volatile strings */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
row->lock_trx_id = lock_get_trx_id(lock);
|
|
|
|
row->lock_mode = lock_get_mode_str(lock);
|
|
|
|
row->lock_type = lock_get_type_str(lock);
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
row->lock_table = ha_storage_put_str_memlim(
|
|
|
|
cache->storage, lock_get_table_name(lock),
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
if (row->lock_table == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
switch (lock_get_type(lock)) {
|
|
|
|
case LOCK_REC:
|
2007-11-16 13:12:13 +00:00
|
|
|
row->lock_index = ha_storage_put_str_memlim(
|
|
|
|
cache->storage, lock_rec_get_index_name(lock),
|
|
|
|
MAX_ALLOWED_FOR_STORAGE(cache));
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
if (row->lock_index == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
row->lock_space = lock_rec_get_space_id(lock);
|
|
|
|
row->lock_page = lock_rec_get_page_no(lock);
|
|
|
|
row->lock_rec = heap_no;
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
if (!fill_lock_data(&row->lock_data, lock, heap_no, cache)) {
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-10-29 13:03:53 +00:00
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
break;
|
|
|
|
case LOCK_TABLE:
|
|
|
|
row->lock_index = NULL;
|
|
|
|
|
|
|
|
row->lock_space = ULINT_UNDEFINED;
|
|
|
|
row->lock_page = ULINT_UNDEFINED;
|
|
|
|
row->lock_rec = ULINT_UNDEFINED;
|
|
|
|
|
2007-10-29 13:03:53 +00:00
|
|
|
row->lock_data = NULL;
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
row->lock_table_id = lock_get_table_id(lock);
|
|
|
|
|
|
|
|
row->hash_chain.value = row;
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
return(TRUE);
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2009-05-25 06:46:10 +00:00
|
|
|
Fills i_s_lock_waits_row_t object. Returns its first argument.
|
|
|
|
@return result object that's filled */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
i_s_lock_waits_row_t*
|
|
|
|
fill_lock_waits_row(
|
|
|
|
/*================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
i_s_lock_waits_row_t* row, /*!< out: result object
|
2007-09-20 11:23:44 +00:00
|
|
|
that's filled */
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* requested_lock_row,/*!< in: pointer to the
|
2007-11-29 13:47:09 +00:00
|
|
|
relevant requested lock
|
2007-09-20 11:23:44 +00:00
|
|
|
row in innodb_locks */
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* blocking_lock_row)/*!< in: pointer to the
|
2007-11-29 13:47:09 +00:00
|
|
|
relevant blocking lock
|
2007-09-20 11:23:44 +00:00
|
|
|
row in innodb_locks */
|
|
|
|
{
|
2007-11-29 13:47:09 +00:00
|
|
|
row->requested_lock_row = requested_lock_row;
|
|
|
|
row->blocking_lock_row = blocking_lock_row;
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
return(row);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Calculates a hash fold for a lock. For a record lock the fold is
|
|
|
|
calculated from 4 elements, which uniquely identify a lock at a given
|
|
|
|
point in time: transaction id, space id, page number, record number.
|
2009-05-25 06:46:10 +00:00
|
|
|
For a table lock the fold is table's id.
|
|
|
|
@return fold */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
fold_lock(
|
|
|
|
/*======*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const lock_t* lock, /*!< in: lock object to fold */
|
|
|
|
ulint heap_no)/*!< in: lock's record number
|
2007-09-20 11:23:44 +00:00
|
|
|
or ULINT_UNDEFINED if the lock
|
|
|
|
is a table lock */
|
|
|
|
{
|
|
|
|
#ifdef TEST_LOCK_FOLD_ALWAYS_DIFFERENT
|
|
|
|
static ulint fold = 0;
|
|
|
|
|
|
|
|
return(fold++);
|
|
|
|
#else
|
|
|
|
ulint ret;
|
|
|
|
|
|
|
|
switch (lock_get_type(lock)) {
|
|
|
|
case LOCK_REC:
|
|
|
|
ut_a(heap_no != ULINT_UNDEFINED);
|
|
|
|
|
|
|
|
ret = ut_fold_ulint_pair((ulint) lock_get_trx_id(lock),
|
|
|
|
lock_rec_get_space_id(lock));
|
|
|
|
|
|
|
|
ret = ut_fold_ulint_pair(ret,
|
|
|
|
lock_rec_get_page_no(lock));
|
|
|
|
|
|
|
|
ret = ut_fold_ulint_pair(ret, heap_no);
|
|
|
|
|
|
|
|
break;
|
|
|
|
case LOCK_TABLE:
|
|
|
|
/* this check is actually not necessary for continuing
|
|
|
|
correct operation, but something must have gone wrong if
|
|
|
|
it fails. */
|
|
|
|
ut_a(heap_no == ULINT_UNDEFINED);
|
|
|
|
|
|
|
|
ret = (ulint) lock_get_table_id(lock);
|
|
|
|
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2009-05-25 06:46:10 +00:00
|
|
|
Checks whether i_s_locks_row_t object represents a lock_t object.
|
|
|
|
@return TRUE if they match */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
locks_row_eq_lock(
|
|
|
|
/*==============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* row, /*!< in: innodb_locks row */
|
|
|
|
const lock_t* lock, /*!< in: lock object */
|
|
|
|
ulint heap_no)/*!< in: lock's record number
|
2007-09-20 11:23:44 +00:00
|
|
|
or ULINT_UNDEFINED if the lock
|
|
|
|
is a table lock */
|
|
|
|
{
|
|
|
|
#ifdef TEST_NO_LOCKS_ROW_IS_EVER_EQUAL_TO_LOCK_T
|
|
|
|
return(0);
|
|
|
|
#else
|
|
|
|
switch (lock_get_type(lock)) {
|
|
|
|
case LOCK_REC:
|
|
|
|
ut_a(heap_no != ULINT_UNDEFINED);
|
|
|
|
|
|
|
|
return(row->lock_trx_id == lock_get_trx_id(lock)
|
|
|
|
&& row->lock_space == lock_rec_get_space_id(lock)
|
|
|
|
&& row->lock_page == lock_rec_get_page_no(lock)
|
|
|
|
&& row->lock_rec == heap_no);
|
|
|
|
|
|
|
|
case LOCK_TABLE:
|
|
|
|
/* this check is actually not necessary for continuing
|
|
|
|
correct operation, but something must have gone wrong if
|
|
|
|
it fails. */
|
|
|
|
ut_a(heap_no == ULINT_UNDEFINED);
|
|
|
|
|
|
|
|
return(row->lock_trx_id == lock_get_trx_id(lock)
|
|
|
|
&& row->lock_table_id == lock_get_table_id(lock));
|
|
|
|
|
|
|
|
default:
|
|
|
|
ut_error;
|
2008-05-14 15:43:19 +00:00
|
|
|
return(FALSE);
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Searches for a row in the innodb_locks cache that has a specified id.
|
|
|
|
This happens in O(1) time since a hash table is used. Returns pointer to
|
2009-05-25 06:46:10 +00:00
|
|
|
the row or NULL if none is found.
|
|
|
|
@return row or NULL */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
i_s_locks_row_t*
|
|
|
|
search_innodb_locks(
|
|
|
|
/*================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in: cache */
|
|
|
|
const lock_t* lock, /*!< in: lock to search for */
|
|
|
|
ulint heap_no)/*!< in: lock's record number
|
2007-09-20 11:23:44 +00:00
|
|
|
or ULINT_UNDEFINED if the lock
|
|
|
|
is a table lock */
|
|
|
|
{
|
|
|
|
i_s_hash_chain_t* hash_chain;
|
|
|
|
|
|
|
|
HASH_SEARCH(
|
|
|
|
/* hash_chain->"next" */
|
|
|
|
next,
|
|
|
|
/* the hash table */
|
|
|
|
cache->locks_hash,
|
|
|
|
/* fold */
|
|
|
|
fold_lock(lock, heap_no),
|
|
|
|
/* the type of the next variable */
|
|
|
|
i_s_hash_chain_t*,
|
|
|
|
/* auxiliary variable */
|
|
|
|
hash_chain,
|
branches/innodb+: Merge revisions 3602:3931 from branches/zip:
------------------------------------------------------------------------
r3607 | marko | 2008-12-30 22:33:31 +0200 (Tue, 30 Dec 2008) | 20 lines
branches/zip: Remove the dependency on the MySQL HASH table implementation.
Use the InnoDB hash table for keeping track of INNOBASE_SHARE objects.
struct st_innobase_share: Make table_name const uchar*. Add the member
table_name_hash.
innobase_open_tables: Change the type from HASH to hash_table_t*.
innobase_get_key(): Remove.
innobase_fold_name(): New function, for computing the fold value for the
InnoDB hash table.
get_share(), free_share(): Use the InnoDB hash functions.
innobase_end(): Free innobase_open_tables before shutting down InnoDB.
Shutting down InnoDB will invalidate all memory allocated via InnoDB.
rb://65 approved by Heikki Tuuri. This addresses Issue #104.
------------------------------------------------------------------------
r3608 | marko | 2008-12-30 22:45:04 +0200 (Tue, 30 Dec 2008) | 22 lines
branches/zip: When setting the PAGE_LEVEL of a compressed B-tree page
from or to 0, compress the page at the same time. This is necessary,
because the column information stored on the compressed page will
differ between leaf and non-leaf pages. Leaf pages are identified by
PAGE_LEVEL=0. This bug was reported as Issue #150.
Document the similarity between btr_page_create() and
btr_page_empty(). Make the function signature of btr_page_empty()
identical with btr_page_create(). (This will add the parameter "level".)
btr_root_raise_and_insert(): Replace some code with a call to
btr_page_empty().
btr_attach_half_pages(): Assert that the page level has already been
set on both block and new_block. Do not set it again.
btr_discard_only_page_on_level(): Document that this function is
probably never called. Make it work on any height tree. (Tested on
2-high tree by disabling btr_lift_page_up().)
rb://68
------------------------------------------------------------------------
r3612 | marko | 2009-01-02 11:02:44 +0200 (Fri, 02 Jan 2009) | 14 lines
branches/zip: Merge c2998 from branches/6.0, so that the same InnoDB Plugin
source tree will work both under 5.1 and 6.0. Do not add the test case
innodb_ctype_ldml.test, because it would not work under MySQL 5.1.
Refuse to create tables whose columns contain collation IDs above 255.
This removes an assertion failure that was introduced in WL#4164
(Two-byte collation IDs).
create_table_def(): Do not fail an assertion if a column contains a
charset-collation ID greater than 256. Instead, issue an error and
refuse to create the table.
The original change (branches/6.0 r2998) was rb://51 approved by Calvin Sun.
------------------------------------------------------------------------
r3613 | inaam | 2009-01-02 15:10:50 +0200 (Fri, 02 Jan 2009) | 6 lines
branches/zip: Implement the parameter innodb_use_sys_malloc
(false by default), for disabling InnoDB's internal memory allocator
and using system malloc/free instead.
rb://62 approved by Marko
------------------------------------------------------------------------
r3614 | marko | 2009-01-02 15:55:12 +0200 (Fri, 02 Jan 2009) | 1 line
branches/zip: ChangeLog: Document r3608 and r3613.
------------------------------------------------------------------------
r3615 | marko | 2009-01-02 15:57:51 +0200 (Fri, 02 Jan 2009) | 1 line
branches/zip: ChangeLog: Clarify the impact of r3608.
------------------------------------------------------------------------
r3616 | marko | 2009-01-03 00:23:30 +0200 (Sat, 03 Jan 2009) | 1 line
branches/zip: srv_suspend_mysql_thread(): Add some clarifying comments.
------------------------------------------------------------------------
r3618 | marko | 2009-01-05 12:54:53 +0200 (Mon, 05 Jan 2009) | 15 lines
branches/zip: Merge revisions 3598:3601 from branches/5.1:
------------------------------------------------------------------------
r3601 | marko | 2008-12-22 16:05:19 +0200 (Mon, 22 Dec 2008) | 9 lines
branches/5.1: Make
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED
a true replacement of SET GLOBAL INNODB_LOCKS_UNSAFE_FOR_BINLOG=1.
This fixes an error that was introduced in r370, causing
semi-consistent read not to not unlock rows in READ COMMITTED mode.
(Bug #41671, Issue #146)
rb://67 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r3623 | vasil | 2009-01-06 09:56:32 +0200 (Tue, 06 Jan 2009) | 7 lines
branches/zip:
Add patch to fix the failing main.variables mysql-test. It started failing
after the variable innodb_use_sys_malloc was added because it matches
'%alloc%' and the test is badly written and expects that no new variables
like that will ever be added.
------------------------------------------------------------------------
r3795 | marko | 2009-01-07 16:17:47 +0200 (Wed, 07 Jan 2009) | 7 lines
branches/zip: row_merge_tuple_cmp(): Do not report a duplicate key value
if any of the fields are NULL. While the tuples are equal in the
sorting order, SQL NULL is defined to be logically inequal to
anything else. (Bug #41904)
rb://70 approved by Heikki Tuuri
------------------------------------------------------------------------
r3796 | marko | 2009-01-07 16:19:32 +0200 (Wed, 07 Jan 2009) | 1 line
branches/zip: Add the tests that were forgotten from r3795.
------------------------------------------------------------------------
r3797 | marko | 2009-01-07 16:22:18 +0200 (Wed, 07 Jan 2009) | 22 lines
branches/zip: Do not call trx_allocate_for_mysql() directly, but use
helper functions that initialize some members of the transaction struct.
(Bug #41680)
innobase_trx_init(): New function: initialize some fields of a
transaction struct from a MySQL THD object.
innobase_trx_allocate(): New function: allocate and initialize a
transaction struct.
check_trx_exists(): Use the above two functions.
ha_innobase::delete_table(), ha_innobase::rename_table(),
ha_innobase::add_index(), ha_innobase::final_drop_index():
Use innobase_trx_allocate().
innobase_drop_database(): In the Windows plugin, initialize the trx_t
specially, because the THD is not available. Otherwise, use
innobase_trx_allocate().
rb://69 accepted by Heikki Tuuri
------------------------------------------------------------------------
r3798 | marko | 2009-01-07 16:42:42 +0200 (Wed, 07 Jan 2009) | 8 lines
branches/zip: row_merge_drop_temp_indexes(): Do not lock the rows of
SYS_INDEXES when looking for partially created indexes. Use the
transaction isolation level READ UNCOMMITTED to avoid interfering with
locks held by incomplete transactions that will be rolled back in a
subsequent step in the recovery. (Issue #152)
Approved by Heikki Tuuri
------------------------------------------------------------------------
r3852 | vasil | 2009-01-08 22:10:10 +0200 (Thu, 08 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r3795 r3796 r3797 r3798.
------------------------------------------------------------------------
r3866 | marko | 2009-01-09 15:09:51 +0200 (Fri, 09 Jan 2009) | 2 lines
branches/zip: buf_flush_try_page(): Move some common code from each
switch case before the switch block.
------------------------------------------------------------------------
r3867 | marko | 2009-01-09 15:13:14 +0200 (Fri, 09 Jan 2009) | 2 lines
branches/zip: buf_flush_try_page(): Introduce the variable is_compressed
for caching the result of buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE.
------------------------------------------------------------------------
r3868 | marko | 2009-01-09 15:40:11 +0200 (Fri, 09 Jan 2009) | 4 lines
branches/zip: buf_flush_insert_into_flush_list(),
buf_flush_insert_sorted_into_flush_list(): Remove unused code.
Change the parameter to buf_block_t* block and assert that
block->state == BUF_BLOCK_FILE_PAGE. This is part of Issue #155.
------------------------------------------------------------------------
r3873 | marko | 2009-01-09 22:27:40 +0200 (Fri, 09 Jan 2009) | 17 lines
branches/zip: Some non-functional changes related to Issue #155.
buf_page_struct: Note that space and offset are also protected by
buf_pool_mutex. They are only assigned to by
buf_block_set_file_page(). Thus, it suffices for buf_flush_batch() to
hold just buf_pool_mutex when checking these fields.
buf_flush_try_page(): Rename "locked" to "is_s_latched", per Heikki's request.
buf_flush_batch(): Move the common statement mutex_exit(block_mutex)
from all if-else if-else branches before the if block. Remove the
redundant test (buf_pool->init_flush[flush_type] == FALSE) that was
apparently copied from buf_flush_write_complete().
buf_flush_write_block_low(): Note why it is safe not to hold buf_pool_mutex
or block_mutex. Enumerate the assumptions in debug assertions.
------------------------------------------------------------------------
r3874 | marko | 2009-01-09 23:09:06 +0200 (Fri, 09 Jan 2009) | 4 lines
branches/zip: Add comments related to Issue #155.
buf_flush_try_page(): Note why it is safe to access bpage without
holding buf_pool_mutex or block_mutex.
------------------------------------------------------------------------
r3875 | marko | 2009-01-09 23:15:12 +0200 (Fri, 09 Jan 2009) | 11 lines
branches/zip: Non-functional change: Tighten debug assertions and
remove dead code.
buf_flush_ready_for_flush(), buf_flush_try_page(): Assert that
flush_type is one of BUF_FLUSH_LRU or BUF_FLUSH_LIST. The flush_type
comes from buf_flush_batch(), which already asserts this. The
assertion holds for all calls in the source code.
buf_flush_try_page(): Remove the dead case BUF_FLUSH_SINGLE_PAGE
of switch (flush_type).
------------------------------------------------------------------------
r3879 | marko | 2009-01-12 12:46:44 +0200 (Mon, 12 Jan 2009) | 14 lines
branches/zip: Simplify the flushing of dirty pages from the buffer pool.
buf_flush_try_page(): Rename to buf_flush_page(), and change the
return type to void. Replace the parameters space, offset with bpage,
and remove the second page hash lookup. Note and assert that both
buf_pool_mutex and block_mutex must now be held upon entering the
function. They will still be released by this function.
buf_flush_try_neighbors(): Replace buf_flush_try_page() with
buf_flush_page(). Make the logic easier to follow by not negating the
precondition of buf_flush_page().
rb://73 approved by Sunny Bains. This is related to Issue #157.
------------------------------------------------------------------------
r3880 | marko | 2009-01-12 13:24:37 +0200 (Mon, 12 Jan 2009) | 2 lines
branches/zip: buf_flush_page(): Fix a comment that should have been fixed
in r3879. Spotted by Sunny.
------------------------------------------------------------------------
r3881 | marko | 2009-01-12 14:25:22 +0200 (Mon, 12 Jan 2009) | 2 lines
branches/zip: buf_page_get_newest_modification(): Use the block mutex
instead of the buffer pool mutex. This is related to Issue #157.
------------------------------------------------------------------------
r3882 | marko | 2009-01-12 14:40:08 +0200 (Mon, 12 Jan 2009) | 3 lines
branches/zip: struct mtr_struct: Remove the unused field magic_n
unless UNIV_DEBUG is defined. mtr->magic_n is only assigned to
and checked in UNIV_DEBUG builds.
------------------------------------------------------------------------
r3883 | marko | 2009-01-12 14:48:59 +0200 (Mon, 12 Jan 2009) | 1 line
branches/zip: Non-functional change: Use ut_d when assigning to mtr->state.
------------------------------------------------------------------------
r3884 | marko | 2009-01-12 18:56:11 +0200 (Mon, 12 Jan 2009) | 16 lines
branches/zip: Non-functional change: Add some debug assertions and comments.
buf_page_t: Note that the LRU fields are protected by buf_pool_mutex
only, not block->mutex or buf_pool_zip_mutex.
buf_page_get_freed_page_clock(): Note that this is sometimes invoked
without mutex protection.
buf_pool_get_oldest_modification(): Note that the result may be out of
date.
buf_page_get_LRU_position(), buf_page_is_old(): Assert that the buffer
pool mutex is being held.
buf_page_release(): Assert that dirty blocks are in the flush list.
------------------------------------------------------------------------
r3896 | marko | 2009-01-13 09:30:26 +0200 (Tue, 13 Jan 2009) | 2 lines
branches/zip: buf_flush_try_neighbors(): Fix a bug
that was introduced in r3879 (rb://73).
------------------------------------------------------------------------
r3900 | marko | 2009-01-13 10:32:24 +0200 (Tue, 13 Jan 2009) | 1 line
branches/zip: Fix some comments to say buf_pool_mutex.
------------------------------------------------------------------------
r3907 | marko | 2009-01-13 11:54:01 +0200 (Tue, 13 Jan 2009) | 3 lines
branches/zip: row_merge_create_temporary_table(): On error,
row_create_table_for_mysql() already frees new_table.
Do not attempt to free it again.
------------------------------------------------------------------------
r3908 | marko | 2009-01-13 12:34:32 +0200 (Tue, 13 Jan 2009) | 1 line
branches/zip: Enable HASH_ASSERT_OWNED independently of UNIV_SYNC_DEBUG.
------------------------------------------------------------------------
r3914 | marko | 2009-01-13 21:46:22 +0200 (Tue, 13 Jan 2009) | 37 lines
branches/zip: In hash table lookups, assert that the traversed items
satisfy some conditions when UNIV_DEBUG is defined.
HASH_SEARCH(): New parameter: ASSERTION. All users will pass an appropriate
ut_ad() or nothing.
dict_table_add_to_columns(): Assert that the table being added to the data
dictionary cache is not already being pointed to by the name_hash and
id_hash tables.
HASH_SEARCH_ALL(): New macro, for use in dict_table_add_to_columns().
dict_mem_table_free(): Set ut_d(table->cached = FALSE), so that we can
check ut_ad(table->cached) when traversing the hash tables, as in
HASH_SEARCH(name_hash, dict_sys->table_hash, ...) and
HASH_SEARCH(id_hash, dict_sys->table_id_hash, ...).
dict_table_get_low(), dict_table_get_on_id_low(): Assert
ut_ad(!table || table->cached).
fil_space_get_by_id(): Check ut_ad(space->magic_n == FIL_SPACE_MAGIC_N)
in HASH_SEARCH(hash, fil_system->spaces, ...).
fil_space_get_by_name(): Check ut_ad(space->magic_n == FIL_SPACE_MAGIC_N)
in HASH_SEARCH(name_hash, fil_system->name_hash, ...).
buf_buddy_block_free(): Check that the blocks are in valid state in
HASH_SEARCH(hash, buf_pool->zip_hash, ...).
buf_page_hash_get(): Check that the blocks are in valid state in
HASH_SEARCH(hash, buf_pool->page_hash, ...).
get_share(), free_share(): Check ut_ad(share->use_count > 0) in
HASH_SEARCH(table_name_hash, innobase_open_tables, ...).
This was posted as rb://75 for tracking down errors similar to Issue #153.
------------------------------------------------------------------------
r3931 | marko | 2009-01-14 16:06:22 +0200 (Wed, 14 Jan 2009) | 26 lines
branches/zip: Merge revisions 3601:3930 from branches/5.1:
------------------------------------------------------------------------
r3911 | sunny | 2009-01-13 14:15:24 +0200 (Tue, 13 Jan 2009) | 13 lines
branches/5.1: Fix Bug#38187 Error 153 when creating savepoints
InnoDB previously treated savepoints as a stack e.g.,
SAVEPOINT a;
SAVEPOINT b;
SAVEPOINT c;
SAVEPOINT b; <- This would delete b and c.
This fix changes the behavior to:
SAVEPOINT a;
SAVEPOINT b;
SAVEPOINT c;
SAVEPOINT b; <- Does not delete savepoint c
------------------------------------------------------------------------
r3930 | marko | 2009-01-14 15:51:30 +0200 (Wed, 14 Jan 2009) | 4 lines
branches/5.1: dict_load_table(): If dict_load_indexes() fails,
invoke dict_table_remove_from_cache() instead of dict_mem_table_free(),
so that the data dictionary will not point to freed data.
(Bug #42075, Issue #153, rb://76 approved by Heikki Tuuri)
------------------------------------------------------------------------
------------------------------------------------------------------------
2009-01-14 14:25:45 +00:00
|
|
|
/* assertion on every traversed item */
|
|
|
|
,
|
2007-09-20 11:23:44 +00:00
|
|
|
/* this determines if we have found the lock */
|
|
|
|
locks_row_eq_lock(hash_chain->value, lock, heap_no));
|
|
|
|
|
|
|
|
if (hash_chain == NULL) {
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
/* else */
|
|
|
|
|
|
|
|
return(hash_chain->value);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Adds new element to the locks cache, enlarging it if necessary.
|
|
|
|
Returns a pointer to the added row. If the row is already present then
|
2007-11-16 13:12:13 +00:00
|
|
|
no row is added and a pointer to the existing row is returned.
|
2009-05-25 06:46:10 +00:00
|
|
|
If row can not be allocated then NULL is returned.
|
|
|
|
@return row */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
i_s_locks_row_t*
|
|
|
|
add_lock_to_cache(
|
|
|
|
/*==============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in/out: cache */
|
|
|
|
const lock_t* lock, /*!< in: the element to add */
|
|
|
|
ulint heap_no)/*!< in: lock's record number
|
2007-09-20 11:23:44 +00:00
|
|
|
or ULINT_UNDEFINED if the lock
|
|
|
|
is a table lock */
|
|
|
|
{
|
|
|
|
i_s_locks_row_t* dst_row;
|
|
|
|
|
|
|
|
#ifdef TEST_ADD_EACH_LOCKS_ROW_MANY_TIMES
|
|
|
|
ulint i;
|
|
|
|
for (i = 0; i < 10000; i++) {
|
|
|
|
#endif
|
|
|
|
#ifndef TEST_DO_NOT_CHECK_FOR_DUPLICATE_ROWS
|
|
|
|
/* quit if this lock is already present */
|
|
|
|
dst_row = search_innodb_locks(cache, lock, heap_no);
|
|
|
|
if (dst_row != NULL) {
|
|
|
|
|
|
|
|
return(dst_row);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
dst_row = (i_s_locks_row_t*)
|
2007-11-16 13:12:13 +00:00
|
|
|
table_cache_create_empty_row(&cache->innodb_locks, cache);
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
if (dst_row == NULL) {
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
if (!fill_locks_row(dst_row, lock, heap_no, cache)) {
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
cache->innodb_locks.rows_used--;
|
|
|
|
return(NULL);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
#ifndef TEST_DO_NOT_INSERT_INTO_THE_HASH_TABLE
|
|
|
|
HASH_INSERT(
|
|
|
|
/* the type used in the hash chain */
|
|
|
|
i_s_hash_chain_t,
|
|
|
|
/* hash_chain->"next" */
|
|
|
|
next,
|
|
|
|
/* the hash table */
|
|
|
|
cache->locks_hash,
|
|
|
|
/* fold */
|
|
|
|
fold_lock(lock, heap_no),
|
|
|
|
/* add this data to the hash */
|
|
|
|
&dst_row->hash_chain);
|
|
|
|
#endif
|
|
|
|
#ifdef TEST_ADD_EACH_LOCKS_ROW_MANY_TIMES
|
|
|
|
} /* for()-loop */
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return(dst_row);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2007-11-16 13:12:13 +00:00
|
|
|
Adds new pair of locks to the lock waits cache.
|
2009-05-25 06:46:10 +00:00
|
|
|
If memory can not be allocated then FALSE is returned.
|
|
|
|
@return FALSE if allocation fails */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
2007-09-20 11:23:44 +00:00
|
|
|
add_lock_wait_to_cache(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in/out: cache */
|
|
|
|
const i_s_locks_row_t* requested_lock_row,/*!< in: pointer to the
|
2007-11-29 13:47:09 +00:00
|
|
|
relevant requested lock
|
2007-09-20 11:23:44 +00:00
|
|
|
row in innodb_locks */
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* blocking_lock_row)/*!< in: pointer to the
|
2007-11-29 13:47:09 +00:00
|
|
|
relevant blocking lock
|
2007-09-20 11:23:44 +00:00
|
|
|
row in innodb_locks */
|
|
|
|
{
|
|
|
|
i_s_lock_waits_row_t* dst_row;
|
|
|
|
|
|
|
|
dst_row = (i_s_lock_waits_row_t*)
|
2007-11-16 13:12:13 +00:00
|
|
|
table_cache_create_empty_row(&cache->innodb_lock_waits,
|
|
|
|
cache);
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
if (dst_row == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
fill_lock_waits_row(dst_row, requested_lock_row, blocking_lock_row);
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Adds transaction's relevant (important) locks to cache.
|
|
|
|
If the transaction is waiting, then the wait lock is added to
|
|
|
|
innodb_locks and a pointer to the added row is returned in
|
2007-11-29 13:47:09 +00:00
|
|
|
requested_lock_row, otherwise requested_lock_row is set to NULL.
|
2007-11-16 13:12:13 +00:00
|
|
|
If rows can not be allocated then FALSE is returned and the value of
|
2009-05-25 06:46:10 +00:00
|
|
|
requested_lock_row is undefined.
|
|
|
|
@return FALSE if allocation fails */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
2007-09-20 11:23:44 +00:00
|
|
|
add_trx_relevant_locks_to_cache(
|
|
|
|
/*============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in/out: cache */
|
|
|
|
const trx_t* trx, /*!< in: transaction */
|
|
|
|
i_s_locks_row_t** requested_lock_row)/*!< out: pointer to the
|
2007-11-29 13:47:09 +00:00
|
|
|
requested lock row, or NULL or
|
|
|
|
undefined */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* If transaction is waiting we add the wait lock and all locks
|
|
|
|
from another transactions that are blocking the wait lock. */
|
|
|
|
if (trx->que_state == TRX_QUE_LOCK_WAIT) {
|
|
|
|
|
|
|
|
const lock_t* curr_lock;
|
|
|
|
ulint wait_lock_heap_no;
|
2007-11-29 13:47:09 +00:00
|
|
|
i_s_locks_row_t* blocking_lock_row;
|
2007-09-20 11:23:44 +00:00
|
|
|
lock_queue_iterator_t iter;
|
|
|
|
|
|
|
|
ut_a(trx->wait_lock != NULL);
|
|
|
|
|
|
|
|
wait_lock_heap_no
|
|
|
|
= wait_lock_get_heap_no(trx->wait_lock);
|
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
/* add the requested lock */
|
|
|
|
*requested_lock_row
|
2007-09-20 11:23:44 +00:00
|
|
|
= add_lock_to_cache(cache, trx->wait_lock,
|
|
|
|
wait_lock_heap_no);
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
/* memory could not be allocated */
|
2007-11-29 13:47:09 +00:00
|
|
|
if (*requested_lock_row == NULL) {
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* then iterate over the locks before the wait lock and
|
|
|
|
add the ones that are blocking it */
|
|
|
|
|
|
|
|
lock_queue_iterator_reset(&iter, trx->wait_lock,
|
|
|
|
ULINT_UNDEFINED);
|
|
|
|
|
|
|
|
curr_lock = lock_queue_iterator_get_prev(&iter);
|
|
|
|
while (curr_lock != NULL) {
|
|
|
|
|
|
|
|
if (lock_has_to_wait(trx->wait_lock,
|
|
|
|
curr_lock)) {
|
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
/* add the lock that is
|
|
|
|
blocking trx->wait_lock */
|
|
|
|
blocking_lock_row
|
2007-09-20 11:23:44 +00:00
|
|
|
= add_lock_to_cache(
|
|
|
|
cache, curr_lock,
|
|
|
|
/* heap_no is the same
|
|
|
|
for the wait and waited
|
|
|
|
locks */
|
|
|
|
wait_lock_heap_no);
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
/* memory could not be allocated */
|
2007-11-29 13:47:09 +00:00
|
|
|
if (blocking_lock_row == NULL) {
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* add the relation between both locks
|
|
|
|
to innodb_lock_waits */
|
2007-11-16 13:12:13 +00:00
|
|
|
if (!add_lock_wait_to_cache(
|
2007-11-29 13:47:09 +00:00
|
|
|
cache, *requested_lock_row,
|
|
|
|
blocking_lock_row)) {
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
return(FALSE);
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
curr_lock = lock_queue_iterator_get_prev(&iter);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
*requested_lock_row = NULL;
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Checks if the cache can safely be updated. */
|
|
|
|
static
|
|
|
|
ibool
|
|
|
|
can_cache_be_updated(
|
|
|
|
/*=================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
ullint now;
|
|
|
|
|
|
|
|
/* The minimum time that a cache must not be updated after it has been
|
|
|
|
read for the last time; measured in microseconds. We use this technique
|
|
|
|
to ensure that SELECTs which join several INFORMATION SCHEMA tables read
|
|
|
|
the same version of the cache. */
|
|
|
|
#define CACHE_MIN_IDLE_TIME_US 100000 /* 0.1 sec */
|
|
|
|
|
|
|
|
/* Here we read cache->last_read without acquiring its mutex
|
|
|
|
because last_read is only updated when a shared rw lock on the
|
|
|
|
whole cache is being held (see trx_i_s_cache_end_read()) and
|
|
|
|
we are currently holding an exclusive rw lock on the cache.
|
|
|
|
So it is not possible for last_read to be updated while we are
|
|
|
|
reading it. */
|
|
|
|
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_a(rw_lock_own(&cache->rw_lock, RW_LOCK_EX));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
now = ut_time_us(NULL);
|
|
|
|
if (now - cache->last_read > CACHE_MIN_IDLE_TIME_US) {
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2007-09-22 09:18:59 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Declare a cache empty, preparing it to be filled up. Not all resources
|
|
|
|
are freed because they can be reused. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
trx_i_s_cache_clear(
|
|
|
|
/*================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< out: cache to clear */
|
2007-09-22 09:18:59 +00:00
|
|
|
{
|
|
|
|
cache->innodb_trx.rows_used = 0;
|
|
|
|
cache->innodb_locks.rows_used = 0;
|
|
|
|
cache->innodb_lock_waits.rows_used = 0;
|
2007-09-24 12:25:06 +00:00
|
|
|
|
2007-09-22 09:18:59 +00:00
|
|
|
hash_table_clear(cache->locks_hash);
|
2007-09-24 12:25:06 +00:00
|
|
|
|
|
|
|
ha_storage_empty(&cache->storage);
|
2007-09-22 09:18:59 +00:00
|
|
|
}
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Fetches the data needed to fill the 3 INFORMATION SCHEMA tables into the
|
|
|
|
table cache buffer. Cache must be locked for write. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
fetch_data_into_cache(
|
|
|
|
/*==================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
trx_t* trx;
|
|
|
|
i_s_trx_row_t* trx_row;
|
2007-11-29 13:47:09 +00:00
|
|
|
i_s_locks_row_t* requested_lock_row;
|
2007-09-20 11:23:44 +00:00
|
|
|
|
branches/innodb+: Merge revisions 3931:4006 from branches/zip:
------------------------------------------------------------------------
r3938 | marko | 2009-01-15 10:28:23 +0200 (Thu, 15 Jan 2009) | 3 lines
branches/zip: buf_LRU_invalidate_tablespace(), buf_LRU_free_block():
Add comments and assertions that buf_LRU_block_remove_hashed_page()
will release block_mutex when it returns BUF_BLOCK_ZIP_FREE.
------------------------------------------------------------------------
r3939 | marko | 2009-01-15 10:37:51 +0200 (Thu, 15 Jan 2009) | 7 lines
branches/zip: buf0lru.c: Improve debug assertions.
buf_LRU_block_free_non_file_page(): ut_ad(block) before dereferencing block.
buf_LRU_block_remove_hashed_page(): Forbid buf_pool_mutex_exit() while
calling buf_buddy_free(). Callers of buf_LRU_block_remove_hashed_page()
assume that the buffer pool mutex will not be released and reacquired.
------------------------------------------------------------------------
r3944 | vasil | 2009-01-15 21:15:00 +0200 (Thu, 15 Jan 2009) | 4 lines
branches/zip:
Add ChangeLog entries for the bug fixes in r3911 and r3930.
------------------------------------------------------------------------
r3958 | marko | 2009-01-16 14:53:40 +0200 (Fri, 16 Jan 2009) | 8 lines
branches/zip: Add assertions that the kernel_mutex is being held
while accessing table->locks or un_member.tab_lock.locks.
This is related to Issue #158. According to static analysis,
the added debug assertions should always hold.
lock_table_has_to_wait_in_queue(), lock_queue_iterator_reset(),
lock_queue_iterator_get_prev(), add_trx_relevant_locks_to_cache(),
fetch_data_into_cache(): Add ut_ad(mutex_own(&kernel_mutex)).
------------------------------------------------------------------------
r4006 | marko | 2009-01-20 16:29:22 +0200 (Tue, 20 Jan 2009) | 33 lines
branches/zip: Merge revisions 3930:4005 from branches/5.1:
------------------------------------------------------------------------
r4004 | marko | 2009-01-20 16:19:00 +0200 (Tue, 20 Jan 2009) | 12 lines
branches/5.1: Merge r4003 from branches/5.0:
rec_set_nth_field(): When the field already is SQL null,
do nothing when it is being changed to SQL null. (Bug #41571)
Normally, MySQL does not pass "do-nothing" updates to the storage engine.
When it does and a column of an InnoDB table that is in ROW_FORMAT=COMPACT
is being updated from NULL to NULL, the InnoDB buffer pool will be corrupted
without this fix.
rb://81 approved by Heikki Tuuri
------------------------------------------------------------------------
r4005 | marko | 2009-01-20 16:22:36 +0200 (Tue, 20 Jan 2009) | 8 lines
branches/5.1: lock_is_table_exclusive(): Acquire kernel_mutex before
accessing table->locks and release kernel_mutex before returning from
the function. This fixes a portential race condition in the
"commit every 10,000 rows" in ALTER TABLE, CREATE INDEX, DROP INDEX,
and OPTIMIZE TABLE. (Bug #42152)
rb://80 approved by Heikki Tuuri
------------------------------------------------------------------------
2009-01-20 14:34:02 +00:00
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
|
2007-09-22 09:18:59 +00:00
|
|
|
trx_i_s_cache_clear(cache);
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
/* We iterate over the list of all transactions and add each one
|
|
|
|
to innodb_trx's cache. We also add all locks that are relevant
|
|
|
|
to each transaction into innodb_locks' and innodb_lock_waits'
|
|
|
|
caches. */
|
|
|
|
|
|
|
|
for (trx = UT_LIST_GET_FIRST(trx_sys->trx_list);
|
|
|
|
trx != NULL;
|
|
|
|
trx = UT_LIST_GET_NEXT(trx_list, trx)) {
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
if (!add_trx_relevant_locks_to_cache(cache, trx,
|
2007-11-29 13:47:09 +00:00
|
|
|
&requested_lock_row)) {
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
cache->is_truncated = TRUE;
|
|
|
|
return;
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
|
|
|
trx_row = (i_s_trx_row_t*)
|
2007-11-16 13:12:13 +00:00
|
|
|
table_cache_create_empty_row(&cache->innodb_trx,
|
|
|
|
cache);
|
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
if (trx_row == NULL) {
|
|
|
|
|
|
|
|
cache->is_truncated = TRUE;
|
|
|
|
return;
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
|
2007-11-29 13:47:09 +00:00
|
|
|
if (!fill_trx_row(trx_row, trx, requested_lock_row, cache)) {
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
/* memory could not be allocated */
|
|
|
|
cache->innodb_trx.rows_used--;
|
|
|
|
cache->is_truncated = TRUE;
|
|
|
|
return;
|
|
|
|
}
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
cache->is_truncated = FALSE;
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Update the transactions cache if it has not been read for some time.
|
2009-05-25 06:46:10 +00:00
|
|
|
Called from handler/i_s.cc.
|
|
|
|
@return 0 - fetched, 1 - not */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
int
|
|
|
|
trx_i_s_possibly_fetch_data_into_cache(
|
|
|
|
/*===================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in/out: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
if (!can_cache_be_updated(cache)) {
|
|
|
|
|
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
2007-12-17 10:10:39 +00:00
|
|
|
/* We are going to access trx->query in all transactions */
|
|
|
|
innobase_mysql_prepare_print_arbitrary_thd();
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/* We need to read trx_sys and record/table lock queues */
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
|
|
|
|
fetch_data_into_cache(cache);
|
|
|
|
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
|
2007-12-17 10:10:39 +00:00
|
|
|
innobase_mysql_end_print_arbitrary_thd();
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
2007-11-16 13:12:13 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Returns TRUE if the data in the cache is truncated due to the memory
|
2009-05-25 06:46:10 +00:00
|
|
|
limit posed by TRX_I_S_MEM_LIMIT.
|
|
|
|
@return TRUE if truncated */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-11-16 13:12:13 +00:00
|
|
|
ibool
|
|
|
|
trx_i_s_cache_is_truncated(
|
|
|
|
/*=======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-11-16 13:12:13 +00:00
|
|
|
{
|
|
|
|
return(cache->is_truncated);
|
|
|
|
}
|
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
/***********************************************************************
|
|
|
|
Initialize INFORMATION SCHEMA trx related cache. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void
|
|
|
|
trx_i_s_cache_init(
|
|
|
|
/*===============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< out: cache to init */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
2007-10-12 11:20:13 +00:00
|
|
|
/* The latching is done in the following order:
|
|
|
|
acquire trx_i_s_cache_t::rw_lock, X
|
|
|
|
acquire kernel_mutex
|
|
|
|
release kernel_mutex
|
|
|
|
release trx_i_s_cache_t::rw_lock
|
|
|
|
acquire trx_i_s_cache_t::rw_lock, S
|
|
|
|
acquire trx_i_s_cache_t::last_read_mutex
|
|
|
|
release trx_i_s_cache_t::last_read_mutex
|
|
|
|
release trx_i_s_cache_t::rw_lock */
|
|
|
|
|
|
|
|
rw_lock_create(&cache->rw_lock, SYNC_TRX_I_S_RWLOCK);
|
2007-09-22 09:03:29 +00:00
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
cache->last_read = 0;
|
|
|
|
|
2007-10-12 11:20:13 +00:00
|
|
|
mutex_create(&cache->last_read_mutex, SYNC_TRX_I_S_LAST_READ);
|
2007-09-22 09:03:29 +00:00
|
|
|
|
2007-09-20 11:23:44 +00:00
|
|
|
table_cache_init(&cache->innodb_trx, sizeof(i_s_trx_row_t));
|
|
|
|
table_cache_init(&cache->innodb_locks, sizeof(i_s_locks_row_t));
|
|
|
|
table_cache_init(&cache->innodb_lock_waits,
|
|
|
|
sizeof(i_s_lock_waits_row_t));
|
|
|
|
|
|
|
|
cache->locks_hash = hash_create(LOCKS_HASH_CELLS_NUM);
|
2007-09-24 12:25:06 +00:00
|
|
|
|
|
|
|
cache->storage = ha_storage_create(CACHE_STORAGE_INITIAL_SIZE,
|
|
|
|
CACHE_STORAGE_HASH_CELLS);
|
2007-11-16 13:12:13 +00:00
|
|
|
|
|
|
|
cache->mem_allocd = 0;
|
|
|
|
|
|
|
|
cache->is_truncated = FALSE;
|
2007-09-20 11:23:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Issue a shared/read lock on the tables cache. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void
|
|
|
|
trx_i_s_cache_start_read(
|
|
|
|
/*=====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
rw_lock_s_lock(&cache->rw_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Release a shared/read lock on the tables cache. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void
|
|
|
|
trx_i_s_cache_end_read(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
ullint now;
|
|
|
|
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_a(rw_lock_own(&cache->rw_lock, RW_LOCK_SHARED));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* update cache last read time */
|
|
|
|
now = ut_time_us(NULL);
|
|
|
|
mutex_enter(&cache->last_read_mutex);
|
|
|
|
cache->last_read = now;
|
|
|
|
mutex_exit(&cache->last_read_mutex);
|
|
|
|
|
|
|
|
rw_lock_s_unlock(&cache->rw_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Issue an exclusive/write lock on the tables cache. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void
|
|
|
|
trx_i_s_cache_start_write(
|
|
|
|
/*======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
rw_lock_x_lock(&cache->rw_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Release an exclusive/write lock on the tables cache. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void
|
|
|
|
trx_i_s_cache_end_write(
|
|
|
|
/*====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache) /*!< in: cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_a(rw_lock_own(&cache->rw_lock, RW_LOCK_EX));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
rw_lock_x_unlock(&cache->rw_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2009-05-25 06:46:10 +00:00
|
|
|
Selects a INFORMATION SCHEMA table cache from the whole cache.
|
|
|
|
@return table cache */
|
2007-09-20 11:23:44 +00:00
|
|
|
static
|
|
|
|
i_s_table_cache_t*
|
|
|
|
cache_select_table(
|
|
|
|
/*===============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in: whole cache */
|
|
|
|
enum i_s_table table) /*!< in: which table */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
i_s_table_cache_t* table_cache;
|
|
|
|
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_a(rw_lock_own(&cache->rw_lock, RW_LOCK_SHARED)
|
|
|
|
|| rw_lock_own(&cache->rw_lock, RW_LOCK_EX));
|
|
|
|
#endif
|
|
|
|
|
|
|
|
switch (table) {
|
|
|
|
case I_S_INNODB_TRX:
|
|
|
|
table_cache = &cache->innodb_trx;
|
|
|
|
break;
|
|
|
|
case I_S_INNODB_LOCKS:
|
|
|
|
table_cache = &cache->innodb_locks;
|
|
|
|
break;
|
|
|
|
case I_S_INNODB_LOCK_WAITS:
|
|
|
|
table_cache = &cache->innodb_lock_waits;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(table_cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Retrieves the number of used rows in the cache for a given
|
2009-05-25 06:46:10 +00:00
|
|
|
INFORMATION SCHEMA table.
|
|
|
|
@return number of rows */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2008-05-14 15:43:19 +00:00
|
|
|
ulint
|
2007-09-20 11:23:44 +00:00
|
|
|
trx_i_s_cache_get_rows_used(
|
|
|
|
/*========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in: cache */
|
|
|
|
enum i_s_table table) /*!< in: which table */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
i_s_table_cache_t* table_cache;
|
|
|
|
|
|
|
|
table_cache = cache_select_table(cache, table);
|
|
|
|
|
|
|
|
return(table_cache->rows_used);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Retrieves the nth row (zero-based) in the cache for a given
|
2009-05-25 06:46:10 +00:00
|
|
|
INFORMATION SCHEMA table.
|
|
|
|
@return row */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
void*
|
|
|
|
trx_i_s_cache_get_nth_row(
|
|
|
|
/*======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_i_s_cache_t* cache, /*!< in: cache */
|
|
|
|
enum i_s_table table, /*!< in: which table */
|
|
|
|
ulint n) /*!< in: row number */
|
2007-09-20 11:23:44 +00:00
|
|
|
{
|
|
|
|
i_s_table_cache_t* table_cache;
|
|
|
|
ulint i;
|
|
|
|
void* row;
|
|
|
|
|
|
|
|
table_cache = cache_select_table(cache, table);
|
|
|
|
|
|
|
|
ut_a(n < table_cache->rows_used);
|
|
|
|
|
|
|
|
row = NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < MEM_CHUNKS_IN_TABLE_CACHE; i++) {
|
|
|
|
|
|
|
|
if (table_cache->chunks[i].offset
|
|
|
|
+ table_cache->chunks[i].rows_allocd > n) {
|
|
|
|
|
|
|
|
row = (char*) table_cache->chunks[i].base
|
|
|
|
+ (n - table_cache->chunks[i].offset)
|
|
|
|
* table_cache->row_size;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_a(row != NULL);
|
|
|
|
|
|
|
|
return(row);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
Crafts a lock id string from a i_s_locks_row_t object. Returns its
|
|
|
|
second argument. This function aborts if there is not enough space in
|
2007-12-18 09:44:03 +00:00
|
|
|
lock_id. Be sure to provide at least TRX_I_S_LOCK_ID_MAX_LEN + 1 if you
|
2009-05-25 06:46:10 +00:00
|
|
|
want to be 100% sure that it will not abort.
|
|
|
|
@return resulting lock id */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-09-20 11:23:44 +00:00
|
|
|
char*
|
|
|
|
trx_i_s_create_lock_id(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const i_s_locks_row_t* row, /*!< in: innodb_locks row */
|
|
|
|
char* lock_id,/*!< out: resulting lock_id */
|
|
|
|
ulint lock_id_size)/*!< in: size of the lock id
|
2007-09-20 11:23:44 +00:00
|
|
|
buffer */
|
|
|
|
{
|
|
|
|
int res_len;
|
|
|
|
|
|
|
|
/* please adjust TRX_I_S_LOCK_ID_MAX_LEN if you change this */
|
|
|
|
|
|
|
|
if (row->lock_space != ULINT_UNDEFINED) {
|
|
|
|
/* record lock */
|
|
|
|
res_len = ut_snprintf(lock_id, lock_id_size,
|
2007-12-20 14:24:57 +00:00
|
|
|
TRX_ID_FMT ":%lu:%lu:%lu",
|
2007-09-20 11:23:44 +00:00
|
|
|
row->lock_trx_id, row->lock_space,
|
|
|
|
row->lock_page, row->lock_rec);
|
|
|
|
} else {
|
|
|
|
/* table lock */
|
|
|
|
res_len = ut_snprintf(lock_id, lock_id_size,
|
2007-12-20 14:24:57 +00:00
|
|
|
TRX_ID_FMT ":%llu",
|
2007-09-20 11:23:44 +00:00
|
|
|
row->lock_trx_id,
|
|
|
|
row->lock_table_id);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* the typecast is safe because snprintf(3) never returns
|
|
|
|
negative result */
|
|
|
|
ut_a(res_len >= 0);
|
|
|
|
ut_a((ulint) res_len < lock_id_size);
|
|
|
|
|
|
|
|
return(lock_id);
|
|
|
|
}
|