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
|
|
|
/*****************************************************************************
|
|
|
|
|
2013-01-14 10:57:04 +05:30
|
|
|
Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved.
|
branches/innodb+: Merge revisions 4150:4528 from branches/zip:
------------------------------------------------------------------------
r4152 | marko | 2009-02-10 12:52:27 +0200 (Tue, 10 Feb 2009) | 12 lines
branches/zip: When innodb_use_sys_malloc is set, ignore
innodb_additional_mem_pool_size, because nothing will
be allocated from mem_comm_pool.
mem_pool_create(): Remove the assertion about size. The function will
work with any size. However, an assertion would fail in ut_malloc_low()
when size==0.
mem_init(): When srv_use_sys_malloc is set, pass size=1 to mem_pool_create().
mem0mem.c: Add #include "srv0srv.h" that is needed by mem0dbg.c.
------------------------------------------------------------------------
r4153 | vasil | 2009-02-10 22:58:17 +0200 (Tue, 10 Feb 2009) | 14 lines
branches/zip:
(followup to r4145) Non-functional change:
Change the os_atomic_increment() and os_compare_and_swap() functions
to macros to avoid artificial limitations on the types of those
functions' arguments. As a consequence typecasts from the source
code can be removed.
Also remove Google's copyright from os0sync.ic because that file no longer
contains code from Google.
Approved by: Marko (rb://88), also ok from Inaam via IM
------------------------------------------------------------------------
r4163 | marko | 2009-02-12 00:14:19 +0200 (Thu, 12 Feb 2009) | 4 lines
branches/zip: Make innodb_thread_concurrency=0 the default.
The old default was 8.
------------------------------------------------------------------------
r4169 | calvin | 2009-02-12 10:37:10 +0200 (Thu, 12 Feb 2009) | 3 lines
branches/zip: Adjust the result file of innodb_thread_concurrency_basic
test. The default value of innodb_thread_concurrency is changed to 0
(from 8) via r4163.
------------------------------------------------------------------------
r4174 | vasil | 2009-02-12 17:38:27 +0200 (Thu, 12 Feb 2009) | 4 lines
branches/zip:
Fix pathname of the file to patch.
------------------------------------------------------------------------
r4176 | vasil | 2009-02-13 10:06:31 +0200 (Fri, 13 Feb 2009) | 7 lines
branches/zip:
Fix the failing mysql-test partition_innodb, which failed only if run after
innodb_trx_weight (or other test that would leave LATEST DEADLOCK ERROR into
the output of SHOW ENGINE INNODB STATUS). Find further explanation for the
failure at the top of the added patch partition_innodb.diff.
------------------------------------------------------------------------
r4198 | vasil | 2009-02-17 09:06:07 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
Add the full text of the GPLv2 license into the root directory of the
plugin. In previous releases this file was copied from an external source
(https://svn.innodb.com/svn/plugin/trunk/support/COPYING) "manually" when
creating the source and binary archives. It is less confusing to have this
present in the root directory of the SVN branch.
------------------------------------------------------------------------
r4199 | vasil | 2009-02-17 09:11:58 +0200 (Tue, 17 Feb 2009) | 4 lines
branches/zip:
Add Google's license into COPYING.Google.
------------------------------------------------------------------------
r4200 | vasil | 2009-02-17 09:56:33 +0200 (Tue, 17 Feb 2009) | 11 lines
branches/zip:
To the files touched by the Google patch from c4144 (excluding
include/os0sync.ic because later we removed Google code from that file):
* Remove the Google license
* Remove old Innobase copyright lines
* Add a reference to the Google license and to the GPLv2 license at the top,
as recommended by the lawyers at Oracle Legal.
------------------------------------------------------------------------
r4201 | vasil | 2009-02-17 10:12:02 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 1/28]
------------------------------------------------------------------------
r4202 | vasil | 2009-02-17 10:15:06 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 2/28]
------------------------------------------------------------------------
r4203 | vasil | 2009-02-17 10:25:45 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 3/28]
------------------------------------------------------------------------
r4204 | vasil | 2009-02-17 10:55:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 4/28]
------------------------------------------------------------------------
r4205 | vasil | 2009-02-17 10:59:22 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 5/28]
------------------------------------------------------------------------
r4206 | vasil | 2009-02-17 11:02:27 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 6/28]
------------------------------------------------------------------------
r4207 | vasil | 2009-02-17 11:04:28 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 7/28]
------------------------------------------------------------------------
r4208 | vasil | 2009-02-17 11:06:49 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 8/28]
------------------------------------------------------------------------
r4209 | vasil | 2009-02-17 11:10:18 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 9/28]
------------------------------------------------------------------------
r4210 | vasil | 2009-02-17 11:12:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 10/28]
------------------------------------------------------------------------
r4211 | vasil | 2009-02-17 11:14:40 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 11/28]
------------------------------------------------------------------------
r4212 | vasil | 2009-02-17 11:18:35 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 12/28]
------------------------------------------------------------------------
r4213 | vasil | 2009-02-17 11:24:40 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 13/28]
------------------------------------------------------------------------
r4214 | vasil | 2009-02-17 11:27:31 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 13/28]
------------------------------------------------------------------------
r4215 | vasil | 2009-02-17 11:29:55 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 15/28]
------------------------------------------------------------------------
r4216 | vasil | 2009-02-17 11:33:38 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 16/28]
------------------------------------------------------------------------
r4217 | vasil | 2009-02-17 11:36:44 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 17/28]
------------------------------------------------------------------------
r4218 | vasil | 2009-02-17 11:39:11 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 18/28]
------------------------------------------------------------------------
r4219 | vasil | 2009-02-17 11:41:24 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 19/28]
------------------------------------------------------------------------
r4220 | vasil | 2009-02-17 11:43:50 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 20/28]
------------------------------------------------------------------------
r4221 | vasil | 2009-02-17 11:46:52 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 21/28]
------------------------------------------------------------------------
r4222 | vasil | 2009-02-17 11:50:12 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 22/28]
------------------------------------------------------------------------
r4223 | vasil | 2009-02-17 11:53:58 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 23/28]
------------------------------------------------------------------------
r4224 | vasil | 2009-02-17 12:01:41 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 24/28]
------------------------------------------------------------------------
r4225 | vasil | 2009-02-17 12:05:45 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 25/28]
------------------------------------------------------------------------
r4226 | vasil | 2009-02-17 12:09:16 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 26/28]
------------------------------------------------------------------------
r4227 | vasil | 2009-02-17 12:12:56 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 27/28]
------------------------------------------------------------------------
r4228 | vasil | 2009-02-17 12:14:04 +0200 (Tue, 17 Feb 2009) | 8 lines
branches/zip:
* Remove old Innobase copyright lines from C source files
* Add a reference to the GPLv2 license as recommended by the lawyers
at Oracle Legal
[Step 28/28]
------------------------------------------------------------------------
r4229 | vasil | 2009-02-17 12:30:55 +0200 (Tue, 17 Feb 2009) | 4 lines
branches/zip:
Add the copyright notice to the non C files.
------------------------------------------------------------------------
r4231 | marko | 2009-02-17 14:26:53 +0200 (Tue, 17 Feb 2009) | 12 lines
Minor cleanup of the Google SMP patch.
sync_array_object_signalled(): Add a (void) cast to eliminate a gcc warning
about the return value of os_atomic_increment() being ignored.
rw_lock_create_func(): Properly indent the preprocessor directives.
rw_lock_x_lock_low(), rw_lock_x_lock_func_nowait(): Split lines correctly.
rw_lock_set_writer_id_and_recursion_flag(): Silence a Valgrind warning.
Do not mix statements and variable declarations.
------------------------------------------------------------------------
r4232 | marko | 2009-02-17 14:59:54 +0200 (Tue, 17 Feb 2009) | 3 lines
branches/zip: When assigning lock->recursive = FALSE, also flag
lock->writer_thread invalid, so that Valgrind will catch more errors.
This is related to Issue #175.
------------------------------------------------------------------------
r4242 | marko | 2009-02-18 17:01:09 +0200 (Wed, 18 Feb 2009) | 2 lines
branches/zip: UT_DBG_STOP: Use do{} while(0) to silence a g++-4.3.2 warning
about a while(0); statement. This should fix (part of) Issue #176.
------------------------------------------------------------------------
r4243 | marko | 2009-02-18 17:04:03 +0200 (Wed, 18 Feb 2009) | 3 lines
branches/zip: buf_buddy_get_slot(): Fix a gcc 4.3.2 warning
about an empty body of a "for" statement.
This fixes part of Issue #176.
------------------------------------------------------------------------
r4244 | marko | 2009-02-18 17:25:45 +0200 (Wed, 18 Feb 2009) | 11 lines
branches/zip: Protect ut_total_allocated_memory with ut_list_mutex.
Unprotected updates to ut_total_allocated_memory in
os_mem_alloc_large() and os_mem_free_large(), called during
fast index creation, may corrupt the variable and cause assertion failures.
Also, add UNIV_MEM_ALLOC() and UNIV_MEM_FREE() instrumentation around
os_mem_alloc_large() and os_mem_free_large(), so that Valgrind can
detect more errors.
rb://90 approved by Heikki Tuuri. This addresses Issue #177.
------------------------------------------------------------------------
r4248 | marko | 2009-02-19 11:52:39 +0200 (Thu, 19 Feb 2009) | 2 lines
branches/zip: page_zip_set_size(): Fix a g++ 4.3.2 warning
about an empty body in a "for" statement. This closes Issue #176.
------------------------------------------------------------------------
r4251 | inaam | 2009-02-19 15:46:27 +0200 (Thu, 19 Feb 2009) | 8 lines
branches/zip: Issue #178 rb://91
Change plug.in to have same CXXFLAGS as CFLAGS. This is to ensure that
both .c and .cc files get compiled with same flags. To fix the issue
where UNIV_LINUX was defined only in .c files.
Approved by: Marko
------------------------------------------------------------------------
r4258 | vasil | 2009-02-20 11:52:19 +0200 (Fri, 20 Feb 2009) | 7 lines
branches/zip:
Cleanup in ChangeLog:
* Wrap lines at 78 characters
* Changed files are listed alphabetically
* White-space cleanup
------------------------------------------------------------------------
r4259 | vasil | 2009-02-20 11:59:42 +0200 (Fri, 20 Feb 2009) | 6 lines
branches/zip:
ChangeLog: Remove include/os0sync.ic from the entry about the google patch,
this file was modified later to not include Google's code.
------------------------------------------------------------------------
r4262 | vasil | 2009-02-20 14:56:59 +0200 (Fri, 20 Feb 2009) | 373 lines
branches/zip:
Merge revisions 4035:4261 from branches/5.1:
------------------------------------------------------------------------
r4065 | sunny | 2009-01-29 16:01:36 +0200 (Thu, 29 Jan 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: In the last round of AUTOINC cleanup we assumed that AUTOINC
is only defined for integer columns. This caused an assertion failure when
we checked for the maximum value of a column type. We now calculate the
max value for floating-point autoinc columns too.
Fix Bug#42400 - InnoDB autoinc code can't handle floating-point columns
rb://84 and Mantis issue://162
------------------------------------------------------------------------
r4111 | sunny | 2009-02-03 22:06:52 +0200 (Tue, 03 Feb 2009) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add the ULL suffix otherwise there is an overflow.
------------------------------------------------------------------------
r4128 | vasil | 2009-02-08 21:36:45 +0200 (Sun, 08 Feb 2009) | 18 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2709.20.31
committer: Timothy Smith <timothy.smith@sun.com>
branch nick: 51
timestamp: Fri 2008-12-19 01:28:51 +0100
message:
Disable part of innodb-autoinc.test, because the MySQL server asserts when
compiled --with-debug, due to bug 39828, "autoinc wraps around when offset and
increment > 1". This change should be reverted when that bug is fixed (and a
a few other minor changes to the test as described in comments).
modified:
mysql-test/r/innodb-autoinc.result
mysql-test/t/innodb-autoinc.test
------------------------------------------------------------------------
r4129 | vasil | 2009-02-08 21:54:25 +0200 (Sun, 08 Feb 2009) | 310 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Merge a change from MySQL:
[looks like the changes to innodb-autoinc.test were made as part of
the following huge merge, but we are merging only changes to that file]
------------------------------------------------------------
revno: 2546.47.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: 5.1-rpl
timestamp: Fri 2009-01-23 13:22:05 +0100
message:
merge: 5.1 -> 5.1-rpl
conflicts:
Text conflict in client/mysqltest.cc
Text conflict in mysql-test/include/wait_until_connected_again.inc
Text conflict in mysql-test/lib/mtr_report.pm
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/r/events_bugs.result
Text conflict in mysql-test/r/log_state.result
Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
Text conflict in mysql-test/r/mysqlcheck.result
Text conflict in mysql-test/r/query_cache.result
Text conflict in mysql-test/r/status.result
Text conflict in mysql-test/suite/binlog/r/binlog_index.result
Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
Text conflict in mysql-test/t/disabled.def
Text conflict in mysql-test/t/events_bugs.test
Text conflict in mysql-test/t/log_state.test
Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
Text conflict in mysql-test/t/mysqlcheck.test
Text conflict in mysql-test/t/query_cache.test
Text conflict in mysql-test/t/rpl_init_slave_func.test
Text conflict in mysql-test/t/status.test
removed:
mysql-test/suite/parts/r/partition_bit_ndb.result
mysql-test/suite/parts/t/partition_bit_ndb.test
mysql-test/suite/parts/t/partition_sessions.test
mysql-test/suite/sys_vars/inc/tmp_table_size_basic.inc
mysql-test/suite/sys_vars/r/tmp_table_size_basic_32.result
mysql-test/suite/sys_vars/r/tmp_table_size_basic_64.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic_32.test
mysql-test/suite/sys_vars/t/tmp_table_size_basic_64.test
mysql-test/t/log_bin_trust_function_creators_func-master.opt
mysql-test/t/rpl_init_slave_func-slave.opt
added:
mysql-test/include/check_events_off.inc
mysql-test/include/cleanup_fake_relay_log.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/no_running_event_scheduler.inc
mysql-test/include/no_running_events.inc
mysql-test/include/running_event_scheduler.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/wait_condition_sp.inc
mysql-test/r/fulltext_plugin.result
mysql-test/r/have_simple_parser.require
mysql-test/r/innodb_bug38231.result
mysql-test/r/innodb_bug39438.result
mysql-test/r/innodb_mysql_rbk.result
mysql-test/r/partition_innodb_semi_consistent.result
mysql-test/r/query_cache_28249.result
mysql-test/r/status2.result
mysql-test/std_data/bug40482-bin.000001
mysql-test/suite/binlog/r/binlog_innodb_row.result
mysql-test/suite/binlog/t/binlog_innodb_row.test
mysql-test/suite/rpl/r/rpl_binlog_corruption.result
mysql-test/suite/rpl/t/rpl_binlog_corruption-master.opt
mysql-test/suite/rpl/t/rpl_binlog_corruption.test
mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
mysql-test/t/fulltext_plugin-master.opt
mysql-test/t/fulltext_plugin.test
mysql-test/t/innodb_bug38231.test
mysql-test/t/innodb_bug39438-master.opt
mysql-test/t/innodb_bug39438.test
mysql-test/t/innodb_mysql_rbk-master.opt
mysql-test/t/innodb_mysql_rbk.test
mysql-test/t/partition_innodb_semi_consistent-master.opt
mysql-test/t/partition_innodb_semi_consistent.test
mysql-test/t/query_cache_28249.test
mysql-test/t/status2.test
renamed:
mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result => mysql-test/suite/funcs_1/r/is_coll_char_set_appl.result
mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test => mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
modified:
.bzr-mysql/default.conf
CMakeLists.txt
client/mysql.cc
client/mysql_upgrade.c
client/mysqlcheck.c
client/mysqltest.cc
configure.in
extra/resolve_stack_dump.c
extra/yassl/include/openssl/ssl.h
include/config-win.h
include/m_ctype.h
include/my_global.h
mysql-test/extra/binlog_tests/database.test
mysql-test/extra/rpl_tests/rpl_auto_increment.test
mysql-test/include/commit.inc
mysql-test/include/have_32bit.inc
mysql-test/include/have_64bit.inc
mysql-test/include/index_merge1.inc
mysql-test/include/linux_sys_vars.inc
mysql-test/include/windows_sys_vars.inc
mysql-test/lib/mtr_report.pm
mysql-test/mysql-test-run.pl
mysql-test/r/alter_table.result
mysql-test/r/commit_1innodb.result
mysql-test/r/create.result
mysql-test/r/csv.result
mysql-test/r/ctype_ucs.result
mysql-test/r/date_formats.result
mysql-test/r/events_bugs.result
mysql-test/r/events_scheduling.result
mysql-test/r/fulltext.result
mysql-test/r/func_if.result
mysql-test/r/func_in.result
mysql-test/r/func_str.result
mysql-test/r/func_time.result
mysql-test/r/grant.result
mysql-test/r/index_merge_myisam.result
mysql-test/r/information_schema.result
mysql-test/r/innodb-autoinc.result
mysql-test/r/innodb.result
mysql-test/r/innodb_mysql.result
mysql-test/r/log_bin_trust_function_creators_func.result
mysql-test/r/log_state.result
mysql-test/r/myisampack.result
mysql-test/r/mysql.result
mysql-test/r/mysqlcheck.result
mysql-test/r/partition_datatype.result
mysql-test/r/partition_mgm.result
mysql-test/r/partition_pruning.result
mysql-test/r/query_cache.result
mysql-test/r/read_buffer_size_basic.result
mysql-test/r/read_rnd_buffer_size_basic.result
mysql-test/r/rpl_init_slave_func.result
mysql-test/r/select.result
mysql-test/r/status.result
mysql-test/r/strict.result
mysql-test/r/temp_table.result
mysql-test/r/type_bit.result
mysql-test/r/type_date.result
mysql-test/r/type_float.result
mysql-test/r/warnings_engine_disabled.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_database.result
mysql-test/suite/binlog/r/binlog_index.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/t/binlog_innodb.test
mysql-test/suite/funcs_1/r/is_columns_is.result
mysql-test/suite/funcs_1/r/is_engines.result
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/storedproc/param_check.inc
mysql-test/suite/funcs_2/t/disabled.def
mysql-test/suite/ndb/t/disabled.def
mysql-test/suite/parts/r/partition_bit_innodb.result
mysql-test/suite/parts/r/partition_bit_myisam.result
mysql-test/suite/parts/r/partition_special_innodb.result
mysql-test/suite/parts/t/disabled.def
mysql-test/suite/parts/t/partition_special_innodb.test
mysql-test/suite/parts/t/partition_value_innodb.test
mysql-test/suite/parts/t/partition_value_myisam.test
mysql-test/suite/parts/t/partition_value_ndb.test
mysql-test/suite/rpl/r/rpl_auto_increment.result
mysql-test/suite/rpl/r/rpl_packet.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_slave_skip.result
mysql-test/suite/rpl/r/rpl_trigger.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_trigger.test
mysql-test/suite/rpl_ndb/t/disabled.def
mysql-test/suite/sys_vars/inc/key_buffer_size_basic.inc
mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
mysql-test/suite/sys_vars/r/key_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/key_buffer_size_basic_64.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_32.result
mysql-test/suite/sys_vars/r/sort_buffer_size_basic_64.result
mysql-test/t/alter_table.test
mysql-test/t/create.test
mysql-test/t/csv.test
mysql-test/t/ctype_ucs.test
mysql-test/t/date_formats.test
mysql-test/t/disabled.def
mysql-test/t/events_bugs.test
mysql-test/t/events_scheduling.test
mysql-test/t/fulltext.test
mysql-test/t/func_if.test
mysql-test/t/func_in.test
mysql-test/t/func_str.test
mysql-test/t/func_time.test
mysql-test/t/grant.test
mysql-test/t/information_schema.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/innodb.test
mysql-test/t/innodb_mysql.test
mysql-test/t/log_bin_trust_function_creators_func.test
mysql-test/t/log_state.test
mysql-test/t/myisam_data_pointer_size_func.test
mysql-test/t/myisampack.test
mysql-test/t/mysql.test
mysql-test/t/mysqlcheck.test
mysql-test/t/partition_innodb_stmt.test
mysql-test/t/partition_mgm.test
mysql-test/t/partition_pruning.test
mysql-test/t/query_cache.test
mysql-test/t/rpl_init_slave_func.test
mysql-test/t/select.test
mysql-test/t/status.test
mysql-test/t/strict.test
mysql-test/t/temp_table.test
mysql-test/t/type_bit.test
mysql-test/t/type_date.test
mysql-test/t/type_float.test
mysql-test/t/warnings_engine_disabled.test
mysql-test/t/xml.test
mysys/my_getopt.c
mysys/my_init.c
scripts/mysql_install_db.sh
sql-common/my_time.c
sql/field.cc
sql/field.h
sql/filesort.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.h
sql/item_strfunc.cc
sql/item_sum.cc
sql/item_timefunc.cc
sql/item_timefunc.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/partition_info.cc
sql/repl_failsafe.cc
sql/rpl_constants.h
sql/set_var.cc
sql/slave.cc
sql/spatial.h
sql/sql_acl.cc
sql/sql_base.cc
sql/sql_binlog.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_delete.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_locale.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.cc
sql/sql_select.h
sql/sql_show.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_trigger.h
sql/table.cc
sql/table.h
sql/unireg.cc
storage/csv/ha_tina.cc
storage/federated/ha_federated.cc
storage/heap/ha_heap.cc
storage/innobase/Makefile.am
storage/innobase/btr/btr0sea.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0mem.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innobase/include/btr0sea.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/ha_prototypes.h
storage/innobase/include/lock0lock.h
storage/innobase/include/row0mysql.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/ut0ut.h
storage/innobase/lock/lock0lock.c
storage/innobase/os/os0file.c
storage/innobase/plug.in
storage/innobase/row/row0mysql.c
storage/innobase/row/row0sel.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_boolean_search.c
strings/ctype.c
strings/xml.c
tests/mysql_client_test.c
win/configure.js
mysql-test/suite/funcs_1/t/is_coll_char_set_appl.test
------------------------------------------------------------------------
r4165 | calvin | 2009-02-12 01:34:27 +0200 (Thu, 12 Feb 2009) | 1 line
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: minor non-functional changes.
------------------------------------------------------------------------
------------------------------------------------------------------------
r4263 | vasil | 2009-02-20 15:00:46 +0200 (Fri, 20 Feb 2009) | 4 lines
branches/zip:
Add a ChangeLog entry for a change in r4262.
------------------------------------------------------------------------
r4265 | marko | 2009-02-20 22:31:03 +0200 (Fri, 20 Feb 2009) | 5 lines
branches/zip: Make innodb_use_sys_malloc=ON the default.
Replace srv_use_sys_malloc with UNIV_LIKELY(srv_use_sys_malloc)
to improve branch prediction in the default case.
Approved by Ken over the IM.
------------------------------------------------------------------------
r4266 | vasil | 2009-02-20 23:29:32 +0200 (Fri, 20 Feb 2009) | 7 lines
branches/zip:
Add a sentence at the top of COPYING.Google to clarify that this license
does not apply to the whole InnoDB.
Suggested by: Ken
------------------------------------------------------------------------
r4268 | marko | 2009-02-23 12:43:51 +0200 (Mon, 23 Feb 2009) | 9 lines
branches/zip: Initialize ut_list_mutex at startup. Without this fix,
ut_list_mutex would be used uninitialized when innodb_use_sys_malloc=1.
This fix addresses Issue #181.
ut_mem_block_list_init(): Rename to ut_mem_init() and make public.
ut_malloc_low(), ut_free_all_mem(): Add ut_a(ut_mem_block_list_inited).
mem_init(): Call ut_mem_init().
------------------------------------------------------------------------
r4269 | marko | 2009-02-23 15:09:49 +0200 (Mon, 23 Feb 2009) | 7 lines
branches/zip: When freeing an uncompressed BLOB page, tolerate garbage in
FIL_PAGE_TYPE. (Bug #43043, Issue #182)
btr_check_blob_fil_page_type(): New function.
btr_free_externally_stored_field(), btr_copy_blob_prefix():
Call btr_check_blob_fil_page_type() to check FIL_PAGE_TYPE.
------------------------------------------------------------------------
r4272 | marko | 2009-02-23 23:10:18 +0200 (Mon, 23 Feb 2009) | 8 lines
branches/zip: Adjust the fix of Issue #182 in r4269 per Inaam's suggestion.
btr_check_blob_fil_page_type(): Replace the parameter
const char* op
with
ibool read. Do not print anything about page type mismatch
when reading a BLOB page in Antelope format.
Print space id before page number.
------------------------------------------------------------------------
r4273 | marko | 2009-02-24 00:11:11 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: ut_mem_init(): Add the assertion !ut_mem_block_list_inited.
------------------------------------------------------------------------
r4274 | marko | 2009-02-24 00:14:38 +0200 (Tue, 24 Feb 2009) | 12 lines
branches/zip: Fix bugs in the fix of Issue #181. Tested inside and
outside Valgrind, with innodb_use_sys_malloc set to 0 and 1.
mem_init(): Invoke ut_mem_init() before mem_pool_create(), because
the latter one will invoke ut_malloc().
srv_general_init(): Do not initialize the memory subsystem (mem_init()).
innobase_init(): Initialize the memory subsystem (mem_init()) before
calling srv_parse_data_file_paths_and_sizes(), which needs ut_malloc().
Call ut_free_all_mem() in error handling to clean up after the mem_init().
------------------------------------------------------------------------
r4280 | marko | 2009-02-24 15:14:59 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: Remove unused function os_mem_alloc_nocache().
------------------------------------------------------------------------
r4281 | marko | 2009-02-24 16:02:48 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: Remove the unused function dict_index_get_type().
------------------------------------------------------------------------
r4283 | marko | 2009-02-24 23:06:56 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: srv0start.c: Remove unnecessary #include "mem0pool.h".
------------------------------------------------------------------------
r4284 | marko | 2009-02-24 23:26:38 +0200 (Tue, 24 Feb 2009) | 1 line
branches/zip: mem0mem.c: Remove unnecessary #include "mach0data.h".
------------------------------------------------------------------------
r4288 | vasil | 2009-02-25 10:48:07 +0200 (Wed, 25 Feb 2009) | 21 lines
branches/zip: Merge revisions 4261:4287 from branches/5.1:
------------------------------------------------------------------------
r4287 | sunny | 2009-02-25 05:32:01 +0200 (Wed, 25 Feb 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#42714 AUTO_INCREMENT errors in 5.1.31. There are two
changes to the autoinc handling.
1. To fix the immediate problem from the bug report, we must ensure that the
value written to the table is always less than the max value stored in
dict_table_t.
2. The second related change is that according to MySQL documentation when
the offset is greater than the increment, we should ignore the offset.
------------------------------------------------------------------------
------------------------------------------------------------------------
r4289 | vasil | 2009-02-25 10:53:51 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the fix in r4288.
------------------------------------------------------------------------
r4290 | vasil | 2009-02-25 11:05:44 +0200 (Wed, 25 Feb 2009) | 11 lines
branches/zip:
Make ChangeLog entries for bugs in bugs.mysql.com in the form:
Fix Bug#12345 bug title
(for bugs after 1.0.2 was released and the ChangeLog published)
There is no need to bloat the ChangeLog with information that is available
via bugs.mysql.com.
Discussed with: Marko
------------------------------------------------------------------------
r4291 | vasil | 2009-02-25 11:08:32 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
Fix Bug synopsis and remove explanation
------------------------------------------------------------------------
r4292 | marko | 2009-02-25 12:09:15 +0200 (Wed, 25 Feb 2009) | 25 lines
branches/zip: Correct the initialization of the memory subsystem once
again, to finally put Issue #181 to rest.
Revert some parts of r4274. It is best not to call ut_malloc() before
srv_general_init().
mem_init(): Do not call ut_mem_init().
srv_general_init(): Initialize the memory subsystem in two phases:
first ut_mem_init(), then mem_init(). This is because os_sync_init()
and sync_init() depend on ut_mem_init() and mem_init() depends on
os_sync_init() or sync_init().
srv_parse_data_file_paths_and_sizes(),
srv_parse_log_group_home_dirs(): Remove the output parameters. Assign
to the global variables directly. Allocate memory with malloc()
instead of ut_malloc(), because these functions will be called before
srv_general_init().
srv_free_paths_and_sizes(): New function, for cleaning up after
srv_parse_data_file_paths_and_sizes() and
srv_parse_log_group_home_dirs().
rb://92 approved by Sunny Bains
------------------------------------------------------------------------
r4297 | vasil | 2009-02-25 17:19:19 +0200 (Wed, 25 Feb 2009) | 4 lines
branches/zip:
White-space cleanup in the ChangeLog
------------------------------------------------------------------------
r4301 | vasil | 2009-02-25 21:33:32 +0200 (Wed, 25 Feb 2009) | 5 lines
branches/zip:
Do not output the commands that restore the environment because they depend
on the state of the environment before the test starts executing.
------------------------------------------------------------------------
r4315 | vasil | 2009-02-26 09:21:20 +0200 (Thu, 26 Feb 2009) | 5 lines
branches/zip:
Apply any necessary patches to the mysql tree at the end of setup.sh
This step was previously done manually (and sometimes forgotten).
------------------------------------------------------------------------
r4319 | marko | 2009-02-26 23:27:51 +0200 (Thu, 26 Feb 2009) | 6 lines
branches/zip: btr_check_blob_fil_page_type(): Do not report
FIL_PAGE_TYPE mismatch even when purging a BLOB.
Heavy users may have large data files created with MySQL 5.0 or earlier,
and they don not want to have the error log flooded with such messages.
This fixes Issue #182.
------------------------------------------------------------------------
r4320 | inaam | 2009-02-27 02:13:19 +0200 (Fri, 27 Feb 2009) | 8 lines
branches/zip
This is to revert the changes made to the plug.in (r4251) as a fix for
issue# 178. Changes to plug.in will not propogate to a plugin
installation unless autotools are rerun which is unacceptable.
A fix for issue# 178 will be committed in a separate commit.
------------------------------------------------------------------------
r4321 | inaam | 2009-02-27 02:16:46 +0200 (Fri, 27 Feb 2009) | 6 lines
branches/zip
This is a fix for issue#178. Instead of using UNIV_LINUX which is
defined through CFLAGS we use compiler generated define __linux__
that is effective for both .c and .cc files.
------------------------------------------------------------------------
r4324 | vasil | 2009-02-27 13:27:18 +0200 (Fri, 27 Feb 2009) | 39 lines
branches/zip:
Add FreeBSD to the list of the operating systems that have
sizeof(pthread_t) == sizeof(void*) (i.e. word size).
On FreeBSD pthread_t is defined like:
/usr/include/sys/_pthreadtypes.h:
typedef struct pthread *pthread_t;
I did the following tests (per Inaam's recommendation):
a) appropriate version of GCC is available on that platform (4.1.2 or
higher for atomics to be available)
On FreeBSD 6.x the default compiler is 3.4.6, on FreeBSD 7.x the default
one is 4.2.1. One can always install the version of choice from the ports
collection. If gcc 3.x is used then HAVE_GCC_ATOMIC_BUILTINS will not be
defined and thus the change I am committing will make no difference.
b) find out if sizeof(pthread_t) == sizeof(long)
On 32 bit both are 4 bytes, on 64 bit both are 8 bytes.
c) find out the compiler generated platform define (e.g.: __aix, __sunos__
etc.)
The macro is __FreeBSD__.
d) patch univ.i with the appropriate platform define
e) build the mysql
f) ensure it is using atomic builtins (look at the err.log message at
system startup. It should say we are using atomics for both mutexes and
rw-locks)
g) do sanity testing (keeping in view the smp changes)
I ran the mysql-test suite. All tests pass.
------------------------------------------------------------------------
r4353 | vasil | 2009-03-05 09:27:29 +0200 (Thu, 05 Mar 2009) | 6 lines
branches/zip:
As suggested by Ken, print a message that says that the Google SMP patch
(GCC atomics) is disabled if it is. Also extend the message when the patch
is partially enabled to make it clear that it is partially enabled.
------------------------------------------------------------------------
r4356 | vasil | 2009-03-05 13:49:51 +0200 (Thu, 05 Mar 2009) | 4 lines
branches/zip:
Fix typo made in r4353.
------------------------------------------------------------------------
r4357 | vasil | 2009-03-05 16:38:59 +0200 (Thu, 05 Mar 2009) | 23 lines
branches/zip:
Implement a check whether pthread_t objects can be used by GCC atomic
builtin functions. This check is implemented in plug.in and defines the
macro HAVE_ATOMIC_PTHREAD_T. This macro is checked in univ.i and the
relevant part of the code enabled (the one that uses GCC atomics against
pthread_t objects).
In addition to this, the same program that is compiled as part of the
plug.in check is added in ut/ut0auxconf.c. In the InnoDB Plugin source
archives that are shipped to the users, a generated Makefile.in is added.
That Makefile.in will be modified to compile ut/ut0auxconf.c and define
the macro HAVE_ATOMIC_PTHREAD_T if the compilation succeeds. I.e.
Makefile.in will emulate the work that is done by plug.in. This is done in
order to make the check happen and HAVE_ATOMIC_PTHREAD_T eventually
defined without regenerating MySQL's ./configure from
./storage/innobase/plug.in. The point is not to ask users to install the
autotools and regenerate ./configure.
rb://95
Approved by: Marko
------------------------------------------------------------------------
r4360 | vasil | 2009-03-05 22:23:17 +0200 (Thu, 05 Mar 2009) | 21 lines
branches/zip: Merge revisions 4287:4357 from branches/5.1:
------------------------------------------------------------------------
r4325 | sunny | 2009-03-02 02:28:52 +0200 (Mon, 02 Mar 2009) | 10 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Bug#43203: Overflow from auto incrementing causes server segv
It was not a SIGSEGV but an assertion failure. The assertion was checking
the invariant that *first_value passed in by MySQL doesn't contain a value
that is greater than the max value for that type. The assertion has been
changed to a check and if the value is greater than the max we report a
generic AUTOINC failure.
rb://93
Approved by Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r4361 | vasil | 2009-03-05 22:27:54 +0200 (Thu, 05 Mar 2009) | 30 lines
branches/zip: Merge revision 4358 from branches/5.1 (resolving a conflict):
------------------------------------------------------------------------
r4358 | vasil | 2009-03-05 21:21:10 +0200 (Thu, 05 Mar 2009) | 21 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2728.19.1
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-02-03 11:36:46 +0000
message:
BUG#42445 Warning messages in innobase/handler/ha_innodb.cc
There was a type casting problem in the storage/innobase/handler/ha_innodb.cc,
(int ha_innobase::write_row(...)). Innobase uses has an internal error variable
of type 'ulint' while mysql uses an 'int'.
To fix the problem the function manipulates an error variable of
type 'ulint' and only casts it into 'int' when needs to return the value.
modified:
storage/innobase/handler/ha_innodb.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r4362 | vasil | 2009-03-05 22:29:07 +0200 (Thu, 05 Mar 2009) | 23 lines
branches/zip: Merge revision 4359 from branches/5.1:
------------------------------------------------------------------------
r4359 | vasil | 2009-03-05 21:42:01 +0200 (Thu, 05 Mar 2009) | 14 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2747
committer: Timothy Smith <timothy.smith@sun.com>
branch nick: 51
timestamp: Fri 2009-01-16 17:49:07 +0100
message:
Add another cast to ignore int/ulong difference in error types, silence warning on Win64
modified:
storage/innobase/handler/ha_innodb.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r4363 | vasil | 2009-03-05 22:31:37 +0200 (Thu, 05 Mar 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the bugfix in c4360.
------------------------------------------------------------------------
r4378 | calvin | 2009-03-09 10:10:17 +0200 (Mon, 09 Mar 2009) | 7 lines
branches/zip: remove compile flag MYSQL_SERVER for dynamic plugin
The dynamic plugin on Windows used to be built with MYSQL_SERVER
compile flag, while it is not the case for other platforms.
r3797 assumed MYSQL_SERVER was not defined for dynamic plugin,
which introduced the engine crash during dropping a database.
------------------------------------------------------------------------
r4396 | marko | 2009-03-12 09:22:27 +0200 (Thu, 12 Mar 2009) | 3 lines
branches/zip: btr_store_big_rec_extern_fields(): Initialize FIL_PAGE_TYPE
in a separate redo log entry. This will make ibbackup --apply-log
debugging easier.
------------------------------------------------------------------------
r4397 | marko | 2009-03-12 09:26:11 +0200 (Thu, 12 Mar 2009) | 3 lines
branches/zip: trx_sys_create_doublewrite_buf(): As the dummy change,
initialize FIL_PAGE_TYPE. This will make it easier to write the debug
assertions for ibbackup --apply-log.
------------------------------------------------------------------------
r4401 | marko | 2009-03-12 10:26:40 +0200 (Thu, 12 Mar 2009) | 19 lines
branches/zip: Merge revisions 4359:4400 from branches/5.1:
------------------------------------------------------------------------
r4399 | marko | 2009-03-12 09:38:05 +0200 (Thu, 12 Mar 2009) | 2 lines
branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position
also for unlock_row(). (Bug #39320)
------------------------------------------------------------------------
r4400 | marko | 2009-03-12 10:06:44 +0200 (Thu, 12 Mar 2009) | 5 lines
branches/5.1: Fix a bug in multi-table semi-consistent reads.
Remember the acquired record locks per table handle (row_prebuilt_t)
rather than per transaction (trx_t), so that unlock_row should successfully
unlock all non-matching rows in multi-table operations.
This deficiency was found while investigating Bug #39320.
------------------------------------------------------------------------
These were submitted as rb://94 and rb://96 and approved by Heikki Tuuri.
------------------------------------------------------------------------
r4455 | marko | 2009-03-16 11:43:34 +0200 (Mon, 16 Mar 2009) | 2 lines
branches/zip: UT_LIST_VALIDATE(): Add the parameter ASSERTION and
adjust all callers.
------------------------------------------------------------------------
r4456 | marko | 2009-03-16 12:59:25 +0200 (Mon, 16 Mar 2009) | 6 lines
branches/zip: UT_LIST_VALIDATE(): Assert that the link is non-NULL
before dereferencing it. In this way, ut_list_node_313 will be
pointing to the last non-NULL list item at the time of the assertion
failure. (gcc-4.3.2 -O3 seems to optimize the common subexpressions
and make the variable NULL, though.)
------------------------------------------------------------------------
r4457 | marko | 2009-03-16 14:12:02 +0200 (Mon, 16 Mar 2009) | 2 lines
branches/zip: sync_thread_add_level(): Make the assertions about
level == SYNC_BUF_BLOCK more readable.
------------------------------------------------------------------------
r4461 | vasil | 2009-03-17 09:38:19 +0200 (Tue, 17 Mar 2009) | 6 lines
branches/zip:
Remove mysql-test/patches/bug32625.diff because that bug was fixed in
the mysql repository (1 year and 4 months after sending them the simple
patch!). See http://bugs.mysql.com/32625
------------------------------------------------------------------------
r4465 | marko | 2009-03-17 12:34:19 +0200 (Tue, 17 Mar 2009) | 1 line
branches/zip: buf0buddy.c: Add and adjust some debug assertions.
------------------------------------------------------------------------
r4473 | vasil | 2009-03-17 15:50:30 +0200 (Tue, 17 Mar 2009) | 5 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.3 to 1.0.4 now that
1.0.3 has been released.
------------------------------------------------------------------------
r4478 | vasil | 2009-03-18 11:53:53 +0200 (Wed, 18 Mar 2009) | 5 lines
branches/zip:
Remove mysql-test/patches/bug41893.diff because that bug has been fixed
in the MySQL repository, see http://bugs.mysql.com/41893.
------------------------------------------------------------------------
r4479 | marko | 2009-03-18 12:43:54 +0200 (Wed, 18 Mar 2009) | 2 lines
branches/zip: buf_LRU_block_remove_hashed_page(): Add some debug assertions.
------------------------------------------------------------------------
r4480 | marko | 2009-03-18 14:32:13 +0200 (Wed, 18 Mar 2009) | 1 line
branches/zip: buf_buddy_free_low(): Correct the function comment.
------------------------------------------------------------------------
r4482 | marko | 2009-03-19 15:23:32 +0200 (Thu, 19 Mar 2009) | 12 lines
branches/zip: Merge revisions 4400:4481 from branches/5.1:
------------------------------------------------------------------------
r4481 | marko | 2009-03-19 15:01:48 +0200 (Thu, 19 Mar 2009) | 6 lines
branches/5.1: row_unlock_for_mysql(): Do not unlock records that were
modified by the current transaction. This bug was introduced or unmasked
in r4400.
rb://97 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r4490 | marko | 2009-03-20 12:33:33 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip: Non-functional change for reducing dependencies in InnoDB Hot Backup:
Replace srv_sys->dummy_ind1 and srv_sys->dummy_ind2 with
dict_ind_redundant and dict_ind_compact, initialized in dict_init().
------------------------------------------------------------------------
r4491 | marko | 2009-03-20 12:45:18 +0200 (Fri, 20 Mar 2009) | 2 lines
branches/zip: Add const qualifiers or in/out comments to some function
parameters in log0log.
------------------------------------------------------------------------
r4492 | marko | 2009-03-20 12:52:14 +0200 (Fri, 20 Mar 2009) | 5 lines
branches/zip: page_validate(): Always report the space id and the
name of the index.
In Hot Backup, do not invoke comparison functions, as MySQL collations
will be unavailable.
------------------------------------------------------------------------
r4493 | marko | 2009-03-20 13:24:06 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: Replace fil_get_space_for_id_low() with fil_space_get_by_id().
------------------------------------------------------------------------
r4494 | marko | 2009-03-20 13:51:35 +0200 (Fri, 20 Mar 2009) | 3 lines
branches/zip: fil0fil.c: Refer to fil_system directly, not via local vars.
This eliminates some "unused variable" warnings when building
InnoDB Hot Backup in such a way that all mutex operations are no-ops.
------------------------------------------------------------------------
r4495 | marko | 2009-03-20 14:15:52 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: innobase_get_at_most_n_mbchars(): Declare in ha_prototypes.h.
------------------------------------------------------------------------
r4496 | marko | 2009-03-20 14:48:26 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_recover_page(): Remove compile-time constant parameters.
------------------------------------------------------------------------
r4497 | marko | 2009-03-20 14:56:19 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_sys_init(): Remove a compile-time constant parameter.
------------------------------------------------------------------------
r4498 | marko | 2009-03-20 15:08:05 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip: Non-functional change: Add const qualifiers.
log_block_checksum_is_ok_or_old_format(), recv_sys_add_to_parsing_buf():
The log block is read-only. Make it const.
------------------------------------------------------------------------
r4499 | marko | 2009-03-20 15:10:25 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: recv_scan_log_recs(): Remove a compile-time constant parameter.
------------------------------------------------------------------------
r4500 | marko | 2009-03-20 15:47:17 +0200 (Fri, 20 Mar 2009) | 1 line
branches/zip: fil_init(): Add the parameter hash_size.
------------------------------------------------------------------------
r4501 | vasil | 2009-03-20 16:50:41 +0200 (Fri, 20 Mar 2009) | 4 lines
branches/zip:
Add any entry about the release of 1.0.3 in the ChangeLog.
------------------------------------------------------------------------
r4515 | marko | 2009-03-23 10:49:53 +0200 (Mon, 23 Mar 2009) | 1 line
branches/zip: hash_table_t: adaptive: Remove from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4516 | marko | 2009-03-23 10:57:16 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Define and use ASSERT_HASH_MUTEX_OWN.
Make it a no-op in UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4517 | marko | 2009-03-23 11:07:20 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Define and use PAGE_ZIP_MATCH.
In UNIV_HOTBACKUP builds, assume fixed allocation.
------------------------------------------------------------------------
r4521 | marko | 2009-03-23 12:05:47 +0200 (Mon, 23 Mar 2009) | 1 line
branches/zip: buf_page_print(): Clean up the code #ifdef UNIV_HOTBACKUP.
------------------------------------------------------------------------
r4522 | marko | 2009-03-23 12:20:50 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Exclude some operating system interface code
from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4523 | marko | 2009-03-23 13:00:43 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Remove the remaining references to hash_table_t::adapive
from UNIV_HOTBACKUP builds. This should have been done in r4515.
------------------------------------------------------------------------
r4524 | marko | 2009-03-23 14:05:18 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Enclose recv_recovery_from_backup_on and
recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE.
------------------------------------------------------------------------
r4525 | marko | 2009-03-23 14:57:45 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: recv_parse_or_apply_log_rec_body(): Add debug assertions
ensuring that FIL_PAGE_TYPE makes sense when applying log records.
------------------------------------------------------------------------
r4526 | marko | 2009-03-23 16:21:34 +0200 (Mon, 23 Mar 2009) | 2 lines
branches/zip: Remove unneeded definitions and dependencies
from UNIV_HOTBACKUP builds.
------------------------------------------------------------------------
r4527 | calvin | 2009-03-23 23:15:33 +0200 (Mon, 23 Mar 2009) | 5 lines
branches/zip: adjust build files on Windows
Adjust the patch positions based on the latest MySQL source.
Also add the patches to the .bat files for vs9.
------------------------------------------------------------------------
2009-03-24 08:32:21 +00:00
|
|
|
Copyright (c) 2008, Google Inc.
|
|
|
|
|
|
|
|
Portions of this file contain modifications contributed and copyrighted by
|
|
|
|
Google, Inc. Those modifications are gratefully acknowledged and are described
|
|
|
|
briefly in the InnoDB documentation. The contributions by Google are
|
|
|
|
incorporated with their permission, and subject to the conditions contained in
|
|
|
|
the file COPYING.Google.
|
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/***************************************************//**
|
|
|
|
@file row/row0sel.c
|
2005-10-27 07:29:40 +00:00
|
|
|
Select
|
|
|
|
|
|
|
|
Created 12/19/1997 Heikki Tuuri
|
|
|
|
*******************************************************/
|
|
|
|
|
|
|
|
#include "row0sel.h"
|
|
|
|
|
|
|
|
#ifdef UNIV_NONINL
|
|
|
|
#include "row0sel.ic"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "dict0dict.h"
|
|
|
|
#include "dict0boot.h"
|
|
|
|
#include "trx0undo.h"
|
|
|
|
#include "trx0trx.h"
|
|
|
|
#include "btr0btr.h"
|
|
|
|
#include "btr0cur.h"
|
|
|
|
#include "btr0sea.h"
|
|
|
|
#include "mach0data.h"
|
|
|
|
#include "que0que.h"
|
|
|
|
#include "row0upd.h"
|
|
|
|
#include "row0row.h"
|
|
|
|
#include "row0vers.h"
|
|
|
|
#include "rem0cmp.h"
|
|
|
|
#include "lock0lock.h"
|
|
|
|
#include "eval0eval.h"
|
|
|
|
#include "pars0sym.h"
|
|
|
|
#include "pars0pars.h"
|
|
|
|
#include "row0mysql.h"
|
|
|
|
#include "read0read.h"
|
|
|
|
#include "buf0lru.h"
|
2008-09-17 19:52:30 +00:00
|
|
|
#include "ha_prototypes.h"
|
2013-01-14 10:49:51 +05:30
|
|
|
#include "m_string.h" /* for my_sys.h */
|
|
|
|
#include "my_sys.h" /* DEBUG_SYNC_C */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Maximum number of rows to prefetch; MySQL interface has another parameter */
|
|
|
|
#define SEL_MAX_N_PREFETCH 16
|
|
|
|
|
|
|
|
/* Number of rows fetched, after which to start prefetching; MySQL interface
|
|
|
|
has another parameter */
|
|
|
|
#define SEL_PREFETCH_LIMIT 1
|
|
|
|
|
|
|
|
/* When a select has accessed about this many pages, it returns control back
|
|
|
|
to que_run_threads: this is to allow canceling runaway queries */
|
|
|
|
|
|
|
|
#define SEL_COST_LIMIT 100
|
|
|
|
|
|
|
|
/* Flags for search shortcut */
|
|
|
|
#define SEL_FOUND 0
|
|
|
|
#define SEL_EXHAUSTED 1
|
|
|
|
#define SEL_RETRY 2
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2006-09-26 06:22:16 +00:00
|
|
|
Returns TRUE if the user-defined column in a secondary index record
|
|
|
|
is alphabetically the same as the corresponding BLOB column in the clustered
|
|
|
|
index record.
|
|
|
|
NOTE: the comparison is NOT done as a binary comparison, but character
|
2009-05-25 06:46:10 +00:00
|
|
|
fields are compared with collation!
|
|
|
|
@return TRUE if the columns are equal */
|
2006-09-26 06:22:16 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
row_sel_sec_rec_is_for_blob(
|
|
|
|
/*========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint mtype, /*!< in: main type */
|
|
|
|
ulint prtype, /*!< in: precise type */
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
ulint mbminmaxlen, /*!< in: minimum and maximum length of
|
|
|
|
a multi-byte character */
|
2009-05-25 06:46:10 +00:00
|
|
|
const byte* clust_field, /*!< in: the locally stored part of
|
2008-01-11 12:19:59 +00:00
|
|
|
the clustered index column, including
|
|
|
|
the BLOB pointer; the clustered
|
|
|
|
index record must be covered by
|
|
|
|
a lock or a page latch to protect it
|
|
|
|
against deletion (rollback or purge) */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint clust_len, /*!< in: length of clust_field */
|
|
|
|
const byte* sec_field, /*!< in: column in secondary index */
|
|
|
|
ulint sec_len, /*!< in: length of sec_field */
|
2011-09-12 10:25:17 +03:00
|
|
|
ulint prefix_len, /*!< in: index column prefix length
|
|
|
|
in bytes */
|
2011-05-31 02:12:32 -07:00
|
|
|
dict_table_t* table) /*!< in: table */
|
2006-09-26 06:22:16 +00:00
|
|
|
{
|
|
|
|
ulint len;
|
2011-05-31 02:12:32 -07:00
|
|
|
byte buf[REC_VERSION_56_MAX_INDEX_COL_LEN];
|
|
|
|
ulint zip_size = dict_table_flags_to_zip_size(table->flags);
|
2006-09-26 06:22:16 +00:00
|
|
|
|
2011-09-12 10:25:17 +03:00
|
|
|
/* This function should never be invoked on an Antelope format
|
|
|
|
table, because they should always contain enough prefix in the
|
|
|
|
clustered index record. */
|
|
|
|
ut_ad(dict_table_get_format(table) >= DICT_TF_FORMAT_ZIP);
|
2010-11-02 09:34:09 +02:00
|
|
|
ut_a(clust_len >= BTR_EXTERN_FIELD_REF_SIZE);
|
2011-09-12 10:25:17 +03:00
|
|
|
ut_ad(prefix_len >= sec_len);
|
|
|
|
ut_ad(prefix_len > 0);
|
|
|
|
ut_a(prefix_len <= sizeof buf);
|
2010-11-02 09:34:09 +02:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(!memcmp(clust_field + clust_len - BTR_EXTERN_FIELD_REF_SIZE,
|
|
|
|
field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE))) {
|
|
|
|
/* The externally stored field was not written yet.
|
|
|
|
This record should only be seen by
|
|
|
|
recv_recovery_rollback_active() or any
|
|
|
|
TRX_ISO_READ_UNCOMMITTED transactions. */
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2011-09-12 10:25:17 +03:00
|
|
|
len = btr_copy_externally_stored_field_prefix(buf, prefix_len,
|
2006-09-26 06:22:16 +00:00
|
|
|
zip_size,
|
|
|
|
clust_field, clust_len);
|
branches/innodb+: Merge revisions 2774:2799 from branches/zip:
------------------------------------------------------------------------
r2781 | marko | 2008-10-13 13:40:57 +0300 (Mon, 13 Oct 2008) | 1 line
branches/zip: page_cur_delete_rec(): Call page_zip_validate_low().
------------------------------------------------------------------------
r2783 | vasil | 2008-10-13 18:34:34 +0300 (Mon, 13 Oct 2008) | 9 lines
branches/zip:
Remove mysql-test/patches/bug37312.diff because MySQL "fixed"
Bug#37312 by removing the test.
http://bugs.mysql.com/37312
http://lists.mysql.com/commits/54462
------------------------------------------------------------------------
r2784 | marko | 2008-10-13 21:35:30 +0300 (Mon, 13 Oct 2008) | 1 line
branches/zip: Add missing NULL check to the assertion added in r2781.
------------------------------------------------------------------------
r2785 | marko | 2008-10-13 22:29:12 +0300 (Mon, 13 Oct 2008) | 2 lines
branches/zip: page_cur_delete_rec(): Remove the bogus page_zip_validate_low()
assertion that was added in r2781 and explain why it was bogus.
------------------------------------------------------------------------
r2786 | calvin | 2008-10-14 19:14:47 +0300 (Tue, 14 Oct 2008) | 7 lines
branches/zip: fix Mantis issue #96 Problem compiling ha_innodb.cc
on 64-bit Windows
Change the definition of srv_replication_delay from ulint to ulong.
ulint is 64-bit on Win64.
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r2787 | calvin | 2008-10-14 19:19:41 +0300 (Tue, 14 Oct 2008) | 7 lines
branches/zip: fix compiler warning
Change the definition of add_on from ulint to ullint, to eliminate
the warning in .\btr\btr0cur.c:
conversion from 'ullint' to 'ulint', possible loss of data
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r2793 | marko | 2008-10-15 10:00:06 +0300 (Wed, 15 Oct 2008) | 2 lines
branches/zip: row_create_table_for_mysql(), row_create_index_for_mysql():
Note that the dictionary object will be freed.
------------------------------------------------------------------------
r2794 | marko | 2008-10-15 10:32:40 +0300 (Wed, 15 Oct 2008) | 9 lines
branches/zip: When invoking page_zip_copy_recs(), update the lock table
and the adaptive hash index. This should fix Issue #95 and Issue #87.
page_zip_copy_recs(): Copy PAGE_MAX_TRX_ID as well, to have similar behavior
to page_copy_rec_list_start() and page_copy_rec_list_end().
btr_root_raise_and_insert(), btr_page_split_and_insert(), btr_lift_page_up():
Update the lock table and the adaptive hash index.
------------------------------------------------------------------------
r2797 | marko | 2008-10-15 13:21:54 +0300 (Wed, 15 Oct 2008) | 3 lines
branches/zip: Introduce UNIV_ZIP_COPY for invoking page_zip_copy_recs()
more often in B-tree operations.
------------------------------------------------------------------------
r2799 | marko | 2008-10-15 14:27:42 +0300 (Wed, 15 Oct 2008) | 25 lines
branches/zip: When the server crashes while freeing an externally stored
column of a compressed table, the BTR_EXTERN_LEN field in the BLOB pointer
will be written as 0. Tolerate this in the functions that deal with
externally stored columns. This fixes Issue #80 and was posted at rb://26.
Note that the clustered index record is always deleted or purged last,
after any secondary index records referring to it have been deleted.
btr_free_externally_stored_field(): On an uncompressed table, zero out
the BTR_EXTERN_LEN, so that half-deleted BLOBs can be detected after
crash recovery.
btr_copy_externally_stored_field_prefix(): Return 0 if the BLOB has been
half-deleted.
row_upd_ext_fetch(): Assert that the externally stored column exists.
row_ext_cache_fill(): Allow btr_copy_externally_stored_field_prefix()
to return 0.
row_sel_sec_rec_is_for_blob(): Return FALSE if the BLOB has been half-deleted.
This is correct, because the clustered index record would have been deleted
or purged last, after any secondary index records referring to it had been
deleted.
------------------------------------------------------------------------
2008-10-15 12:09:17 +00:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(len == 0)) {
|
|
|
|
/* The BLOB was being deleted as the server crashed.
|
|
|
|
There should not be any secondary index records
|
|
|
|
referring to this clustered index record, because
|
|
|
|
btr_free_externally_stored_field() is called after all
|
|
|
|
secondary index entries of the row have been purged. */
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
len = dtype_get_at_most_n_mbchars(prtype, mbminmaxlen,
|
2011-09-12 10:25:17 +03:00
|
|
|
prefix_len, len, (const char*) buf);
|
2006-09-26 06:22:16 +00:00
|
|
|
|
|
|
|
return(!cmp_data_data(mtype, prtype, buf, len, sec_field, sec_len));
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Returns TRUE if the user-defined column values in a secondary index record
|
|
|
|
are alphabetically the same as the corresponding columns in the clustered
|
|
|
|
index record.
|
|
|
|
NOTE: the comparison is NOT done as a binary comparison, but character
|
2009-05-25 06:46:10 +00:00
|
|
|
fields are compared with collation!
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
@return TRUE if the secondary record is equal to the corresponding
|
branches/innodb+: Merge revisions 6364:6447 from branches/zip:
------------------------------------------------------------------------
r6367 | marko | 2009-12-28 15:39:19 +0200 (Mon, 28 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_add_to_cache(): Always free the index object,
also when returning DB_CORRUPTION.
------------------------------------------------------------------------
r6425 | marko | 2010-01-12 13:47:11 +0200 (Tue, 12 Jan 2010) | 45 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/row/row0mysql.c
branches/zip: Merge revisions 6350:6424 from branches/5.1:
------------------------------------------------------------------------
r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1: Fix bug #49238: Creating/Dropping a temporary table
while at 1023 transactions will cause assert. Handle possible
DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in
row_drop_table_for_mysql().
rb://220, approved by Marko
------------------------------------------------------------------------
r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1: Non-functional change:
Make innobase_get_int_col_max_value() a static function.
It does not access any fields of class ha_innobase.
------------------------------------------------------------------------
r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1: In innobase_initialize_autoinc(), do not attempt to read
the maximum auto-increment value from the table if
innodb_force_recovery is set to at least 4, so that writes are
disabled. (Bug #46193)
innobase_get_int_col_max_value(): Move the function definition before
ha_innobase::innobase_initialize_autoinc(), because that function now
calls this function.
ha_innobase::innobase_initialize_autoinc(): Change the return type to
void. Do not attempt to read the maximum auto-increment value from
the table if innodb_force_recovery is set to at least 4. Issue
ER_AUTOINC_READ_FAILED to the client when the auto-increment value
cannot be read.
rb://144 by Sunny, revised by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6426 | marko | 2010-01-12 15:36:14 +0200 (Tue, 12 Jan 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_sec_rec_is_for_clust_rec(): Document the return value
more accurately.
------------------------------------------------------------------------
r6433 | marko | 2010-01-13 13:19:00 +0200 (Wed, 13 Jan 2010) | 2 lines
Changed paths:
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
branches/zip: dict_sys_tables_get_flags(), dict_create_sys_*_tuple():
Add some const qualifiers and comments.
------------------------------------------------------------------------
r6445 | marko | 2010-01-13 17:15:29 +0200 (Wed, 13 Jan 2010) | 3 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
branches/zip: buf_pool_drop_hash_index(): Check block->page.state
before checking block->is_hashed, because the latter may be uninitialized
right after server startup.
------------------------------------------------------------------------
r6446 | marko | 2010-01-13 17:20:10 +0200 (Wed, 13 Jan 2010) | 3 lines
Changed paths:
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/mem/mem0dbg.c
M /branches/zip/sync/sync0sync.c
branches/zip: Treat mem_hash_mutex specially in mutex_free(),
and explicitly free mem_hash_mutex in mem_close().
This fixes the breakage of UNIV_MEM_DEBUG that was filed as Issue #434.
------------------------------------------------------------------------
r6447 | marko | 2010-01-13 17:43:44 +0200 (Wed, 13 Jan 2010) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/row/row0sel.c
branches/zip: row_sel_get_clust_rec_for_mysql(): On the READ UNCOMMITTED
isolation level, do not attempt to access a clustered index record
that has been marked for deletion. This fixes Issue #433.
Approved by Heikki over the IM.
------------------------------------------------------------------------
2010-01-13 20:01:10 +00:00
|
|
|
fields in the clustered record, when compared with collation;
|
|
|
|
FALSE if not equal or if the clustered record has been marked for deletion */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
row_sel_sec_rec_is_for_clust_rec(
|
|
|
|
/*=============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const rec_t* sec_rec, /*!< in: secondary index record */
|
|
|
|
dict_index_t* sec_index, /*!< in: secondary index */
|
|
|
|
const rec_t* clust_rec, /*!< in: clustered index record;
|
2008-01-11 12:19:59 +00:00
|
|
|
must be protected by a lock or
|
|
|
|
a page latch against deletion
|
|
|
|
in rollback or purge */
|
2009-05-25 06:46:10 +00:00
|
|
|
dict_index_t* clust_index) /*!< in: clustered index */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2006-10-23 19:14:36 +00:00
|
|
|
const byte* sec_field;
|
2006-02-23 19:25:29 +00:00
|
|
|
ulint sec_len;
|
2006-10-23 19:14:36 +00:00
|
|
|
const byte* clust_field;
|
2006-02-23 19:25:29 +00:00
|
|
|
ulint n;
|
|
|
|
ulint i;
|
2005-10-27 07:29:40 +00:00
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint clust_offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint sec_offsets_[REC_OFFS_SMALL_SIZE];
|
|
|
|
ulint* clust_offs = clust_offsets_;
|
|
|
|
ulint* sec_offs = sec_offsets_;
|
|
|
|
ibool is_equal = TRUE;
|
|
|
|
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(clust_offsets_);
|
|
|
|
rec_offs_init(sec_offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-01-24 09:58:03 +00:00
|
|
|
if (rec_get_deleted_flag(clust_rec,
|
|
|
|
dict_table_is_comp(clust_index->table))) {
|
|
|
|
|
|
|
|
/* The clustered index record is delete-marked;
|
|
|
|
it is not visible in the read view. Besides,
|
|
|
|
if there are any externally stored columns,
|
|
|
|
some of them may have already been purged. */
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
clust_offs = rec_get_offsets(clust_rec, clust_index, clust_offs,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
sec_offs = rec_get_offsets(sec_rec, sec_index, sec_offs,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
n = dict_index_get_n_ordering_defined_by_user(sec_index);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
for (i = 0; i < n; i++) {
|
2006-09-19 10:14:07 +00:00
|
|
|
const dict_field_t* ifield;
|
|
|
|
const dict_col_t* col;
|
2006-09-26 06:22:16 +00:00
|
|
|
ulint clust_pos;
|
|
|
|
ulint clust_len;
|
|
|
|
ulint len;
|
2006-09-19 10:14:07 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ifield = dict_index_get_nth_field(sec_index, i);
|
2006-02-23 19:25:29 +00:00
|
|
|
col = dict_field_get_col(ifield);
|
2006-09-26 06:22:16 +00:00
|
|
|
clust_pos = dict_col_get_clust_pos(col, clust_index);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
clust_field = rec_get_nth_field(
|
2006-09-26 06:22:16 +00:00
|
|
|
clust_rec, clust_offs, clust_pos, &clust_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
sec_field = rec_get_nth_field(sec_rec, sec_offs, i, &sec_len);
|
|
|
|
|
2006-09-26 06:22:16 +00:00
|
|
|
len = clust_len;
|
|
|
|
|
|
|
|
if (ifield->prefix_len > 0 && len != UNIV_SQL_NULL) {
|
|
|
|
|
|
|
|
if (rec_offs_nth_extern(clust_offs, clust_pos)) {
|
|
|
|
len -= BTR_EXTERN_FIELD_REF_SIZE;
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-26 06:22:16 +00:00
|
|
|
len = dtype_get_at_most_n_mbchars(
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
col->prtype, col->mbminmaxlen,
|
2006-09-26 06:22:16 +00:00
|
|
|
ifield->prefix_len, len, (char*) clust_field);
|
|
|
|
|
|
|
|
if (rec_offs_nth_extern(clust_offs, clust_pos)
|
|
|
|
&& len < sec_len) {
|
|
|
|
if (!row_sel_sec_rec_is_for_blob(
|
|
|
|
col->mtype, col->prtype,
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
col->mbminmaxlen,
|
2006-09-26 06:22:16 +00:00
|
|
|
clust_field, clust_len,
|
|
|
|
sec_field, sec_len,
|
2011-09-12 10:25:17 +03:00
|
|
|
ifield->prefix_len,
|
2011-05-31 02:12:32 -07:00
|
|
|
clust_index->table)) {
|
2006-09-26 06:22:16 +00:00
|
|
|
goto inequal;
|
|
|
|
}
|
2006-10-23 18:29:14 +00:00
|
|
|
|
|
|
|
continue;
|
2006-09-26 06:22:16 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
if (0 != cmp_data_data(col->mtype, col->prtype,
|
2006-09-26 06:22:16 +00:00
|
|
|
clust_field, len,
|
2006-08-29 09:30:31 +00:00
|
|
|
sec_field, sec_len)) {
|
2006-09-26 06:22:16 +00:00
|
|
|
inequal:
|
2005-10-27 07:29:40 +00:00
|
|
|
is_equal = FALSE;
|
|
|
|
goto func_exit;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
func_exit:
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
return(is_equal);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Creates a select node struct.
|
|
|
|
@return own: select node struct */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_node_t*
|
|
|
|
sel_node_create(
|
|
|
|
/*============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t* heap) /*!< in: memory heap where created */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sel_node_t* node;
|
|
|
|
|
|
|
|
node = mem_heap_alloc(heap, sizeof(sel_node_t));
|
|
|
|
node->common.type = QUE_NODE_SELECT;
|
|
|
|
node->state = SEL_NODE_OPEN;
|
|
|
|
|
|
|
|
node->plans = NULL;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(node);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Frees the memory private to a select node when a query graph is freed,
|
|
|
|
does not free the heap where the node was originally created. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
sel_node_free_private(
|
|
|
|
/*==================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node) /*!< in: select node struct */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
plan_t* plan;
|
|
|
|
|
|
|
|
if (node->plans != NULL) {
|
|
|
|
for (i = 0; i < node->n_tables; i++) {
|
|
|
|
plan = sel_node_get_nth_plan(node, i);
|
|
|
|
|
|
|
|
btr_pcur_close(&(plan->pcur));
|
|
|
|
btr_pcur_close(&(plan->clust_pcur));
|
|
|
|
|
|
|
|
if (plan->old_vers_heap) {
|
|
|
|
mem_heap_free(plan->old_vers_heap);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Evaluates the values in a select list. If there are aggregate functions,
|
|
|
|
their argument value is added to the aggregate total. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
sel_eval_select_list(
|
|
|
|
/*=================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node) /*!< in: select node */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
que_node_t* exp;
|
|
|
|
|
|
|
|
exp = node->select_list;
|
|
|
|
|
|
|
|
while (exp) {
|
|
|
|
eval_exp(exp);
|
|
|
|
|
|
|
|
exp = que_node_get_next(exp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Assigns the values in the select list to the possible into-variables in
|
|
|
|
SELECT ... INTO ... */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
sel_assign_into_var_values(
|
|
|
|
/*=======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sym_node_t* var, /*!< in: first variable in a list of variables */
|
|
|
|
sel_node_t* node) /*!< in: select node */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
que_node_t* exp;
|
|
|
|
|
|
|
|
if (var == NULL) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
exp = node->select_list;
|
|
|
|
|
|
|
|
while (var) {
|
|
|
|
ut_ad(exp);
|
|
|
|
|
|
|
|
eval_node_copy_val(var->alias, exp);
|
|
|
|
|
|
|
|
exp = que_node_get_next(exp);
|
|
|
|
var = que_node_get_next(var);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Resets the aggregate value totals in the select list of an aggregate type
|
|
|
|
query. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
sel_reset_aggregate_vals(
|
|
|
|
/*=====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node) /*!< in: select node */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
func_node_t* func_node;
|
|
|
|
|
|
|
|
ut_ad(node->is_aggregate);
|
|
|
|
|
|
|
|
func_node = node->select_list;
|
|
|
|
|
|
|
|
while (func_node) {
|
|
|
|
eval_node_set_int_val(func_node, 0);
|
|
|
|
|
|
|
|
func_node = que_node_get_next(func_node);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
node->aggregate_already_fetched = FALSE;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Copies the input variable values when an explicit cursor is opened. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
row_sel_copy_input_variable_vals(
|
|
|
|
/*=============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node) /*!< in: select node */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sym_node_t* var;
|
|
|
|
|
|
|
|
var = UT_LIST_GET_FIRST(node->copy_variables);
|
|
|
|
|
|
|
|
while (var) {
|
|
|
|
eval_node_copy_val(var, var->alias);
|
|
|
|
|
|
|
|
var->indirection = NULL;
|
|
|
|
|
|
|
|
var = UT_LIST_GET_NEXT(col_var_list, var);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Fetches the column values from a record. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_sel_fetch_columns(
|
|
|
|
/*==================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
dict_index_t* index, /*!< in: record index */
|
|
|
|
const rec_t* rec, /*!< in: record in a clustered or non-clustered
|
2008-01-11 19:59:47 +00:00
|
|
|
index; must be protected by a page latch */
|
2009-05-25 06:46:10 +00:00
|
|
|
const ulint* offsets,/*!< in: rec_get_offsets(rec, index) */
|
|
|
|
sym_node_t* column) /*!< in: first column in a column list, or
|
2005-10-27 07:29:40 +00:00
|
|
|
NULL */
|
|
|
|
{
|
|
|
|
dfield_t* val;
|
|
|
|
ulint index_type;
|
|
|
|
ulint field_no;
|
2008-01-11 19:59:47 +00:00
|
|
|
const byte* data;
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint len;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (dict_index_is_clust(index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
index_type = SYM_CLUST_FIELD_NO;
|
|
|
|
} else {
|
|
|
|
index_type = SYM_SEC_FIELD_NO;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (column) {
|
2006-06-13 20:23:26 +00:00
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ibool needs_copy;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
field_no = column->field_nos[index_type];
|
|
|
|
|
|
|
|
if (field_no != ULINT_UNDEFINED) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
if (UNIV_UNLIKELY(rec_offs_nth_extern(offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
field_no))) {
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
/* Copy an externally stored field to the
|
2010-06-29 16:19:07 +03:00
|
|
|
temporary heap, if possible. */
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
heap = mem_heap_create(1);
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
data = btr_rec_copy_externally_stored_field(
|
|
|
|
rec, offsets,
|
|
|
|
dict_table_zip_size(index->table),
|
|
|
|
field_no, &len, heap);
|
2006-06-13 20:23:26 +00:00
|
|
|
|
2010-06-29 16:19:07 +03:00
|
|
|
/* data == NULL means that the
|
|
|
|
externally stored field was not
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
written yet. This record
|
2010-06-29 16:19:07 +03:00
|
|
|
should only be seen by
|
|
|
|
recv_recovery_rollback_active() or any
|
|
|
|
TRX_ISO_READ_UNCOMMITTED
|
|
|
|
transactions. The InnoDB SQL parser
|
|
|
|
(the sole caller of this function)
|
|
|
|
does not implement READ UNCOMMITTED,
|
|
|
|
and it is not involved during rollback. */
|
|
|
|
ut_a(data);
|
2006-06-13 20:23:26 +00:00
|
|
|
ut_a(len != UNIV_SQL_NULL);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
needs_copy = TRUE;
|
|
|
|
} else {
|
|
|
|
data = rec_get_nth_field(rec, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
field_no, &len);
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
needs_copy = column->copy_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (needs_copy) {
|
2005-10-27 07:29:40 +00:00
|
|
|
eval_node_copy_and_alloc_val(column, data,
|
2006-08-29 09:30:31 +00:00
|
|
|
len);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
val = que_node_get_val(column);
|
|
|
|
dfield_set_data(val, data, len);
|
|
|
|
}
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
column = UT_LIST_GET_NEXT(col_var_list, column);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Allocates a prefetch buffer for a column when prefetch is first time done. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
sel_col_prefetch_buf_alloc(
|
|
|
|
/*=======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sym_node_t* column) /*!< in: symbol table node for a column */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sel_buf_t* sel_buf;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
ut_ad(que_node_get_type(column) == QUE_NODE_SYMBOL);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
column->prefetch_buf = mem_alloc(SEL_MAX_N_PREFETCH
|
2006-08-29 09:30:31 +00:00
|
|
|
* sizeof(sel_buf_t));
|
2005-10-27 07:29:40 +00:00
|
|
|
for (i = 0; i < SEL_MAX_N_PREFETCH; i++) {
|
|
|
|
sel_buf = column->prefetch_buf + i;
|
|
|
|
|
|
|
|
sel_buf->data = NULL;
|
2011-09-13 17:23:02 +03:00
|
|
|
sel_buf->len = 0;
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_buf->val_buf_size = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Frees a prefetch buffer for a column, including the dynamically allocated
|
|
|
|
memory for data stored there. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
sel_col_prefetch_buf_free(
|
|
|
|
/*======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_buf_t* prefetch_buf) /*!< in, own: prefetch buffer */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sel_buf_t* sel_buf;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
for (i = 0; i < SEL_MAX_N_PREFETCH; i++) {
|
|
|
|
sel_buf = prefetch_buf + i;
|
|
|
|
|
|
|
|
if (sel_buf->val_buf_size > 0) {
|
|
|
|
|
|
|
|
mem_free(sel_buf->data);
|
|
|
|
}
|
|
|
|
}
|
2011-09-13 17:23:02 +03:00
|
|
|
|
|
|
|
mem_free(prefetch_buf);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Pops the column values for a prefetched, cached row from the column prefetch
|
|
|
|
buffers and places them to the val fields in the column nodes. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
sel_pop_prefetched_row(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan) /*!< in: plan node for a table */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sym_node_t* column;
|
|
|
|
sel_buf_t* sel_buf;
|
|
|
|
dfield_t* val;
|
|
|
|
byte* data;
|
|
|
|
ulint len;
|
|
|
|
ulint val_buf_size;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(plan->n_rows_prefetched > 0);
|
|
|
|
|
|
|
|
column = UT_LIST_GET_FIRST(plan->columns);
|
|
|
|
|
|
|
|
while (column) {
|
|
|
|
val = que_node_get_val(column);
|
|
|
|
|
|
|
|
if (!column->copy_val) {
|
|
|
|
/* We did not really push any value for the
|
|
|
|
column */
|
|
|
|
|
|
|
|
ut_ad(!column->prefetch_buf);
|
|
|
|
ut_ad(que_node_get_val_buf_size(column) == 0);
|
2007-10-17 12:13:29 +00:00
|
|
|
ut_d(dfield_set_null(val));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_col;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(column->prefetch_buf);
|
2007-10-17 12:13:29 +00:00
|
|
|
ut_ad(!dfield_is_ext(val));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
sel_buf = column->prefetch_buf + plan->first_prefetched;
|
|
|
|
|
|
|
|
data = sel_buf->data;
|
|
|
|
len = sel_buf->len;
|
|
|
|
val_buf_size = sel_buf->val_buf_size;
|
|
|
|
|
|
|
|
/* We must keep track of the allocated memory for
|
|
|
|
column values to be able to free it later: therefore
|
|
|
|
we swap the values for sel_buf and val */
|
|
|
|
|
|
|
|
sel_buf->data = dfield_get_data(val);
|
|
|
|
sel_buf->len = dfield_get_len(val);
|
|
|
|
sel_buf->val_buf_size = que_node_get_val_buf_size(column);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
dfield_set_data(val, data, len);
|
|
|
|
que_node_set_val_buf_size(column, val_buf_size);
|
|
|
|
next_col:
|
|
|
|
column = UT_LIST_GET_NEXT(col_var_list, column);
|
|
|
|
}
|
|
|
|
|
|
|
|
plan->n_rows_prefetched--;
|
|
|
|
|
|
|
|
plan->first_prefetched++;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Pushes the column values for a prefetched, cached row to the column prefetch
|
|
|
|
buffers from the val fields in the column nodes. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
sel_push_prefetched_row(
|
|
|
|
/*====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan) /*!< in: plan node for a table */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sym_node_t* column;
|
|
|
|
sel_buf_t* sel_buf;
|
|
|
|
dfield_t* val;
|
|
|
|
byte* data;
|
|
|
|
ulint len;
|
|
|
|
ulint pos;
|
|
|
|
ulint val_buf_size;
|
|
|
|
|
|
|
|
if (plan->n_rows_prefetched == 0) {
|
|
|
|
pos = 0;
|
|
|
|
plan->first_prefetched = 0;
|
|
|
|
} else {
|
|
|
|
pos = plan->n_rows_prefetched;
|
|
|
|
|
|
|
|
/* We have the convention that pushing new rows starts only
|
|
|
|
after the prefetch stack has been emptied: */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(plan->first_prefetched == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
plan->n_rows_prefetched++;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(pos < SEL_MAX_N_PREFETCH);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
column = UT_LIST_GET_FIRST(plan->columns);
|
|
|
|
|
|
|
|
while (column) {
|
|
|
|
if (!column->copy_val) {
|
|
|
|
/* There is no sense to push pointers to database
|
|
|
|
page fields when we do not keep latch on the page! */
|
|
|
|
|
|
|
|
goto next_col;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!column->prefetch_buf) {
|
|
|
|
/* Allocate a new prefetch buffer */
|
|
|
|
|
|
|
|
sel_col_prefetch_buf_alloc(column);
|
|
|
|
}
|
|
|
|
|
|
|
|
sel_buf = column->prefetch_buf + pos;
|
|
|
|
|
|
|
|
val = que_node_get_val(column);
|
|
|
|
|
|
|
|
data = dfield_get_data(val);
|
|
|
|
len = dfield_get_len(val);
|
|
|
|
val_buf_size = que_node_get_val_buf_size(column);
|
|
|
|
|
|
|
|
/* We must keep track of the allocated memory for
|
|
|
|
column values to be able to free it later: therefore
|
|
|
|
we swap the values for sel_buf and val */
|
|
|
|
|
|
|
|
dfield_set_data(val, sel_buf->data, sel_buf->len);
|
|
|
|
que_node_set_val_buf_size(column, sel_buf->val_buf_size);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_buf->data = data;
|
|
|
|
sel_buf->len = len;
|
|
|
|
sel_buf->val_buf_size = val_buf_size;
|
2006-02-23 19:25:29 +00:00
|
|
|
next_col:
|
2005-10-27 07:29:40 +00:00
|
|
|
column = UT_LIST_GET_NEXT(col_var_list, column);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Builds a previous version of a clustered index record for a consistent read
|
|
|
|
@return DB_SUCCESS or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_build_prev_vers(
|
|
|
|
/*====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
read_view_t* read_view, /*!< in: read view */
|
|
|
|
dict_index_t* index, /*!< in: plan node for table */
|
|
|
|
rec_t* rec, /*!< in: record in a clustered index */
|
|
|
|
ulint** offsets, /*!< in/out: offsets returned by
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_get_offsets(rec, plan->index) */
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t** offset_heap, /*!< in/out: memory heap from which
|
2005-10-27 07:29:40 +00:00
|
|
|
the offsets are allocated */
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t** old_vers_heap, /*!< out: old version heap to use */
|
|
|
|
rec_t** old_vers, /*!< out: old version, or NULL if the
|
2005-10-27 07:29:40 +00:00
|
|
|
record does not exist in the view:
|
|
|
|
i.e., it was freshly inserted
|
|
|
|
afterwards */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
|
|
|
|
2007-09-10 10:09:01 +00:00
|
|
|
if (*old_vers_heap) {
|
|
|
|
mem_heap_empty(*old_vers_heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
2007-09-10 10:09:01 +00:00
|
|
|
*old_vers_heap = mem_heap_create(512);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_vers_build_for_consistent_read(
|
2007-09-10 10:09:01 +00:00
|
|
|
rec, mtr, index, offsets, read_view, offset_heap,
|
|
|
|
*old_vers_heap, old_vers);
|
2005-10-27 07:29:40 +00:00
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2006-02-17 14:19:39 +00:00
|
|
|
Builds the last committed version of a clustered index record for a
|
2009-05-25 06:46:10 +00:00
|
|
|
semi-consistent read.
|
|
|
|
@return DB_SUCCESS or error code */
|
2006-02-17 14:19:39 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_build_committed_vers_for_mysql(
|
|
|
|
/*===================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
dict_index_t* clust_index, /*!< in: clustered index */
|
|
|
|
row_prebuilt_t* prebuilt, /*!< in: prebuilt struct */
|
|
|
|
const rec_t* rec, /*!< in: record in a clustered index */
|
|
|
|
ulint** offsets, /*!< in/out: offsets returned by
|
2006-02-17 14:19:39 +00:00
|
|
|
rec_get_offsets(rec, clust_index) */
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t** offset_heap, /*!< in/out: memory heap from which
|
2006-02-17 14:19:39 +00:00
|
|
|
the offsets are allocated */
|
2009-05-25 06:46:10 +00:00
|
|
|
const rec_t** old_vers, /*!< out: old version, or NULL if the
|
2006-02-17 14:19:39 +00:00
|
|
|
record does not exist in the view:
|
|
|
|
i.e., it was freshly inserted
|
|
|
|
afterwards */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2006-02-17 14:19:39 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
if (prebuilt->old_vers_heap) {
|
|
|
|
mem_heap_empty(prebuilt->old_vers_heap);
|
|
|
|
} else {
|
|
|
|
prebuilt->old_vers_heap = mem_heap_create(200);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_vers_build_for_semi_consistent_read(
|
|
|
|
rec, mtr, clust_index, offsets, offset_heap,
|
|
|
|
prebuilt->old_vers_heap, old_vers);
|
2006-02-17 14:19:39 +00:00
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Tests the conditions which determine when the index segment we are searching
|
2009-05-25 06:46:10 +00:00
|
|
|
through has been exhausted.
|
|
|
|
@return TRUE if row passed the tests */
|
2005-10-27 07:29:40 +00:00
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
row_sel_test_end_conds(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan) /*!< in: plan for the table; the column values must
|
2005-10-27 07:29:40 +00:00
|
|
|
already have been retrieved and the right sides of
|
|
|
|
comparisons evaluated */
|
|
|
|
{
|
|
|
|
func_node_t* cond;
|
|
|
|
|
|
|
|
/* All conditions in end_conds are comparisons of a column to an
|
|
|
|
expression */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
cond = UT_LIST_GET_FIRST(plan->end_conds);
|
|
|
|
|
|
|
|
while (cond) {
|
|
|
|
/* Evaluate the left side of the comparison, i.e., get the
|
|
|
|
column value if there is an indirection */
|
|
|
|
|
|
|
|
eval_sym(cond->args);
|
|
|
|
|
|
|
|
/* Do the comparison */
|
|
|
|
|
|
|
|
if (!eval_cmp(cond)) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
cond = UT_LIST_GET_NEXT(cond_list, cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Tests the other conditions.
|
|
|
|
@return TRUE if row passed the tests */
|
2005-10-27 07:29:40 +00:00
|
|
|
UNIV_INLINE
|
|
|
|
ibool
|
|
|
|
row_sel_test_other_conds(
|
|
|
|
/*=====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan) /*!< in: plan for the table; the column values must
|
2005-10-27 07:29:40 +00:00
|
|
|
already have been retrieved */
|
|
|
|
{
|
|
|
|
func_node_t* cond;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
cond = UT_LIST_GET_FIRST(plan->other_conds);
|
|
|
|
|
|
|
|
while (cond) {
|
|
|
|
eval_exp(cond);
|
|
|
|
|
|
|
|
if (!eval_node_get_ibool_val(cond)) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
cond = UT_LIST_GET_NEXT(cond_list, cond);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Retrieves the clustered index record corresponding to a record in a
|
2009-05-25 06:46:10 +00:00
|
|
|
non-clustered index. Does the necessary locking.
|
|
|
|
@return DB_SUCCESS or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_get_clust_rec(
|
|
|
|
/*==================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node, /*!< in: select_node */
|
|
|
|
plan_t* plan, /*!< in: plan node for table */
|
|
|
|
rec_t* rec, /*!< in: record in a non-clustered index */
|
|
|
|
que_thr_t* thr, /*!< in: query thread */
|
|
|
|
rec_t** out_rec,/*!< out: clustered record or an old version of
|
2005-10-27 07:29:40 +00:00
|
|
|
it, NULL if the old version did not exist
|
|
|
|
in the read view, i.e., it was a fresh
|
|
|
|
inserted version */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr used to get access to the
|
2005-10-27 07:29:40 +00:00
|
|
|
non-clustered record; the same mtr is used to
|
|
|
|
access the clustered index */
|
|
|
|
{
|
|
|
|
dict_index_t* index;
|
|
|
|
rec_t* clust_rec;
|
|
|
|
rec_t* old_vers;
|
|
|
|
ulint err;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
*out_rec = NULL;
|
|
|
|
|
|
|
|
offsets = rec_get_offsets(rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
btr_pcur_get_btr_cur(&plan->pcur)->index,
|
|
|
|
offsets, ULINT_UNDEFINED, &heap);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
row_build_row_ref_fast(plan->clust_ref, plan->clust_map, rec, offsets);
|
|
|
|
|
|
|
|
index = dict_table_get_first_index(plan->table);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_open_with_no_init(index, plan->clust_ref, PAGE_CUR_LE,
|
2008-12-17 12:48:23 +00:00
|
|
|
BTR_SEARCH_LEAF, &plan->clust_pcur,
|
2006-08-29 09:30:31 +00:00
|
|
|
0, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
clust_rec = btr_pcur_get_rec(&(plan->clust_pcur));
|
|
|
|
|
|
|
|
/* Note: only if the search ends up on a non-infimum record is the
|
|
|
|
low_match value the real match to the search tuple */
|
|
|
|
|
|
|
|
if (!page_rec_is_user_rec(clust_rec)
|
2006-08-29 09:30:31 +00:00
|
|
|
|| btr_pcur_get_low_match(&(plan->clust_pcur))
|
|
|
|
< dict_index_get_n_unique(index)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
ut_a(rec_get_deleted_flag(rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
dict_table_is_comp(plan->table)));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(node->read_view);
|
|
|
|
|
|
|
|
/* In a rare case it is possible that no clust rec is found
|
|
|
|
for a delete-marked secondary index record: if in row0umod.c
|
|
|
|
in row_undo_mod_remove_clust_low() we have already removed
|
|
|
|
the clust rec, while purge is still cleaning and removing
|
|
|
|
secondary index records associated with earlier versions of
|
|
|
|
the clustered index record. In that case we know that the
|
|
|
|
clustered index record did not exist in the read view of
|
|
|
|
trx. */
|
|
|
|
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
offsets = rec_get_offsets(clust_rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (!node->read_view) {
|
|
|
|
/* Try to place a lock on the index record */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If innodb_locks_unsafe_for_binlog option is used
|
|
|
|
or this session is using READ COMMITTED isolation level
|
2005-10-27 07:29:40 +00:00
|
|
|
we lock only the record, i.e., next-key locking is
|
|
|
|
not used. */
|
|
|
|
ulint lock_type;
|
2006-04-12 09:32:17 +00:00
|
|
|
trx_t* trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
|
|
|
if (srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED) {
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_type = LOCK_REC_NOT_GAP;
|
|
|
|
} else {
|
|
|
|
lock_type = LOCK_ORDINARY;
|
|
|
|
}
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = lock_clust_rec_read_check_and_lock(
|
2006-10-24 06:45:52 +00:00
|
|
|
0, btr_pcur_get_block(&plan->clust_pcur),
|
|
|
|
clust_rec, index, offsets,
|
2006-09-19 10:14:07 +00:00
|
|
|
node->row_lock_mode, lock_type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
/* Declare the variable uninitialized in Valgrind.
|
|
|
|
It should be set to DB_SUCCESS at func_exit. */
|
|
|
|
UNIV_MEM_INVALID(&err, sizeof err);
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
|
|
|
|
|
|
|
old_vers = NULL;
|
|
|
|
|
|
|
|
if (!lock_clust_rec_cons_read_sees(clust_rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
node->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-10 10:09:01 +00:00
|
|
|
err = row_sel_build_prev_vers(
|
|
|
|
node->read_view, index, clust_rec,
|
|
|
|
&offsets, &heap, &plan->old_vers_heap,
|
|
|
|
&old_vers, mtr);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
clust_rec = old_vers;
|
|
|
|
|
|
|
|
if (clust_rec == NULL) {
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we had to go to an earlier version of row or the
|
|
|
|
secondary index record is delete marked, then it may be that
|
|
|
|
the secondary index record corresponding to clust_rec
|
|
|
|
(or old_vers) is not rec; in that case we must ignore
|
|
|
|
such row because in our snapshot rec would not have existed.
|
|
|
|
Remember that from rec we cannot see directly which transaction
|
|
|
|
id corresponds to it: we have to go to the clustered index
|
|
|
|
record. A query where we want to fetch all rows where
|
|
|
|
the secondary index value is in some interval would return
|
|
|
|
a wrong result if we would not drop rows which we come to
|
|
|
|
visit through secondary index records that would not really
|
|
|
|
exist in our snapshot. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
if ((old_vers
|
2006-09-19 10:14:07 +00:00
|
|
|
|| rec_get_deleted_flag(rec, dict_table_is_comp(
|
|
|
|
plan->table)))
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !row_sel_sec_rec_is_for_clust_rec(rec, plan->index,
|
|
|
|
clust_rec, index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* Fetch the columns needed in test conditions. The clustered
|
|
|
|
index record is protected by a page latch that was acquired
|
|
|
|
when plan->clust_pcur was positioned. The latch will not be
|
|
|
|
released until mtr_commit(mtr). */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-06-29 16:19:07 +03:00
|
|
|
ut_ad(!rec_get_deleted_flag(clust_rec, rec_offs_comp(offsets)));
|
2005-10-27 07:29:40 +00:00
|
|
|
row_sel_fetch_columns(index, clust_rec, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
UT_LIST_GET_FIRST(plan->columns));
|
2005-10-27 07:29:40 +00:00
|
|
|
*out_rec = clust_rec;
|
|
|
|
func_exit:
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
err_exit:
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Sets a lock on a record.
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
@return DB_SUCCESS, DB_SUCCESS_LOCKED_REC, or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
UNIV_INLINE
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
enum db_err
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_set_rec_lock(
|
|
|
|
/*=============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const buf_block_t* block, /*!< in: buffer block of rec */
|
|
|
|
const rec_t* rec, /*!< in: record */
|
|
|
|
dict_index_t* index, /*!< in: index */
|
|
|
|
const ulint* offsets,/*!< in: rec_get_offsets(rec, index) */
|
|
|
|
ulint mode, /*!< in: lock mode */
|
|
|
|
ulint type, /*!< in: LOCK_ORDINARY, LOCK_GAP, or
|
2006-10-24 06:45:52 +00:00
|
|
|
LOC_REC_NOT_GAP */
|
2009-05-25 06:46:10 +00:00
|
|
|
que_thr_t* thr) /*!< in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
trx_t* trx;
|
|
|
|
enum db_err err;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
trx = thr_get_trx(thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (UT_LIST_GET_LEN(trx->trx_locks) > 10000) {
|
|
|
|
if (buf_LRU_buf_pool_running_out()) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(DB_LOCK_TABLE_FULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (dict_index_is_clust(index)) {
|
2006-09-19 10:14:07 +00:00
|
|
|
err = lock_clust_rec_read_check_and_lock(
|
2006-10-24 06:45:52 +00:00
|
|
|
0, block, rec, index, offsets, mode, type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
err = lock_sec_rec_read_check_and_lock(
|
2006-10-24 06:45:52 +00:00
|
|
|
0, block, rec, index, offsets, mode, type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Opens a pcur to a table index. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_sel_open_pcur(
|
|
|
|
/*==============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan, /*!< in: table plan */
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool search_latch_locked,
|
2009-05-25 06:46:10 +00:00
|
|
|
/*!< in: TRUE if the thread currently
|
2005-10-27 07:29:40 +00:00
|
|
|
has the search latch locked in
|
|
|
|
s-mode */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dict_index_t* index;
|
|
|
|
func_node_t* cond;
|
|
|
|
que_node_t* exp;
|
|
|
|
ulint n_fields;
|
2006-02-23 19:25:29 +00:00
|
|
|
ulint has_search_latch = 0; /* RW_S_LATCH or 0 */
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint i;
|
|
|
|
|
|
|
|
if (search_latch_locked) {
|
|
|
|
has_search_latch = RW_S_LATCH;
|
|
|
|
}
|
|
|
|
|
|
|
|
index = plan->index;
|
|
|
|
|
|
|
|
/* Calculate the value of the search tuple: the exact match columns
|
|
|
|
get their expressions evaluated when we evaluate the right sides of
|
|
|
|
end_conds */
|
|
|
|
|
|
|
|
cond = UT_LIST_GET_FIRST(plan->end_conds);
|
|
|
|
|
|
|
|
while (cond) {
|
|
|
|
eval_exp(que_node_get_next(cond->args));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
cond = UT_LIST_GET_NEXT(cond_list, cond);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (plan->tuple) {
|
|
|
|
n_fields = dtuple_get_n_fields(plan->tuple);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (plan->n_exact_match < n_fields) {
|
|
|
|
/* There is a non-exact match field which must be
|
|
|
|
evaluated separately */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
eval_exp(plan->tuple_exps[n_fields - 1]);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
exp = plan->tuple_exps[i];
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-19 07:27:26 +00:00
|
|
|
dfield_copy_data(dtuple_get_nth_field(plan->tuple, i),
|
2006-08-29 09:30:31 +00:00
|
|
|
que_node_get_val(exp));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Open pcur to the index */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_open_with_no_init(index, plan->tuple, plan->mode,
|
2008-12-17 12:48:23 +00:00
|
|
|
BTR_SEARCH_LEAF, &plan->pcur,
|
2006-08-29 09:30:31 +00:00
|
|
|
has_search_latch, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
/* Open the cursor to the start or the end of the index
|
|
|
|
(FALSE: no init) */
|
|
|
|
|
2008-12-17 12:48:23 +00:00
|
|
|
btr_pcur_open_at_index_side(plan->asc, index, BTR_SEARCH_LEAF,
|
2006-08-29 09:30:31 +00:00
|
|
|
&(plan->pcur), FALSE, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(plan->n_rows_prefetched == 0);
|
|
|
|
ut_ad(plan->n_rows_fetched == 0);
|
|
|
|
ut_ad(plan->cursor_at_end == FALSE);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
plan->pcur_is_open = TRUE;
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Restores a stored pcur position to a table index.
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
@return TRUE if the cursor should be moved to the next record after we
|
|
|
|
return from this function (moved to the previous, in the case of a
|
|
|
|
descending cursor) without processing again the current cursor
|
|
|
|
record */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
row_sel_restore_pcur_pos(
|
|
|
|
/*=====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan, /*!< in: table plan */
|
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ibool equal_position;
|
|
|
|
ulint relative_position;
|
|
|
|
|
|
|
|
ut_ad(!plan->cursor_at_end);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
relative_position = btr_pcur_get_rel_pos(&(plan->pcur));
|
|
|
|
|
2008-12-17 12:48:23 +00:00
|
|
|
equal_position = btr_pcur_restore_position(BTR_SEARCH_LEAF,
|
2006-08-29 09:30:31 +00:00
|
|
|
&(plan->pcur), mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* If the cursor is traveling upwards, and relative_position is
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
(1) BTR_PCUR_BEFORE: this is not allowed, as we did not have a lock
|
|
|
|
yet on the successor of the page infimum;
|
|
|
|
(2) BTR_PCUR_AFTER: btr_pcur_restore_position placed the cursor on the
|
|
|
|
first record GREATER than the predecessor of a page supremum; we have
|
|
|
|
not yet processed the cursor record: no need to move the cursor to the
|
|
|
|
next record;
|
|
|
|
(3) BTR_PCUR_ON: btr_pcur_restore_position placed the cursor on the
|
|
|
|
last record LESS or EQUAL to the old stored user record; (a) if
|
|
|
|
equal_position is FALSE, this means that the cursor is now on a record
|
|
|
|
less than the old user record, and we must move to the next record;
|
|
|
|
(b) if equal_position is TRUE, then if
|
|
|
|
plan->stored_cursor_rec_processed is TRUE, we must move to the next
|
|
|
|
record, else there is no need to move the cursor. */
|
|
|
|
|
|
|
|
if (plan->asc) {
|
|
|
|
if (relative_position == BTR_PCUR_ON) {
|
|
|
|
|
|
|
|
if (equal_position) {
|
|
|
|
|
|
|
|
return(plan->stored_cursor_rec_processed);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(relative_position == BTR_PCUR_AFTER
|
2006-08-29 09:30:31 +00:00
|
|
|
|| relative_position == BTR_PCUR_AFTER_LAST_IN_TREE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the cursor is traveling downwards, and relative_position is
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
(1) BTR_PCUR_BEFORE: btr_pcur_restore_position placed the cursor on
|
|
|
|
the last record LESS than the successor of a page infimum; we have not
|
|
|
|
processed the cursor record: no need to move the cursor;
|
|
|
|
(2) BTR_PCUR_AFTER: btr_pcur_restore_position placed the cursor on the
|
|
|
|
first record GREATER than the predecessor of a page supremum; we have
|
|
|
|
processed the cursor record: we should move the cursor to the previous
|
|
|
|
record;
|
|
|
|
(3) BTR_PCUR_ON: btr_pcur_restore_position placed the cursor on the
|
|
|
|
last record LESS or EQUAL to the old stored user record; (a) if
|
|
|
|
equal_position is FALSE, this means that the cursor is now on a record
|
|
|
|
less than the old user record, and we need not move to the previous
|
|
|
|
record; (b) if equal_position is TRUE, then if
|
|
|
|
plan->stored_cursor_rec_processed is TRUE, we must move to the previous
|
|
|
|
record, else there is no need to move the cursor. */
|
|
|
|
|
|
|
|
if (relative_position == BTR_PCUR_BEFORE
|
2006-08-29 09:30:31 +00:00
|
|
|
|| relative_position == BTR_PCUR_BEFORE_FIRST_IN_TREE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (relative_position == BTR_PCUR_ON) {
|
|
|
|
|
|
|
|
if (equal_position) {
|
|
|
|
|
|
|
|
return(plan->stored_cursor_rec_processed);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(relative_position == BTR_PCUR_AFTER
|
2006-08-29 09:30:31 +00:00
|
|
|
|| relative_position == BTR_PCUR_AFTER_LAST_IN_TREE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Resets a plan cursor to a closed state. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
plan_reset_cursor(
|
|
|
|
/*==============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
plan_t* plan) /*!< in: plan */
|
2006-02-23 19:25:29 +00:00
|
|
|
{
|
2005-10-27 07:29:40 +00:00
|
|
|
plan->pcur_is_open = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
plan->cursor_at_end = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
plan->n_rows_fetched = 0;
|
|
|
|
plan->n_rows_prefetched = 0;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Tries to do a shortcut to fetch a clustered index record with a unique key,
|
2009-05-25 06:46:10 +00:00
|
|
|
using the hash index if possible (not always).
|
|
|
|
@return SEL_FOUND, SEL_EXHAUSTED, SEL_RETRY */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_try_search_shortcut(
|
|
|
|
/*========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node, /*!< in: select node for a consistent read */
|
|
|
|
plan_t* plan, /*!< in: plan for a unique search in clustered
|
2005-10-27 07:29:40 +00:00
|
|
|
index */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dict_index_t* index;
|
|
|
|
rec_t* rec;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
|
|
|
ulint ret;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
index = plan->index;
|
|
|
|
|
|
|
|
ut_ad(node->read_view);
|
|
|
|
ut_ad(plan->unique_search);
|
|
|
|
ut_ad(!plan->must_get_clust);
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(rw_lock_own(&btr_search_latch, RW_LOCK_SHARED));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2008-12-17 12:48:23 +00:00
|
|
|
row_sel_open_pcur(plan, TRUE, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
rec = btr_pcur_get_rec(&(plan->pcur));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!page_rec_is_user_rec(rec)) {
|
|
|
|
|
|
|
|
return(SEL_RETRY);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(plan->mode == PAGE_CUR_GE);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* As the cursor is now placed on a user record after a search with
|
|
|
|
the mode PAGE_CUR_GE, the up_match field in the cursor tells how many
|
2006-02-23 19:25:29 +00:00
|
|
|
fields in the user record matched to the search tuple */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (btr_pcur_get_up_match(&(plan->pcur)) < plan->n_exact_match) {
|
|
|
|
|
|
|
|
return(SEL_EXHAUSTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (dict_index_is_clust(index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!lock_clust_rec_cons_read_sees(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
node->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
ret = SEL_RETRY;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
2006-10-24 06:45:52 +00:00
|
|
|
} else if (!lock_sec_rec_cons_read_sees(rec, node->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ret = SEL_RETRY;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* Test the deleted flag. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (rec_get_deleted_flag(rec, dict_table_is_comp(plan->table))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ret = SEL_EXHAUSTED;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* Fetch the columns needed in test conditions. The index
|
|
|
|
record is protected by a page latch that was acquired when
|
|
|
|
plan->pcur was positioned. The latch will not be released
|
|
|
|
until mtr_commit(mtr). */
|
|
|
|
|
|
|
|
row_sel_fetch_columns(index, rec, offsets,
|
|
|
|
UT_LIST_GET_FIRST(plan->columns));
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Test the rest of search conditions */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!row_sel_test_other_conds(plan)) {
|
|
|
|
|
|
|
|
ret = SEL_EXHAUSTED;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
2008-12-17 21:04:41 +00:00
|
|
|
ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
plan->n_rows_fetched++;
|
2006-06-13 20:23:26 +00:00
|
|
|
ret = SEL_FOUND;
|
2005-10-27 07:29:40 +00:00
|
|
|
func_exit:
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
2006-06-13 20:23:26 +00:00
|
|
|
return(ret);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Performs a select step.
|
|
|
|
@return DB_SUCCESS or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel(
|
|
|
|
/*====*/
|
2009-05-25 06:46:10 +00:00
|
|
|
sel_node_t* node, /*!< in: select node */
|
|
|
|
que_thr_t* thr) /*!< in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dict_index_t* index;
|
|
|
|
plan_t* plan;
|
|
|
|
mtr_t mtr;
|
|
|
|
ibool moved;
|
|
|
|
rec_t* rec;
|
|
|
|
rec_t* old_vers;
|
|
|
|
rec_t* clust_rec;
|
|
|
|
ibool search_latch_locked;
|
|
|
|
ibool consistent_read;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
/* The following flag becomes TRUE when we are doing a
|
|
|
|
consistent read from a non-clustered index and we must look
|
|
|
|
at the clustered index to find out the previous delete mark
|
|
|
|
state of the non-clustered record: */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ibool cons_read_requires_clust_rec = FALSE;
|
|
|
|
ulint cost_counter = 0;
|
|
|
|
ibool cursor_just_opened;
|
|
|
|
ibool must_go_to_next;
|
2006-02-23 19:25:29 +00:00
|
|
|
ibool mtr_has_extra_clust_latch = FALSE;
|
2006-08-29 09:30:31 +00:00
|
|
|
/* TRUE if the search was made using
|
|
|
|
a non-clustered index, and we had to
|
|
|
|
access the clustered record: now &mtr
|
|
|
|
contains a clustered index latch, and
|
|
|
|
&mtr must be committed before we move
|
|
|
|
to the next non-clustered record */
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint found_flag;
|
|
|
|
ulint err;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(thr->run_node == node);
|
|
|
|
|
|
|
|
search_latch_locked = FALSE;
|
|
|
|
|
|
|
|
if (node->read_view) {
|
|
|
|
/* In consistent reads, we try to do with the hash index and
|
|
|
|
not to use the buffer page get. This is to reduce memory bus
|
|
|
|
load resulting from semaphore operations. The search latch
|
|
|
|
will be s-locked when we access an index with a unique search
|
|
|
|
condition, but not locked when we access an index with a
|
|
|
|
less selective search condition. */
|
|
|
|
|
|
|
|
consistent_read = TRUE;
|
|
|
|
} else {
|
|
|
|
consistent_read = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
table_loop:
|
|
|
|
/* TABLE LOOP
|
2006-08-29 09:30:31 +00:00
|
|
|
----------
|
2005-10-27 07:29:40 +00:00
|
|
|
This is the outer major loop in calculating a join. We come here when
|
|
|
|
node->fetch_table changes, and after adding a row to aggregate totals
|
|
|
|
and, of course, when this function is called. */
|
|
|
|
|
|
|
|
ut_ad(mtr_has_extra_clust_latch == FALSE);
|
|
|
|
|
|
|
|
plan = sel_node_get_nth_plan(node, node->fetch_table);
|
|
|
|
index = plan->index;
|
|
|
|
|
|
|
|
if (plan->n_rows_prefetched > 0) {
|
|
|
|
sel_pop_prefetched_row(plan);
|
|
|
|
|
|
|
|
goto next_table_no_mtr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (plan->cursor_at_end) {
|
|
|
|
/* The cursor has already reached the result set end: no more
|
|
|
|
rows to process for this table cursor, as also the prefetch
|
|
|
|
stack was empty */
|
|
|
|
|
|
|
|
ut_ad(plan->pcur_is_open);
|
|
|
|
|
|
|
|
goto table_exhausted_no_mtr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open a cursor to index, or restore an open cursor position */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
if (consistent_read && plan->unique_search && !plan->pcur_is_open
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !plan->must_get_clust
|
2006-09-19 10:14:07 +00:00
|
|
|
&& !plan->table->big_rows) {
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!search_latch_locked) {
|
|
|
|
rw_lock_s_lock(&btr_search_latch);
|
|
|
|
|
|
|
|
search_latch_locked = TRUE;
|
branches/innodb+: Merge revisions 4072:4150 from branches/zip:
------------------------------------------------------------------------
r4074 | vasil | 2009-01-31 08:05:24 +0200 (Sat, 31 Jan 2009) | 4 lines
branches/zip:
Adjust the failing patch patches/information_schema.diff.
------------------------------------------------------------------------
r4076 | vasil | 2009-02-02 09:32:04 +0200 (Mon, 02 Feb 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the change in r4072.
------------------------------------------------------------------------
r4077 | marko | 2009-02-02 10:48:05 +0200 (Mon, 02 Feb 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql(): Remove a factual error
in the function comment. Parameters are not read from a file "srv_init".
------------------------------------------------------------------------
r4081 | marko | 2009-02-02 14:28:17 +0200 (Mon, 02 Feb 2009) | 4 lines
branches/zip: Enclose some backup functions in #ifdef UNIV_HOTBACKUP.
recv_read_cp_info_for_backup(), recv_scan_log_seg_for_backup():
These functions are only called by InnoDB Hot Backup.
------------------------------------------------------------------------
r4082 | vasil | 2009-02-02 18:24:08 +0200 (Mon, 02 Feb 2009) | 10 lines
branches/zip:
Fix a mysql-test failure in innodb-zip:
main.innodb-zip [ fail ]
Test ended at 2009-02-02 18:13:25
CURRENT_TEST: main.innodb-zip
mysqltest: At line 160: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment
------------------------------------------------------------------------
r4083 | vasil | 2009-02-02 18:33:20 +0200 (Mon, 02 Feb 2009) | 6 lines
branches/zip:
Fix the failing innodb-zip test to restore the environment as it was before
the test execution because a newly added feature in the mysql-test framework
does check for this.
------------------------------------------------------------------------
r4088 | calvin | 2009-02-03 02:35:56 +0200 (Tue, 03 Feb 2009) | 8 lines
branches/zip: fix a compiler error and a warning
Both are minor changes:
1) Compiler error introduced in r4072: double ';' at the end.
2) Warning introduced in r3613: \mem\mem0pool.c(481) :
warning C4098: 'mem_area_free' : 'void' function returning a value
Approved by: Sunny (IM)
------------------------------------------------------------------------
r4098 | marko | 2009-02-03 09:52:45 +0200 (Tue, 03 Feb 2009) | 4 lines
branches/zip: mem_area_free(): Correct a bug that was introduced in r4088.
free() is not the same as ut_free(). ut_free() pairs with ut_malloc(),
not malloc(). free() pairs with malloc() and some other functions.
------------------------------------------------------------------------
r4114 | marko | 2009-02-04 16:09:24 +0200 (Wed, 04 Feb 2009) | 2 lines
branches/zip: buf_block_align(): Fix a bogus debug assertion
that was introduced in r4036, to address Issue #161.
------------------------------------------------------------------------
r4139 | vasil | 2009-02-09 13:47:16 +0200 (Mon, 09 Feb 2009) | 5 lines
branches/zip:
Remove mysql-test/patches/bug35261.diff because that bug has been fixed
in the MySQL repository.
------------------------------------------------------------------------
r4141 | marko | 2009-02-09 15:35:50 +0200 (Mon, 09 Feb 2009) | 1 line
branches/zip: fil_write_lsn_and_arch_no_to_file(): Plug a memory leak.
------------------------------------------------------------------------
r4144 | inaam | 2009-02-10 01:36:25 +0200 (Tue, 10 Feb 2009) | 9 lines
branches/zip rb://30
This patch changes the innodb mutexes and rw_locks implementation.
On supported platforms it uses GCC builtin atomics. These changes
are based on the patch sent by Mark Callaghan of Google under BSD
license. More technical discussion can be found at rb://30
Approved by: Heikki
------------------------------------------------------------------------
r4145 | vasil | 2009-02-10 07:34:43 +0200 (Tue, 10 Feb 2009) | 9 lines
branches/zip:
Non-functional change: Fix a compilation warning introduced in r4144:
gcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I../../storage/innobase/include -I../../sql -I. -Werror -Wall -g -MT libinnobase_a-sync0arr.o -MD -MP -MF .deps/libinnobase_a-sync0arr.Tpo -c -o libinnobase_a-sync0arr.o `test -f 'sync/sync0arr.c' || echo './'`sync/sync0arr.c
cc1: warnings being treated as errors
sync/sync0arr.c: In function 'sync_array_object_signalled':
sync/sync0arr.c:869: warning: pointer targets in passing argument 1 of 'os_atomic_increment' differ in signedness
------------------------------------------------------------------------
r4148 | marko | 2009-02-10 10:38:41 +0200 (Tue, 10 Feb 2009) | 12 lines
branches/zip: Map ut_malloc(), ut_realloc(), ut_free() to
malloc(), realloc(), free() when innodb_use_sys_malloc is set.
ut_free_all_mem(): If innodb_use_sys_malloc is set, do nothing,
because then ut_mem_block_list_inited will never be set.
log_init(): Use mem_alloc() instead of ut_malloc(), so that the
memory will be freed. (Tested with Valgrind, although it is not
clear why the memory would be freed.)
rb://86 approved by Heikki Tuuri and Ken Jacobs. This addresses Issue #168.
------------------------------------------------------------------------
r4149 | marko | 2009-02-10 11:09:15 +0200 (Tue, 10 Feb 2009) | 1 line
branches/zip: ChangeLog: Document recent changes.
------------------------------------------------------------------------
r4150 | marko | 2009-02-10 11:51:43 +0200 (Tue, 10 Feb 2009) | 6 lines
branches/zip: get_share(), free_share(): Make table locking case sensitive.
If lower_case_table_names=1, MySQL will pass the table names in lower case.
Thus, we can use a binary comparison (strcmp) in the hash table.
rb://87 approved by Heikki Tuuri, to address Bug #41676 and Issue #167.
------------------------------------------------------------------------
2009-02-10 10:03:42 +00:00
|
|
|
} else if (rw_lock_get_writer(&btr_search_latch) == RW_LOCK_WAIT_EX) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* There is an x-latch request waiting: release the
|
|
|
|
s-latch for a moment; as an s-latch here is often
|
|
|
|
kept for some 10 searches before being released,
|
|
|
|
a waiting x-latch request would block other threads
|
|
|
|
from acquiring an s-latch for a long time, lowering
|
|
|
|
performance significantly in multiprocessors. */
|
|
|
|
|
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
|
|
|
rw_lock_s_lock(&btr_search_latch);
|
|
|
|
}
|
|
|
|
|
|
|
|
found_flag = row_sel_try_search_shortcut(node, plan, &mtr);
|
|
|
|
|
|
|
|
if (found_flag == SEL_FOUND) {
|
|
|
|
|
|
|
|
goto next_table;
|
|
|
|
|
|
|
|
} else if (found_flag == SEL_EXHAUSTED) {
|
|
|
|
|
|
|
|
goto table_exhausted;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(found_flag == SEL_RETRY);
|
|
|
|
|
|
|
|
plan_reset_cursor(plan);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
mtr_start(&mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (search_latch_locked) {
|
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
|
|
|
|
|
|
|
search_latch_locked = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!plan->pcur_is_open) {
|
|
|
|
/* Evaluate the expressions to build the search tuple and
|
|
|
|
open the cursor */
|
|
|
|
|
2008-12-17 12:48:23 +00:00
|
|
|
row_sel_open_pcur(plan, search_latch_locked, &mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
cursor_just_opened = TRUE;
|
|
|
|
|
|
|
|
/* A new search was made: increment the cost counter */
|
|
|
|
cost_counter++;
|
|
|
|
} else {
|
|
|
|
/* Restore pcur position to the index */
|
|
|
|
|
2008-12-17 12:48:23 +00:00
|
|
|
must_go_to_next = row_sel_restore_pcur_pos(plan, &mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
cursor_just_opened = FALSE;
|
|
|
|
|
|
|
|
if (must_go_to_next) {
|
|
|
|
/* We have already processed the cursor record: move
|
|
|
|
to the next */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_loop:
|
|
|
|
/* RECORD LOOP
|
2006-08-29 09:30:31 +00:00
|
|
|
-----------
|
2005-10-27 07:29:40 +00:00
|
|
|
In this loop we use pcur and try to fetch a qualifying row, and
|
|
|
|
also fill the prefetch buffer for this table if n_rows_fetched has
|
|
|
|
exceeded a threshold. While we are inside this loop, the following
|
|
|
|
holds:
|
|
|
|
(1) &mtr is started,
|
|
|
|
(2) pcur is positioned and open.
|
|
|
|
|
|
|
|
NOTE that if cursor_just_opened is TRUE here, it means that we came
|
|
|
|
to this point right after row_sel_open_pcur. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(mtr_has_extra_clust_latch == FALSE);
|
|
|
|
|
|
|
|
rec = btr_pcur_get_rec(&(plan->pcur));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* PHASE 1: Set a lock if specified */
|
|
|
|
|
|
|
|
if (!node->asc && cursor_just_opened
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !page_rec_is_supremum(rec)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* When we open a cursor for a descending search, we must set
|
|
|
|
a next-key lock on the successor record: otherwise it would
|
|
|
|
be possible to insert new records next to the cursor position,
|
|
|
|
and it might be that these new records should appear in the
|
|
|
|
search result set, resulting in the phantom problem. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!consistent_read) {
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If innodb_locks_unsafe_for_binlog option is used
|
|
|
|
or this session is using READ COMMITTED isolation
|
|
|
|
level, we lock only the record, i.e., next-key
|
|
|
|
locking is not used. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
rec_t* next_rec = page_rec_get_next(rec);
|
|
|
|
ulint lock_type;
|
2006-04-12 09:32:17 +00:00
|
|
|
trx_t* trx;
|
|
|
|
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
offsets = rec_get_offsets(next_rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if (srv_locks_unsafe_for_binlog
|
2006-08-29 09:30:31 +00:00
|
|
|
|| trx->isolation_level
|
2010-05-04 13:52:14 +03:00
|
|
|
<= TRX_ISO_READ_COMMITTED) {
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
if (page_rec_is_supremum(next_rec)) {
|
|
|
|
|
|
|
|
goto skip_lock;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_type = LOCK_REC_NOT_GAP;
|
|
|
|
} else {
|
|
|
|
lock_type = LOCK_ORDINARY;
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = sel_set_rec_lock(btr_pcur_get_block(&plan->pcur),
|
|
|
|
next_rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
node->row_lock_mode,
|
|
|
|
lock_type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Note that in this case we will store in pcur
|
|
|
|
the PREDECESSOR of the record we are waiting
|
|
|
|
the lock for */
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
skip_lock:
|
2005-10-27 07:29:40 +00:00
|
|
|
if (page_rec_is_infimum(rec)) {
|
|
|
|
|
|
|
|
/* The infimum record on a page cannot be in the result set,
|
|
|
|
and neither can a record lock be placed on it: we skip such
|
|
|
|
a record. We also increment the cost counter as we may have
|
|
|
|
processed yet another page of index. */
|
|
|
|
|
|
|
|
cost_counter++;
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!consistent_read) {
|
2006-02-23 19:25:29 +00:00
|
|
|
/* Try to place a lock on the index record */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If innodb_locks_unsafe_for_binlog option is used
|
|
|
|
or this session is using READ COMMITTED isolation level,
|
2005-10-27 07:29:40 +00:00
|
|
|
we lock only the record, i.e., next-key locking is
|
|
|
|
not used. */
|
|
|
|
|
|
|
|
ulint lock_type;
|
2006-04-12 09:32:17 +00:00
|
|
|
trx_t* trx;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
|
|
|
|
if (srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED) {
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
if (page_rec_is_supremum(rec)) {
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
lock_type = LOCK_REC_NOT_GAP;
|
|
|
|
} else {
|
|
|
|
lock_type = LOCK_ORDINARY;
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = sel_set_rec_lock(btr_pcur_get_block(&plan->pcur),
|
|
|
|
rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
node->row_lock_mode, lock_type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (page_rec_is_supremum(rec)) {
|
|
|
|
|
|
|
|
/* A page supremum record cannot be in the result set: skip
|
|
|
|
it now when we have placed a possible lock on it */
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(page_rec_is_user_rec(rec));
|
|
|
|
|
|
|
|
if (cost_counter > SEL_COST_LIMIT) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Now that we have placed the necessary locks, we can stop
|
|
|
|
for a while and store the cursor position; NOTE that if we
|
|
|
|
would store the cursor position BEFORE placing a record lock,
|
|
|
|
it might happen that the cursor would jump over some records
|
|
|
|
that another transaction could meanwhile insert adjacent to
|
|
|
|
the cursor: this would result in the phantom problem. */
|
|
|
|
|
|
|
|
goto stop_for_a_while;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* PHASE 2: Check a mixed index mix id if needed */
|
|
|
|
|
|
|
|
if (plan->unique_search && cursor_just_opened) {
|
|
|
|
|
|
|
|
ut_ad(plan->mode == PAGE_CUR_GE);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* As the cursor is now placed on a user record after a search
|
|
|
|
with the mode PAGE_CUR_GE, the up_match field in the cursor
|
|
|
|
tells how many fields in the user record matched to the search
|
2006-02-23 19:25:29 +00:00
|
|
|
tuple */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (btr_pcur_get_up_match(&(plan->pcur))
|
2006-08-29 09:30:31 +00:00
|
|
|
< plan->n_exact_match) {
|
2005-10-27 07:29:40 +00:00
|
|
|
goto table_exhausted;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ok, no need to test end_conds or mix id */
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We are ready to look at a possible new index entry in the result
|
|
|
|
set: the cursor is now placed on a user record */
|
|
|
|
|
|
|
|
/* PHASE 3: Get previous version in a consistent read */
|
|
|
|
|
|
|
|
cons_read_requires_clust_rec = FALSE;
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
|
|
|
|
|
|
|
|
if (consistent_read) {
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
if (dict_index_is_clust(index)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!lock_clust_rec_cons_read_sees(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
node->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-10 10:09:01 +00:00
|
|
|
err = row_sel_build_prev_vers(
|
|
|
|
node->read_view, index, rec,
|
|
|
|
&offsets, &heap, &plan->old_vers_heap,
|
|
|
|
&old_vers, &mtr);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (old_vers == NULL) {
|
2010-06-29 16:19:07 +03:00
|
|
|
/* The record does not exist
|
|
|
|
in our read view. Skip it, but
|
|
|
|
first attempt to determine
|
|
|
|
whether the index segment we
|
|
|
|
are searching through has been
|
|
|
|
exhausted. */
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
offsets = rec_get_offsets(
|
|
|
|
rec, index, offsets,
|
|
|
|
ULINT_UNDEFINED, &heap);
|
2008-01-11 19:59:47 +00:00
|
|
|
|
|
|
|
/* Fetch the columns needed in
|
|
|
|
test conditions. The clustered
|
|
|
|
index record is protected by a
|
|
|
|
page latch that was acquired
|
|
|
|
by row_sel_open_pcur() or
|
|
|
|
row_sel_restore_pcur_pos().
|
|
|
|
The latch will not be released
|
|
|
|
until mtr_commit(mtr). */
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
row_sel_fetch_columns(
|
|
|
|
index, rec, offsets,
|
|
|
|
UT_LIST_GET_FIRST(
|
|
|
|
plan->columns));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (!row_sel_test_end_conds(plan)) {
|
|
|
|
|
|
|
|
goto table_exhausted;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
rec = old_vers;
|
|
|
|
}
|
2006-10-24 06:45:52 +00:00
|
|
|
} else if (!lock_sec_rec_cons_read_sees(rec,
|
2005-10-27 07:29:40 +00:00
|
|
|
node->read_view)) {
|
|
|
|
cons_read_requires_clust_rec = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PHASE 4: Test search end conditions and deleted flag */
|
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* Fetch the columns needed in test conditions. The record is
|
|
|
|
protected by a page latch that was acquired by
|
|
|
|
row_sel_open_pcur() or row_sel_restore_pcur_pos(). The latch
|
|
|
|
will not be released until mtr_commit(mtr). */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
row_sel_fetch_columns(index, rec, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
UT_LIST_GET_FIRST(plan->columns));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Test the selection end conditions: these can only contain columns
|
|
|
|
which already are found in the index, even though the index might be
|
|
|
|
non-clustered */
|
|
|
|
|
|
|
|
if (plan->unique_search && cursor_just_opened) {
|
|
|
|
|
|
|
|
/* No test necessary: the test was already made above */
|
|
|
|
|
|
|
|
} else if (!row_sel_test_end_conds(plan)) {
|
|
|
|
|
|
|
|
goto table_exhausted;
|
|
|
|
}
|
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (rec_get_deleted_flag(rec, dict_table_is_comp(plan->table))
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !cons_read_requires_clust_rec) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* The record is delete marked: we can skip it if this is
|
|
|
|
not a consistent read which might see an earlier version
|
|
|
|
of a non-clustered index record */
|
|
|
|
|
|
|
|
if (plan->unique_search) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto table_exhausted;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PHASE 5: Get the clustered index record, if needed and if we did
|
|
|
|
not do the search using the clustered index */
|
|
|
|
|
|
|
|
if (plan->must_get_clust || cons_read_requires_clust_rec) {
|
|
|
|
|
|
|
|
/* It was a non-clustered index and we must fetch also the
|
|
|
|
clustered index record */
|
|
|
|
|
|
|
|
err = row_sel_get_clust_rec(node, plan, rec, thr, &clust_rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
&mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_has_extra_clust_latch = TRUE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Retrieving the clustered record required a search:
|
|
|
|
increment the cost counter */
|
|
|
|
|
|
|
|
cost_counter++;
|
|
|
|
|
|
|
|
if (clust_rec == NULL) {
|
|
|
|
/* The record did not exist in the read view */
|
|
|
|
ut_ad(consistent_read);
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (rec_get_deleted_flag(clust_rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
dict_table_is_comp(plan->table))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* The record is delete marked: we can skip it */
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node->can_get_updated) {
|
|
|
|
|
|
|
|
btr_pcur_store_position(&(plan->clust_pcur), &mtr);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* PHASE 6: Test the rest of search conditions */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!row_sel_test_other_conds(plan)) {
|
|
|
|
|
|
|
|
if (plan->unique_search) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto table_exhausted;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* PHASE 7: We found a new qualifying row for the current table; push
|
|
|
|
the row if prefetch is on, or move to the next table in the join */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
plan->n_rows_fetched++;
|
|
|
|
|
2008-12-17 21:04:41 +00:00
|
|
|
ut_ad(plan->pcur.latch_mode == BTR_SEARCH_LEAF);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if ((plan->n_rows_fetched <= SEL_PREFETCH_LIMIT)
|
2006-08-29 09:30:31 +00:00
|
|
|
|| plan->unique_search || plan->no_prefetch
|
2006-09-19 10:14:07 +00:00
|
|
|
|| plan->table->big_rows) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* No prefetch in operation: go to the next table */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_table;
|
|
|
|
}
|
|
|
|
|
|
|
|
sel_push_prefetched_row(plan);
|
|
|
|
|
|
|
|
if (plan->n_rows_prefetched == SEL_MAX_N_PREFETCH) {
|
|
|
|
|
|
|
|
/* The prefetch buffer is now full */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_pop_prefetched_row(plan);
|
|
|
|
|
|
|
|
goto next_table;
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
next_rec:
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!search_latch_locked);
|
|
|
|
|
|
|
|
if (mtr_has_extra_clust_latch) {
|
|
|
|
|
|
|
|
/* We must commit &mtr if we are moving to the next
|
|
|
|
non-clustered index record, because we could break the
|
|
|
|
latching order if we would access a different clustered
|
|
|
|
index page right away without releasing the previous. */
|
|
|
|
|
|
|
|
goto commit_mtr_for_a_while;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (node->asc) {
|
|
|
|
moved = btr_pcur_move_to_next(&(plan->pcur), &mtr);
|
|
|
|
} else {
|
|
|
|
moved = btr_pcur_move_to_prev(&(plan->pcur), &mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!moved) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto table_exhausted;
|
|
|
|
}
|
|
|
|
|
|
|
|
cursor_just_opened = FALSE;
|
|
|
|
|
|
|
|
/* END OF RECORD LOOP
|
2006-08-29 09:30:31 +00:00
|
|
|
------------------ */
|
2005-10-27 07:29:40 +00:00
|
|
|
goto rec_loop;
|
|
|
|
|
|
|
|
next_table:
|
|
|
|
/* We found a record which satisfies the conditions: we can move to
|
|
|
|
the next table or return a row in the result set */
|
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
ut_ad(btr_pcur_is_on_user_rec(&plan->pcur));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (plan->unique_search && !node->can_get_updated) {
|
|
|
|
|
|
|
|
plan->cursor_at_end = TRUE;
|
|
|
|
} else {
|
|
|
|
ut_ad(!search_latch_locked);
|
|
|
|
|
|
|
|
plan->stored_cursor_rec_processed = TRUE;
|
|
|
|
|
|
|
|
btr_pcur_store_position(&(plan->pcur), &mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
mtr_has_extra_clust_latch = FALSE;
|
|
|
|
|
|
|
|
next_table_no_mtr:
|
|
|
|
/* If we use 'goto' to this label, it means that the row was popped
|
|
|
|
from the prefetched rows stack, and &mtr is already committed */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (node->fetch_table + 1 == node->n_tables) {
|
|
|
|
|
|
|
|
sel_eval_select_list(node);
|
|
|
|
|
|
|
|
if (node->is_aggregate) {
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
goto table_loop;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
sel_assign_into_var_values(node->into_list, node);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
thr->run_node = que_node_get_parent(node);
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
node->fetch_table++;
|
|
|
|
|
|
|
|
/* When we move to the next table, we first reset the plan cursor:
|
|
|
|
we do not care about resetting it when we backtrack from a table */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
plan_reset_cursor(sel_node_get_nth_plan(node, node->fetch_table));
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto table_loop;
|
|
|
|
|
|
|
|
table_exhausted:
|
|
|
|
/* The table cursor pcur reached the result set end: backtrack to the
|
2006-02-23 19:25:29 +00:00
|
|
|
previous table in the join if we do not have cached prefetched rows */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
plan->cursor_at_end = TRUE;
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
mtr_has_extra_clust_latch = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (plan->n_rows_prefetched > 0) {
|
|
|
|
/* The table became exhausted during a prefetch */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_pop_prefetched_row(plan);
|
|
|
|
|
|
|
|
goto next_table_no_mtr;
|
|
|
|
}
|
|
|
|
|
|
|
|
table_exhausted_no_mtr:
|
|
|
|
if (node->fetch_table == 0) {
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
|
|
|
|
if (node->is_aggregate && !node->aggregate_already_fetched) {
|
|
|
|
|
|
|
|
node->aggregate_already_fetched = TRUE;
|
|
|
|
|
|
|
|
sel_assign_into_var_values(node->into_list, node);
|
|
|
|
|
|
|
|
thr->run_node = que_node_get_parent(node);
|
2006-07-04 11:55:26 +00:00
|
|
|
} else {
|
|
|
|
node->state = SEL_NODE_NO_MORE_ROWS;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-07-04 11:55:26 +00:00
|
|
|
thr->run_node = que_node_get_parent(node);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
node->fetch_table--;
|
|
|
|
|
|
|
|
goto table_loop;
|
|
|
|
|
|
|
|
stop_for_a_while:
|
|
|
|
/* Return control for a while to que_run_threads, so that runaway
|
|
|
|
queries can be canceled. NOTE that when we come here, we must, in a
|
|
|
|
locking read, have placed the necessary (possibly waiting request)
|
|
|
|
record lock on the cursor record or its successor: when we reposition
|
|
|
|
the cursor, this record lock guarantees that nobody can meanwhile have
|
|
|
|
inserted new records which should have appeared in the result set,
|
2006-02-23 19:25:29 +00:00
|
|
|
which would result in the phantom problem. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(!search_latch_locked);
|
|
|
|
|
|
|
|
plan->stored_cursor_rec_processed = FALSE;
|
|
|
|
btr_pcur_store_position(&(plan->pcur), &mtr);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-31 16:51:16 +00:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
2011-04-05 10:18:43 +03:00
|
|
|
ut_ad(sync_thread_levels_empty_except_dict());
|
2006-10-31 16:51:16 +00:00
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
err = DB_SUCCESS;
|
|
|
|
goto func_exit;
|
|
|
|
|
|
|
|
commit_mtr_for_a_while:
|
|
|
|
/* Stores the cursor position and commits &mtr; this is used if
|
|
|
|
&mtr may contain latches which would break the latching order if
|
2006-02-23 19:25:29 +00:00
|
|
|
&mtr would not be committed and the latches released. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
plan->stored_cursor_rec_processed = TRUE;
|
|
|
|
|
|
|
|
ut_ad(!search_latch_locked);
|
|
|
|
btr_pcur_store_position(&(plan->pcur), &mtr);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
mtr_has_extra_clust_latch = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-31 16:51:16 +00:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
2011-04-05 10:18:43 +03:00
|
|
|
ut_ad(sync_thread_levels_empty_except_dict());
|
2006-10-31 16:51:16 +00:00
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
goto table_loop;
|
|
|
|
|
|
|
|
lock_wait_or_error:
|
|
|
|
/* See the note at stop_for_a_while: the same holds for this case */
|
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
ut_ad(!btr_pcur_is_before_first_on_page(&plan->pcur) || !node->asc);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!search_latch_locked);
|
|
|
|
|
|
|
|
plan->stored_cursor_rec_processed = FALSE;
|
|
|
|
btr_pcur_store_position(&(plan->pcur), &mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_commit(&mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-31 16:51:16 +00:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
2011-04-05 10:18:43 +03:00
|
|
|
ut_ad(sync_thread_levels_empty_except_dict());
|
2006-10-31 16:51:16 +00:00
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
func_exit:
|
2006-07-04 11:55:26 +00:00
|
|
|
if (search_latch_locked) {
|
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/**********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Performs a select step. This is a high-level function used in SQL execution
|
2009-05-25 06:46:10 +00:00
|
|
|
graphs.
|
|
|
|
@return query thread to run next or NULL */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
que_thr_t*
|
|
|
|
row_sel_step(
|
|
|
|
/*=========*/
|
2009-05-25 06:46:10 +00:00
|
|
|
que_thr_t* thr) /*!< in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint i_lock_mode;
|
|
|
|
sym_node_t* table_node;
|
|
|
|
sel_node_t* node;
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
ut_ad(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
node = thr->run_node;
|
|
|
|
|
|
|
|
ut_ad(que_node_get_type(node) == QUE_NODE_SELECT);
|
|
|
|
|
|
|
|
/* If this is a new time this node is executed (or when execution
|
|
|
|
resumes after wait for a table intention lock), set intention locks
|
|
|
|
on the tables, or assign a read view */
|
|
|
|
|
|
|
|
if (node->into_list && (thr->prev_node == que_node_get_parent(node))) {
|
|
|
|
|
|
|
|
node->state = SEL_NODE_OPEN;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (node->state == SEL_NODE_OPEN) {
|
|
|
|
|
|
|
|
/* It may be that the current session has not yet started
|
|
|
|
its transaction, or it has been committed: */
|
|
|
|
|
|
|
|
trx_start_if_not_started(thr_get_trx(thr));
|
|
|
|
|
|
|
|
plan_reset_cursor(sel_node_get_nth_plan(node, 0));
|
|
|
|
|
|
|
|
if (node->consistent_read) {
|
|
|
|
/* Assign a read view for the query */
|
2006-09-19 10:14:07 +00:00
|
|
|
node->read_view = trx_assign_read_view(
|
|
|
|
thr_get_trx(thr));
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
if (node->set_x_locks) {
|
|
|
|
i_lock_mode = LOCK_IX;
|
|
|
|
} else {
|
|
|
|
i_lock_mode = LOCK_IS;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
table_node = node->table_list;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
while (table_node) {
|
|
|
|
err = lock_table(0, table_node->table,
|
2006-08-29 09:30:31 +00:00
|
|
|
i_lock_mode, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
2006-06-13 20:23:26 +00:00
|
|
|
thr_get_trx(thr)->error_state = err;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
table_node = que_node_get_next(table_node);
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* If this is an explicit cursor, copy stored procedure
|
|
|
|
variable values, so that the values cannot change between
|
|
|
|
fetches (currently, we copy them also for non-explicit
|
|
|
|
cursors) */
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
if (node->explicit_cursor
|
|
|
|
&& UT_LIST_GET_FIRST(node->copy_variables)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
row_sel_copy_input_variable_vals(node);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
node->state = SEL_NODE_FETCH;
|
|
|
|
node->fetch_table = 0;
|
|
|
|
|
|
|
|
if (node->is_aggregate) {
|
|
|
|
/* Reset the aggregate total values */
|
|
|
|
sel_reset_aggregate_vals(node);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
err = row_sel(node, thr);
|
|
|
|
|
|
|
|
/* NOTE! if queries are parallelized, the following assignment may
|
|
|
|
have problems; the assignment should be made only if thr is the
|
|
|
|
only top-level thr in the graph: */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
thr->graph->last_sel_node = node;
|
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
thr_get_trx(thr)->error_state = err;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/**********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Performs a fetch for a cursor.
|
|
|
|
@return query thread to run next or NULL */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
que_thr_t*
|
|
|
|
fetch_step(
|
|
|
|
/*=======*/
|
2009-05-25 06:46:10 +00:00
|
|
|
que_thr_t* thr) /*!< in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
sel_node_t* sel_node;
|
|
|
|
fetch_node_t* node;
|
|
|
|
|
|
|
|
ut_ad(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
node = thr->run_node;
|
|
|
|
sel_node = node->cursor_def;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(que_node_get_type(node) == QUE_NODE_FETCH);
|
|
|
|
|
|
|
|
if (thr->prev_node != que_node_get_parent(node)) {
|
|
|
|
|
|
|
|
if (sel_node->state != SEL_NODE_NO_MORE_ROWS) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if (node->into_list) {
|
|
|
|
sel_assign_into_var_values(node->into_list,
|
2006-08-29 09:30:31 +00:00
|
|
|
sel_node);
|
2006-04-12 09:32:17 +00:00
|
|
|
} else {
|
2006-09-19 10:14:07 +00:00
|
|
|
void* ret = (*node->func->func)(
|
|
|
|
sel_node, node->func->arg);
|
2006-04-12 09:32:17 +00:00
|
|
|
|
|
|
|
if (!ret) {
|
2006-08-29 09:30:31 +00:00
|
|
|
sel_node->state
|
|
|
|
= SEL_NODE_NO_MORE_ROWS;
|
2006-04-12 09:32:17 +00:00
|
|
|
}
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
thr->run_node = que_node_get_parent(node);
|
|
|
|
|
|
|
|
return(thr);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Make the fetch node the parent of the cursor definition for
|
|
|
|
the time of the fetch, so that execution knows to return to this
|
|
|
|
fetch node after a row has been selected or we know that there is
|
|
|
|
no row left */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_node->common.parent = node;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (sel_node->state == SEL_NODE_CLOSED) {
|
2006-04-12 09:32:17 +00:00
|
|
|
fprintf(stderr,
|
|
|
|
"InnoDB: Error: fetch called on a closed cursor\n");
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
thr_get_trx(thr)->error_state = DB_ERROR;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
thr->run_node = sel_node;
|
|
|
|
|
|
|
|
return(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/****************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Sample callback function for fetch that prints each row.
|
|
|
|
@return always returns non-NULL */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2006-04-12 09:32:17 +00:00
|
|
|
void*
|
|
|
|
row_fetch_print(
|
|
|
|
/*============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
void* row, /*!< in: sel_node_t* */
|
|
|
|
void* user_arg) /*!< in: not used */
|
2006-04-12 09:32:17 +00:00
|
|
|
{
|
|
|
|
sel_node_t* node = row;
|
|
|
|
que_node_t* exp;
|
|
|
|
ulint i = 0;
|
|
|
|
|
|
|
|
UT_NOT_USED(user_arg);
|
|
|
|
|
|
|
|
fprintf(stderr, "row_fetch_print: row %p\n", row);
|
|
|
|
|
|
|
|
exp = node->select_list;
|
|
|
|
|
|
|
|
while (exp) {
|
|
|
|
dfield_t* dfield = que_node_get_val(exp);
|
2006-10-17 12:24:13 +00:00
|
|
|
const dtype_t* type = dfield_get_type(dfield);
|
2006-04-12 09:32:17 +00:00
|
|
|
|
|
|
|
fprintf(stderr, " column %lu:\n", (ulong)i);
|
|
|
|
|
|
|
|
dtype_print(type);
|
2008-08-09 00:15:46 +00:00
|
|
|
putc('\n', stderr);
|
2006-04-12 09:32:17 +00:00
|
|
|
|
2006-05-08 06:18:59 +00:00
|
|
|
if (dfield_get_len(dfield) != UNIV_SQL_NULL) {
|
|
|
|
ut_print_buf(stderr, dfield_get_data(dfield),
|
2006-08-29 09:30:31 +00:00
|
|
|
dfield_get_len(dfield));
|
2008-08-09 00:15:46 +00:00
|
|
|
putc('\n', stderr);
|
2006-05-08 06:18:59 +00:00
|
|
|
} else {
|
2008-08-09 00:15:46 +00:00
|
|
|
fputs(" <NULL>;\n", stderr);
|
2006-05-08 06:18:59 +00:00
|
|
|
}
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
exp = que_node_get_next(exp);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return((void*)42);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/***********************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Prints a row in a select result.
|
|
|
|
@return query thread to run next or NULL */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
que_thr_t*
|
|
|
|
row_printf_step(
|
|
|
|
/*============*/
|
2009-05-25 06:46:10 +00:00
|
|
|
que_thr_t* thr) /*!< in: query thread */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
row_printf_node_t* node;
|
|
|
|
sel_node_t* sel_node;
|
|
|
|
que_node_t* arg;
|
|
|
|
|
|
|
|
ut_ad(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
node = thr->run_node;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_node = node->sel_node;
|
|
|
|
|
|
|
|
ut_ad(que_node_get_type(node) == QUE_NODE_ROW_PRINTF);
|
|
|
|
|
|
|
|
if (thr->prev_node == que_node_get_parent(node)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Reset the cursor */
|
|
|
|
sel_node->state = SEL_NODE_OPEN;
|
|
|
|
|
|
|
|
/* Fetch next row to print */
|
|
|
|
|
|
|
|
thr->run_node = sel_node;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(thr);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sel_node->state != SEL_NODE_FETCH) {
|
|
|
|
|
|
|
|
ut_ad(sel_node->state == SEL_NODE_NO_MORE_ROWS);
|
|
|
|
|
|
|
|
/* No more rows to print */
|
|
|
|
|
|
|
|
thr->run_node = que_node_get_parent(node);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(thr);
|
|
|
|
}
|
|
|
|
|
|
|
|
arg = sel_node->select_list;
|
|
|
|
|
|
|
|
while (arg) {
|
|
|
|
dfield_print_also_hex(que_node_get_val(arg));
|
|
|
|
|
|
|
|
fputs(" ::: ", stderr);
|
|
|
|
|
|
|
|
arg = que_node_get_next(arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
putc('\n', stderr);
|
|
|
|
|
|
|
|
/* Fetch next row to print */
|
|
|
|
|
|
|
|
thr->run_node = sel_node;
|
|
|
|
|
|
|
|
return(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/****************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Converts a key value stored in MySQL format to an Innobase dtuple. The last
|
|
|
|
field of the key value may be just a prefix of a fixed length field: hence
|
|
|
|
the parameter key_len. But currently we do not allow search keys where the
|
|
|
|
last field is only a prefix of the full key field len and print a warning if
|
|
|
|
such appears. A counterpart of this function is
|
|
|
|
ha_innobase::store_key_val_for_row() in ha_innodb.cc. */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
void
|
|
|
|
row_sel_convert_mysql_key_to_innobase(
|
|
|
|
/*==================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
dtuple_t* tuple, /*!< in/out: tuple where to build;
|
2005-10-27 07:29:40 +00:00
|
|
|
NOTE: we assume that the type info
|
|
|
|
in the tuple is already according
|
|
|
|
to index! */
|
2009-05-25 06:46:10 +00:00
|
|
|
byte* buf, /*!< in: buffer to use in field
|
2011-12-29 16:19:33 +02:00
|
|
|
conversions; NOTE that dtuple->data
|
|
|
|
may end up pointing inside buf so
|
|
|
|
do not discard that buffer while
|
|
|
|
the tuple is being used. See
|
|
|
|
row_mysql_store_col_in_innobase_format()
|
|
|
|
in the case of DATA_INT */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint buf_len, /*!< in: buffer length */
|
|
|
|
dict_index_t* index, /*!< in: index of the key value */
|
|
|
|
const byte* key_ptr, /*!< in: MySQL key value */
|
|
|
|
ulint key_len, /*!< in: MySQL key value length */
|
|
|
|
trx_t* trx) /*!< in: transaction */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
byte* original_buf = buf;
|
2007-08-03 07:09:29 +00:00
|
|
|
const byte* original_key_ptr = key_ptr;
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_field_t* field;
|
|
|
|
dfield_t* dfield;
|
|
|
|
ulint data_offset;
|
|
|
|
ulint data_len;
|
|
|
|
ulint data_field_len;
|
|
|
|
ibool is_null;
|
2007-08-03 07:09:29 +00:00
|
|
|
const byte* key_end;
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint n_fields = 0;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* For documentation of the key value storage format in MySQL, see
|
|
|
|
ha_innobase::store_key_val_for_row() in ha_innodb.cc. */
|
|
|
|
|
|
|
|
key_end = key_ptr + key_len;
|
|
|
|
|
|
|
|
/* Permit us to access any field in the tuple (ULINT_MAX): */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
dtuple_set_n_fields(tuple, ULINT_MAX);
|
|
|
|
|
2006-10-19 07:27:26 +00:00
|
|
|
dfield = dtuple_get_nth_field(tuple, 0);
|
2005-10-27 07:29:40 +00:00
|
|
|
field = dict_index_get_nth_field(index, 0);
|
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_UNLIKELY(dfield_get_type(dfield)->mtype == DATA_SYS)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* A special case: we are looking for a position in the
|
|
|
|
generated clustered index which InnoDB automatically added
|
|
|
|
to a table with no primary key: the first and the only
|
|
|
|
ordering column is ROW_ID which InnoDB stored to the key_ptr
|
|
|
|
buffer. */
|
|
|
|
|
|
|
|
ut_a(key_len == DATA_ROW_ID_LEN);
|
|
|
|
|
|
|
|
dfield_set_data(dfield, key_ptr, DATA_ROW_ID_LEN);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
dtuple_set_n_fields(tuple, 1);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (key_ptr < key_end) {
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
ulint type = dfield_get_type(dfield)->mtype;
|
|
|
|
ut_a(field->col->mtype == type);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
data_offset = 0;
|
|
|
|
is_null = FALSE;
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if (!(dfield_get_type(dfield)->prtype & DATA_NOT_NULL)) {
|
|
|
|
/* The first byte in the field tells if this is
|
|
|
|
an SQL NULL value */
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
data_offset = 1;
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if (*key_ptr != 0) {
|
branches/zip: Make merge sort handle externally stored columns.
Some things still fail in innodb-index.test, and there seems to be
a race condition (data dictionary lock wait) when running with --valgrind.
dfield_t: Add an "external storage" flag, dfield->ext.
dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null():
New functions.
dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments.
data_write_sql_null(): Use memset().
big_rec_field_t: Replace byte* data with const void* data.
ut_ulint_sort(): Remove.
upd_field_t: Remove extern_storage.
upd_node_t: Replace ext_vec, n_ext_vec with n_ext.
row_merge_copy_blobs(): New function.
row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing
foreign key checks during fast index creation or when inserting into
secondary indexes.
btr_page_insert_fits(): Add const qualifiers.
btr_cur_add_ext(), upd_ext_vec_contains(): Remove.
dfield_print_also_hex(), dfield_print(): Replace if...else if with switch.
Observe dfield_is_ext().
2007-06-21 09:43:15 +00:00
|
|
|
dfield_set_null(dfield);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
is_null = TRUE;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Calculate data length and data field total length */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (type == DATA_BLOB) {
|
|
|
|
/* The key field is a column prefix of a BLOB or
|
|
|
|
TEXT */
|
|
|
|
|
|
|
|
ut_a(field->prefix_len > 0);
|
|
|
|
|
|
|
|
/* MySQL stores the actual data length to the first 2
|
|
|
|
bytes after the optional SQL NULL marker byte. The
|
|
|
|
storage format is little-endian, that is, the most
|
|
|
|
significant byte at a higher address. In UTF-8, MySQL
|
|
|
|
seems to reserve field->prefix_len bytes for
|
|
|
|
storing this field in the key value buffer, even
|
|
|
|
though the actual value only takes data_len bytes
|
|
|
|
from the start. */
|
|
|
|
|
|
|
|
data_len = key_ptr[data_offset]
|
2006-08-29 09:30:31 +00:00
|
|
|
+ 256 * key_ptr[data_offset + 1];
|
2005-10-27 07:29:40 +00:00
|
|
|
data_field_len = data_offset + 2 + field->prefix_len;
|
|
|
|
|
|
|
|
data_offset += 2;
|
|
|
|
|
|
|
|
/* Now that we know the length, we store the column
|
|
|
|
value like it would be a fixed char field */
|
|
|
|
|
|
|
|
} else if (field->prefix_len > 0) {
|
|
|
|
/* Looks like MySQL pads unused end bytes in the
|
|
|
|
prefix with space. Therefore, also in UTF-8, it is ok
|
|
|
|
to compare with a prefix containing full prefix_len
|
|
|
|
bytes, and no need to take at most prefix_len / 3
|
|
|
|
UTF-8 characters from the start.
|
|
|
|
If the prefix is used as the upper end of a LIKE
|
|
|
|
'abc%' query, then MySQL pads the end with chars
|
|
|
|
0xff. TODO: in that case does it any harm to compare
|
|
|
|
with the full prefix_len bytes. How do characters
|
|
|
|
0xff in UTF-8 behave? */
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
data_len = field->prefix_len;
|
2005-10-27 07:29:40 +00:00
|
|
|
data_field_len = data_offset + data_len;
|
|
|
|
} else {
|
|
|
|
data_len = dfield_get_type(dfield)->len;
|
|
|
|
data_field_len = data_offset + data_len;
|
|
|
|
}
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(dtype_get_mysql_type(dfield_get_type(dfield))
|
|
|
|
== DATA_MYSQL_TRUE_VARCHAR)
|
|
|
|
&& UNIV_LIKELY(type != DATA_INT)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* In a MySQL key value format, a true VARCHAR is
|
|
|
|
always preceded by 2 bytes of a length field.
|
|
|
|
dfield_get_type(dfield)->len returns the maximum
|
|
|
|
'payload' len in bytes. That does not include the
|
|
|
|
2 bytes that tell the actual data length.
|
|
|
|
|
|
|
|
We added the check != DATA_INT to make sure we do
|
|
|
|
not treat MySQL ENUM or SET as a true VARCHAR! */
|
|
|
|
|
|
|
|
data_len += 2;
|
|
|
|
data_field_len += 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Storing may use at most data_len bytes of buf */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_LIKELY(!is_null)) {
|
2011-12-29 16:19:33 +02:00
|
|
|
ut_a(buf + data_len <= original_buf + buf_len);
|
2006-09-19 10:14:07 +00:00
|
|
|
row_mysql_store_col_in_innobase_format(
|
|
|
|
dfield, buf,
|
|
|
|
FALSE, /* MySQL key value format col */
|
|
|
|
key_ptr + data_offset, data_len,
|
|
|
|
dict_table_is_comp(index->table));
|
2005-10-27 07:29:40 +00:00
|
|
|
buf += data_len;
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
key_ptr += data_field_len;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2005-10-27 11:48:10 +00:00
|
|
|
if (UNIV_UNLIKELY(key_ptr > key_end)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The last field in key was not a complete key field
|
|
|
|
but a prefix of it.
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
Print a warning about this! HA_READ_PREFIX_LAST does
|
2005-10-27 07:29:40 +00:00
|
|
|
not currently work in InnoDB with partial-field key
|
|
|
|
value prefixes. Since MySQL currently uses a padding
|
|
|
|
trick to calculate LIKE 'abc%' type queries there
|
|
|
|
should never be partial-field prefixes in searches. */
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_print_timestamp(stderr);
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs(" InnoDB: Warning: using a partial-field"
|
|
|
|
" key prefix in search.\n"
|
|
|
|
"InnoDB: ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, trx, index);
|
|
|
|
fprintf(stderr, ". Last data field length %lu bytes,\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: key ptr now exceeds"
|
|
|
|
" key end by %lu bytes.\n"
|
|
|
|
"InnoDB: Key value in the MySQL format:\n",
|
|
|
|
(ulong) data_field_len,
|
|
|
|
(ulong) (key_ptr - key_end));
|
2005-10-27 07:29:40 +00:00
|
|
|
fflush(stderr);
|
|
|
|
ut_print_buf(stderr, original_key_ptr, key_len);
|
2008-08-09 00:15:46 +00:00
|
|
|
putc('\n', stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (!is_null) {
|
2007-10-23 06:46:12 +00:00
|
|
|
ulint len = dfield_get_len(dfield);
|
|
|
|
dfield_set_len(dfield, len
|
|
|
|
- (ulint) (key_ptr - key_end));
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
n_fields++;
|
|
|
|
field++;
|
2005-10-27 07:29:40 +00:00
|
|
|
dfield++;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2012-09-04 14:33:56 +05:30
|
|
|
DBUG_EXECUTE_IF("innodb_srch_key_buffer_full",
|
|
|
|
ut_a(buf == (original_buf + buf_len)););
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(buf <= original_buf + buf_len);
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* We set the length of tuple to n_fields: we assume that the memory
|
2005-10-27 07:29:40 +00:00
|
|
|
area allocated for it is big enough (usually bigger than n_fields). */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
|
|
|
dtuple_set_n_fields(tuple, n_fields);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/**************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Stores the row id to the prebuilt struct. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_sel_store_row_id_to_prebuilt(
|
|
|
|
/*=============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
row_prebuilt_t* prebuilt, /*!< in/out: prebuilt */
|
|
|
|
const rec_t* index_rec, /*!< in: record */
|
|
|
|
const dict_index_t* index, /*!< in: index of the record */
|
|
|
|
const ulint* offsets) /*!< in: rec_get_offsets
|
2008-05-14 15:43:19 +00:00
|
|
|
(index_rec, index) */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2008-05-14 15:43:19 +00:00
|
|
|
const byte* data;
|
|
|
|
ulint len;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(rec_offs_validate(index_rec, index, offsets));
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
data = rec_get_nth_field(
|
|
|
|
index_rec, offsets,
|
|
|
|
dict_index_get_sys_col_pos(index, DATA_ROW_ID), &len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-05-30 09:04:57 +00:00
|
|
|
if (UNIV_UNLIKELY(len != DATA_ROW_ID_LEN)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Error: Row id field is"
|
|
|
|
" wrong length %lu in ", (ulong) len);
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, prebuilt->trx, index);
|
|
|
|
fprintf(stderr, "\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Field number %lu, record:\n",
|
2006-02-23 19:25:29 +00:00
|
|
|
(ulong) dict_index_get_sys_col_pos(index,
|
2006-08-29 09:30:31 +00:00
|
|
|
DATA_ROW_ID));
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print_new(stderr, index_rec, offsets);
|
|
|
|
putc('\n', stderr);
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_memcpy(prebuilt->row_id, data, len);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/**************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Stores a non-SQL-NULL field in the MySQL format. The counterpart of this
|
|
|
|
function is row_mysql_store_col_in_innobase_format() in row0mysql.c. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_sel_field_store_in_mysql_format(
|
|
|
|
/*================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
byte* dest, /*!< in/out: buffer where to store; NOTE
|
2008-01-11 19:59:47 +00:00
|
|
|
that BLOBs are not in themselves
|
|
|
|
stored here: the caller must allocate
|
|
|
|
and copy the BLOB into buffer before,
|
|
|
|
and pass the pointer to the BLOB in
|
|
|
|
'data' */
|
|
|
|
const mysql_row_templ_t* templ,
|
2009-05-25 06:46:10 +00:00
|
|
|
/*!< in: MySQL column template.
|
2008-01-11 19:59:47 +00:00
|
|
|
Its following fields are referenced:
|
|
|
|
type, is_unsigned, mysql_col_len,
|
|
|
|
mbminlen, mbmaxlen */
|
2009-05-25 06:46:10 +00:00
|
|
|
const byte* data, /*!< in: data to store */
|
|
|
|
ulint len) /*!< in: length of the data */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
byte* ptr;
|
|
|
|
|
|
|
|
ut_ad(len != UNIV_SQL_NULL);
|
2010-05-05 13:14:06 +03:00
|
|
|
UNIV_MEM_ASSERT_RW(data, len);
|
2011-08-10 12:25:24 +03:00
|
|
|
UNIV_MEM_ASSERT_W(dest, templ->mysql_col_len);
|
|
|
|
UNIV_MEM_INVALID(dest, templ->mysql_col_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-27 09:05:05 +00:00
|
|
|
switch (templ->type) {
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
const byte* field_end;
|
|
|
|
byte* pad;
|
2007-09-27 09:05:05 +00:00
|
|
|
case DATA_INT:
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Convert integer data from Innobase to a little-endian
|
|
|
|
format, sign bit restored to normal */
|
|
|
|
|
|
|
|
ptr = dest + len;
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
ptr--;
|
|
|
|
*ptr = *data;
|
|
|
|
if (ptr == dest) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
data++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!templ->is_unsigned) {
|
|
|
|
dest[len - 1] = (byte) (dest[len - 1] ^ 128);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(templ->mysql_col_len == len);
|
2007-09-27 09:05:05 +00:00
|
|
|
break;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-27 09:05:05 +00:00
|
|
|
case DATA_VARCHAR:
|
|
|
|
case DATA_VARMYSQL:
|
|
|
|
case DATA_BINARY:
|
2005-10-27 07:29:40 +00:00
|
|
|
field_end = dest + templ->mysql_col_len;
|
|
|
|
|
|
|
|
if (templ->mysql_type == DATA_MYSQL_TRUE_VARCHAR) {
|
|
|
|
/* This is a >= 5.0.3 type true VARCHAR. Store the
|
|
|
|
length of the data to the first byte or the first
|
|
|
|
two bytes of dest. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
dest = row_mysql_store_true_var_len(
|
|
|
|
dest, len, templ->mysql_length_bytes);
|
2011-08-10 12:25:24 +03:00
|
|
|
/* Copy the actual data. Leave the rest of the
|
|
|
|
buffer uninitialized. */
|
2011-08-10 12:58:22 +03:00
|
|
|
memcpy(dest, data, len);
|
|
|
|
break;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Copy the actual data */
|
|
|
|
ut_memcpy(dest, data, len);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2011-08-10 12:25:24 +03:00
|
|
|
/* Pad with trailing spaces. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
pad = dest + len;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(templ->mbminlen <= templ->mbmaxlen);
|
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
/* We treat some Unicode charset strings specially. */
|
|
|
|
switch (templ->mbminlen) {
|
|
|
|
case 4:
|
|
|
|
/* InnoDB should never have stripped partial
|
|
|
|
UTF-32 characters. */
|
|
|
|
ut_a(!(len & 3));
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
/* A space char is two bytes,
|
|
|
|
0x0020 in UCS2 and UTF-16 */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
if (UNIV_UNLIKELY(len & 1)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* A 0x20 has been stripped from the column.
|
|
|
|
Pad it back. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
if (pad < field_end) {
|
|
|
|
*pad++ = 0x20;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
|
|
|
|
row_mysql_pad_col(templ->mbminlen, pad, field_end - pad);
|
2007-09-27 09:05:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_BLOB:
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Store a pointer to the BLOB buffer to dest: the BLOB was
|
|
|
|
already copied to the buffer in row_sel_store_mysql_rec */
|
|
|
|
|
|
|
|
row_mysql_store_blob_ref(dest, templ->mysql_col_len, data,
|
2006-08-29 09:30:31 +00:00
|
|
|
len);
|
2007-09-27 09:05:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_MYSQL:
|
2005-10-27 07:29:40 +00:00
|
|
|
memcpy(dest, data, len);
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
ut_ad(templ->mysql_col_len >= len);
|
|
|
|
ut_ad(templ->mbmaxlen >= templ->mbminlen);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
ut_ad(templ->mbmaxlen > templ->mbminlen
|
2006-08-29 09:30:31 +00:00
|
|
|
|| templ->mysql_col_len == len);
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The following assertion would fail for old tables
|
|
|
|
containing UTF-8 ENUM columns due to Bug #9526. */
|
|
|
|
ut_ad(!templ->mbmaxlen
|
2006-08-29 09:30:31 +00:00
|
|
|
|| !(templ->mysql_col_len % templ->mbmaxlen));
|
2006-04-12 09:32:17 +00:00
|
|
|
ut_ad(len * templ->mbmaxlen >= templ->mysql_col_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
if (templ->mbminlen == 1 && templ->mbmaxlen != 1) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Pad with spaces. This undoes the stripping
|
Bug#52199 utf32: mbminlen=4, mbmaxlen=4, type->mbminlen=0, type->mbmaxlen=4
Merge and adjust a forgotten change to fix this bug.
rb://393 approved by Jimmy Yang
------------------------------------------------------------------------
r3794 | marko | 2009-01-07 14:14:53 +0000 (Wed, 07 Jan 2009) | 18 lines
branches/6.0: Allow the minimum length of a multi-byte character to be
up to 4 bytes. (Bug #35391)
dtype_t, dict_col_t: Replace mbminlen:2, mbmaxlen:3 with mbminmaxlen:5.
In this way, the 5 bits can hold two values of 0..4, and the storage size
of the fields will not cross the 64-bit boundary. Encode the values as
DATA_MBMAX * mbmaxlen + mbminlen. Define the auxiliary macros
DB_MBMINLEN(mbminmaxlen), DB_MBMAXLEN(mbminmaxlen), and
DB_MINMAXLEN(mbminlen, mbmaxlen).
Try to trim and pad UTF-16 and UTF-32 with spaces as appropriate.
Alexander Barkov suggested the use of cs->cset->fill(cs, buff, len, 0x20).
ha_innobase::store_key_val_for_row() now does that, but the added function
row_mysql_pad_col() does not, because it doesn't have the MySQL TABLE object.
rb://49 approved by Heikki Tuuri
------------------------------------------------------------------------
2010-06-29 14:32:48 +03:00
|
|
|
done in row0mysql.c, function
|
2005-10-27 07:29:40 +00:00
|
|
|
row_mysql_store_col_in_innobase_format(). */
|
|
|
|
|
|
|
|
memset(dest + len, 0x20, templ->mysql_col_len - len);
|
|
|
|
}
|
2007-09-27 09:05:05 +00:00
|
|
|
break;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-27 09:05:05 +00:00
|
|
|
default:
|
|
|
|
#ifdef UNIV_DEBUG
|
|
|
|
case DATA_SYS_CHILD:
|
|
|
|
case DATA_SYS:
|
|
|
|
/* These column types should never be shipped to MySQL. */
|
|
|
|
ut_ad(0);
|
|
|
|
|
|
|
|
case DATA_CHAR:
|
|
|
|
case DATA_FIXBINARY:
|
|
|
|
case DATA_FLOAT:
|
|
|
|
case DATA_DOUBLE:
|
|
|
|
case DATA_DECIMAL:
|
|
|
|
/* Above are the valid column types for MySQL data. */
|
|
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
ut_ad(templ->mysql_col_len == len);
|
2005-10-27 07:29:40 +00:00
|
|
|
memcpy(dest, data, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/**************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Convert a row in the Innobase format to a row in the MySQL format.
|
|
|
|
Note that the template in prebuilt may advise us to copy only a few
|
|
|
|
columns to mysql_rec, other columns are left blank. All columns may not
|
2009-05-25 06:46:10 +00:00
|
|
|
be needed in the query.
|
2010-06-29 16:19:07 +03:00
|
|
|
@return TRUE on success, FALSE if not all columns could be retrieved */
|
|
|
|
static __attribute__((warn_unused_result))
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
row_sel_store_mysql_rec(
|
|
|
|
/*====================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
byte* mysql_rec, /*!< out: row in the MySQL format */
|
|
|
|
row_prebuilt_t* prebuilt, /*!< in: prebuilt struct */
|
|
|
|
const rec_t* rec, /*!< in: Innobase record in the index
|
2005-10-27 07:29:40 +00:00
|
|
|
which was described in prebuilt's
|
2010-10-19 08:58:53 +03:00
|
|
|
template, or in the clustered index;
|
|
|
|
must be protected by a page latch */
|
2010-10-19 09:35:14 +03:00
|
|
|
ibool rec_clust, /*!< in: TRUE if rec is in the
|
|
|
|
clustered index instead of
|
|
|
|
prebuilt->index */
|
2009-05-25 06:46:10 +00:00
|
|
|
const ulint* offsets) /*!< in: array returned by
|
2010-10-19 08:58:53 +03:00
|
|
|
rec_get_offsets(rec) */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
2010-10-19 09:35:14 +03:00
|
|
|
mem_heap_t* extern_field_heap = NULL;
|
|
|
|
mem_heap_t* heap;
|
|
|
|
ulint i;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(prebuilt->mysql_template);
|
branches/innodb+: Merge revisions 3579:3599 from branches/zip:
------------------------------------------------------------------------
r3589 | marko | 2008-12-18 15:24:44 +0200 (Thu, 18 Dec 2008) | 2 lines
branches/zip: ha_innodb.cc: Do not include some unnecessary MySQL
header files.
------------------------------------------------------------------------
r3594 | marko | 2008-12-19 13:58:13 +0200 (Fri, 19 Dec 2008) | 4 lines
branches/zip: HASH_INSERT, HASH_DELETE: Add explicit type conversions,
so that the macros will expand to valid C++. Unlike C++, C allows
implicit type conversions from void* to other pointer types.
------------------------------------------------------------------------
r3597 | marko | 2008-12-22 12:27:16 +0200 (Mon, 22 Dec 2008) | 3 lines
branches/zip: Pass the caller's file name and line number to
row_mysql_lock_data_dictionary(), row_mysql_freeze_data_dictionary(),
to better track down locking issues that involve dict_operation_lock.
------------------------------------------------------------------------
r3599 | marko | 2008-12-22 15:41:47 +0200 (Mon, 22 Dec 2008) | 36 lines
branches/zip: Merge revisions 3479:3598 from branches/5.1:
------------------------------------------------------------------------
r3588 | inaam | 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) | 8 lines
branches/5.1
It is a bug in unused code. If we don't calculate the hash value when
calculating the mutex number then two pages which map to same hash
value can get two different mutex numbers.
Approved by: Marko
------------------------------------------------------------------------
r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
branches/5.1: When converting a record to MySQL format, copy the default
column values for columns that are SQL NULL. This addresses failures in
row-based replication (Bug #39648).
row_prebuilt_t: Add default_rec, for the default values of the columns in
MySQL format.
row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
padding columns.
rb://64 approved by Heikki Tuuri
------------------------------------------------------------------------
r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
branches/5.1: ibuf_delete_rec(): When the record cannot be found and
the tablespace has been dropped, commit the mini-transaction, so that
InnoDB will not hold the insert buffer tree latch in exclusive mode,
causing a potential deadlock. This bug was introduced in the fix of
Bug #27276 in r2924.
------------------------------------------------------------------------
------------------------------------------------------------------------
2008-12-22 14:02:10 +00:00
|
|
|
ut_ad(prebuilt->default_rec);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(rec_offs_validate(rec, NULL, offsets));
|
2010-10-19 08:58:53 +03:00
|
|
|
ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (UNIV_LIKELY_NULL(prebuilt->blob_heap)) {
|
|
|
|
mem_heap_free(prebuilt->blob_heap);
|
|
|
|
prebuilt->blob_heap = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < prebuilt->n_template; i++) {
|
|
|
|
|
2010-10-19 08:58:53 +03:00
|
|
|
const mysql_row_templ_t*templ = prebuilt->mysql_template + i;
|
2010-10-19 09:35:14 +03:00
|
|
|
const byte* data;
|
2010-10-19 08:58:53 +03:00
|
|
|
ulint len;
|
|
|
|
ulint field_no;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-10-19 08:58:53 +03:00
|
|
|
field_no = rec_clust
|
|
|
|
? templ->clust_rec_field_no : templ->rec_field_no;
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(rec_offs_nth_extern(offsets, field_no))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Copy an externally stored field to the temporary
|
|
|
|
heap */
|
|
|
|
|
|
|
|
ut_a(!prebuilt->trx->has_search_latch);
|
|
|
|
|
2006-06-13 20:23:26 +00:00
|
|
|
if (UNIV_UNLIKELY(templ->type == DATA_BLOB)) {
|
|
|
|
if (prebuilt->blob_heap == NULL) {
|
2006-09-19 10:14:07 +00:00
|
|
|
prebuilt->blob_heap = mem_heap_create(
|
|
|
|
UNIV_PAGE_SIZE);
|
2006-06-13 20:23:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
heap = prebuilt->blob_heap;
|
|
|
|
} else {
|
2006-08-29 09:30:31 +00:00
|
|
|
extern_field_heap
|
|
|
|
= mem_heap_create(UNIV_PAGE_SIZE);
|
2006-06-13 20:23:26 +00:00
|
|
|
|
|
|
|
heap = extern_field_heap;
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* NOTE: if we are retrieving a big BLOB, we may
|
|
|
|
already run out of memory in the next call, which
|
|
|
|
causes an assert */
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
data = btr_rec_copy_externally_stored_field(
|
|
|
|
rec, offsets,
|
|
|
|
dict_table_zip_size(prebuilt->table),
|
2010-10-19 09:35:14 +03:00
|
|
|
field_no, &len, heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-06-29 16:19:07 +03:00
|
|
|
if (UNIV_UNLIKELY(!data)) {
|
|
|
|
/* The externally stored field
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
was not written yet. This
|
2010-06-29 16:19:07 +03:00
|
|
|
record should only be seen by
|
|
|
|
recv_recovery_rollback_active()
|
|
|
|
or any TRX_ISO_READ_UNCOMMITTED
|
|
|
|
transactions. */
|
|
|
|
|
|
|
|
if (extern_field_heap) {
|
|
|
|
mem_heap_free(extern_field_heap);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(len != UNIV_SQL_NULL);
|
2006-05-22 09:30:34 +00:00
|
|
|
} else {
|
|
|
|
/* Field is stored in the row. */
|
|
|
|
|
2010-10-19 08:58:53 +03:00
|
|
|
data = rec_get_nth_field(rec, offsets, field_no, &len);
|
2008-05-14 15:43:19 +00:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(templ->type == DATA_BLOB)
|
|
|
|
&& len != UNIV_SQL_NULL) {
|
|
|
|
|
|
|
|
/* It is a BLOB field locally stored in the
|
|
|
|
InnoDB record: we MUST copy its contents to
|
|
|
|
prebuilt->blob_heap here because later code
|
|
|
|
assumes all BLOB values have been copied to a
|
|
|
|
safe place. */
|
|
|
|
|
|
|
|
if (prebuilt->blob_heap == NULL) {
|
|
|
|
prebuilt->blob_heap = mem_heap_create(
|
|
|
|
UNIV_PAGE_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
data = memcpy(mem_heap_alloc(
|
|
|
|
prebuilt->blob_heap, len),
|
|
|
|
data, len);
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
2006-09-19 10:14:07 +00:00
|
|
|
row_sel_field_store_in_mysql_format(
|
|
|
|
mysql_rec + templ->mysql_col_offset,
|
|
|
|
templ, data, len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Cleanup */
|
|
|
|
if (extern_field_heap) {
|
2006-02-23 19:25:29 +00:00
|
|
|
mem_heap_free(extern_field_heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
extern_field_heap = NULL;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (templ->mysql_null_bit_mask) {
|
|
|
|
/* It is a nullable column with a non-NULL
|
|
|
|
value */
|
2006-08-29 09:30:31 +00:00
|
|
|
mysql_rec[templ->mysql_null_byte_offset]
|
|
|
|
&= ~(byte) templ->mysql_null_bit_mask;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
} else {
|
branches/innodb+: Merge revisions 3579:3599 from branches/zip:
------------------------------------------------------------------------
r3589 | marko | 2008-12-18 15:24:44 +0200 (Thu, 18 Dec 2008) | 2 lines
branches/zip: ha_innodb.cc: Do not include some unnecessary MySQL
header files.
------------------------------------------------------------------------
r3594 | marko | 2008-12-19 13:58:13 +0200 (Fri, 19 Dec 2008) | 4 lines
branches/zip: HASH_INSERT, HASH_DELETE: Add explicit type conversions,
so that the macros will expand to valid C++. Unlike C++, C allows
implicit type conversions from void* to other pointer types.
------------------------------------------------------------------------
r3597 | marko | 2008-12-22 12:27:16 +0200 (Mon, 22 Dec 2008) | 3 lines
branches/zip: Pass the caller's file name and line number to
row_mysql_lock_data_dictionary(), row_mysql_freeze_data_dictionary(),
to better track down locking issues that involve dict_operation_lock.
------------------------------------------------------------------------
r3599 | marko | 2008-12-22 15:41:47 +0200 (Mon, 22 Dec 2008) | 36 lines
branches/zip: Merge revisions 3479:3598 from branches/5.1:
------------------------------------------------------------------------
r3588 | inaam | 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) | 8 lines
branches/5.1
It is a bug in unused code. If we don't calculate the hash value when
calculating the mutex number then two pages which map to same hash
value can get two different mutex numbers.
Approved by: Marko
------------------------------------------------------------------------
r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
branches/5.1: When converting a record to MySQL format, copy the default
column values for columns that are SQL NULL. This addresses failures in
row-based replication (Bug #39648).
row_prebuilt_t: Add default_rec, for the default values of the columns in
MySQL format.
row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
padding columns.
rb://64 approved by Heikki Tuuri
------------------------------------------------------------------------
r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
branches/5.1: ibuf_delete_rec(): When the record cannot be found and
the tablespace has been dropped, commit the mini-transaction, so that
InnoDB will not hold the insert buffer tree latch in exclusive mode,
causing a potential deadlock. This bug was introduced in the fix of
Bug #27276 in r2924.
------------------------------------------------------------------------
------------------------------------------------------------------------
2008-12-22 14:02:10 +00:00
|
|
|
/* MySQL assumes that the field for an SQL
|
|
|
|
NULL value is set to the default value. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-05-05 13:14:06 +03:00
|
|
|
UNIV_MEM_ASSERT_RW(prebuilt->default_rec
|
|
|
|
+ templ->mysql_col_offset,
|
|
|
|
templ->mysql_col_len);
|
2006-08-29 09:30:31 +00:00
|
|
|
mysql_rec[templ->mysql_null_byte_offset]
|
|
|
|
|= (byte) templ->mysql_null_bit_mask;
|
branches/innodb+: Merge revisions 3579:3599 from branches/zip:
------------------------------------------------------------------------
r3589 | marko | 2008-12-18 15:24:44 +0200 (Thu, 18 Dec 2008) | 2 lines
branches/zip: ha_innodb.cc: Do not include some unnecessary MySQL
header files.
------------------------------------------------------------------------
r3594 | marko | 2008-12-19 13:58:13 +0200 (Fri, 19 Dec 2008) | 4 lines
branches/zip: HASH_INSERT, HASH_DELETE: Add explicit type conversions,
so that the macros will expand to valid C++. Unlike C++, C allows
implicit type conversions from void* to other pointer types.
------------------------------------------------------------------------
r3597 | marko | 2008-12-22 12:27:16 +0200 (Mon, 22 Dec 2008) | 3 lines
branches/zip: Pass the caller's file name and line number to
row_mysql_lock_data_dictionary(), row_mysql_freeze_data_dictionary(),
to better track down locking issues that involve dict_operation_lock.
------------------------------------------------------------------------
r3599 | marko | 2008-12-22 15:41:47 +0200 (Mon, 22 Dec 2008) | 36 lines
branches/zip: Merge revisions 3479:3598 from branches/5.1:
------------------------------------------------------------------------
r3588 | inaam | 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) | 8 lines
branches/5.1
It is a bug in unused code. If we don't calculate the hash value when
calculating the mutex number then two pages which map to same hash
value can get two different mutex numbers.
Approved by: Marko
------------------------------------------------------------------------
r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
branches/5.1: When converting a record to MySQL format, copy the default
column values for columns that are SQL NULL. This addresses failures in
row-based replication (Bug #39648).
row_prebuilt_t: Add default_rec, for the default values of the columns in
MySQL format.
row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
padding columns.
rb://64 approved by Heikki Tuuri
------------------------------------------------------------------------
r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
branches/5.1: ibuf_delete_rec(): When the record cannot be found and
the tablespace has been dropped, commit the mini-transaction, so that
InnoDB will not hold the insert buffer tree latch in exclusive mode,
causing a potential deadlock. This bug was introduced in the fix of
Bug #27276 in r2924.
------------------------------------------------------------------------
------------------------------------------------------------------------
2008-12-22 14:02:10 +00:00
|
|
|
memcpy(mysql_rec + templ->mysql_col_offset,
|
branches/innodb+: Merge revisions 5144:5524 from branches/zip
------------------------------------------------------------------------
r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line
branches/zip: ibuf0ibuf.c: Improve a comment.
------------------------------------------------------------------------
r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines
branches/zip: Merge revisions 4994:5148 from branches/5.1:
------------------------------------------------------------------------
r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Non-functional change: move FSP_* macros from fsp0fsp.h to a new file
fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE
in mtr0log.ic.
------------------------------------------------------------------------
r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines
branches/5.1:
Preparation for the fix of
Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h
and include fsp0fsp.h just before it is needed. This is needed in order
to be able to use TRX_SYS_SPACE in mtr0log.ic.
------------------------------------------------------------------------
r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines
branches/5.1:
Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages
Do not write redo log for the pages in the doublewrite buffer. Also, do not
make a dummy change to the page because this is not needed.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types.
------------------------------------------------------------------------
r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line
branches/zip: Correct a debug assertion that was added in r5125.
------------------------------------------------------------------------
r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines
branches/zip: Clean up some comments.
Make the rec parameter of mlog_open_and_write_index() const.
------------------------------------------------------------------------
r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines
branches/zip: Merge revisions 5148:5233 from branches/5.1:
------------------------------------------------------------------------
r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines
branches/5.1:
Whitespace fixup.
------------------------------------------------------------------------
r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines
branches/5.1:
Merge a change from MySQL (this fixes the failing innodb_mysql test):
------------------------------------------------------------
revno: 1810.3894.10
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-05-19 11:32:21 +0500
message:
Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
Suggested fix is to add '\'' symbol check for quotation condition
(dict_strip_comments() function).
modified:
innobase/dict/dict0dict.c
mysql-test/r/innodb_mysql.result
mysql-test/t/innodb_mysql.test
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
------------------------------------------------------------------------
r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add Doxygen comments to the rest of buf0*.
------------------------------------------------------------------------
r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Replace <= in a function comment.
------------------------------------------------------------------------
r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line
branches/zip: Add missing Doxygen comments for page0zip.
------------------------------------------------------------------------
r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines
branches/zip:
Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern)
The changes are:
1) Take into account access pattern when deciding whether or not to do linear
read ahead.
2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic,
global to control linear read ahead behvior
3) Disable random read ahead. Keep the code for now.
Submitted by: Inaam (rb://122)
Approved by: Heikki (rb://122)
------------------------------------------------------------------------
r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines
branches/zip:
Enable functionality to have multiple background io helper threads.
This patch is based on percona contributions.
More details about this patch will be written at:
https://svn.innodb.com/innobase/MultipleBackgroundThreads
The patch essentially does the following:
expose following knobs:
innodb_read_io_threads = [1 - 64] default 1
innodb_write_io_threads = [1 - 64] default 1
deprecate innodb_file_io_threads (this parameter was relevant only on windows)
Internally it allows multiple segments for read and write IO request arrays
where one thread works on one segement.
Submitted by: Inaam (rb://124)
Approved by: Heikki (rb://124)
------------------------------------------------------------------------
r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Whitespace cleanup.
------------------------------------------------------------------------
r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5261.
------------------------------------------------------------------------
r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5262.
------------------------------------------------------------------------
r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines
branches/zip
Non functional change:
Added legal notices acknowledging percona contribution to the multiple
IO helper threads patch i.e.: r5262
------------------------------------------------------------------------
r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines
branches/zip
rb://130
Enable Group Commit functionality that was broken in 5.0 when
distributed transactions were introduced.
Reviewed by: Heikki
------------------------------------------------------------------------
r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines
branches/zip: Declare os_thread_id_t as unsigned long,
because ulint is wrong on Win64.
Pointed out by Vladislav Vaintroub <wlad@sun.com>.
------------------------------------------------------------------------
r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines
branches/zip rb://131
This patch changes the following defaults:
max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99
additional_mem_pool_size: default from 1 to 8 MB
buffer_pool_size: default from 8 to 128 MB
log_buffer_size: default from 1 to 8 MB
read_io_threads/write_io_threads: default from 1 to 4
The log file sizes are untouched because of upgrade issues
Reviewed by: Heikki
------------------------------------------------------------------------
r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting
buf_pool->n_pend_unzip while only holding buf_pool_mutex.
------------------------------------------------------------------------
r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call.
The function must switch on the block state anyway.
------------------------------------------------------------------------
r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5283 and r5320.
------------------------------------------------------------------------
r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line
branches/zip: buf_page_io_query(): Remove unused function.
------------------------------------------------------------------------
r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines
branches/zip: innodb.test: Adjust the tolerance of
innodb_buffer_pool_pages_total for r5320.
------------------------------------------------------------------------
r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines
branches/zip: Merge revisions 5233:5341 from branches/5.1:
------------------------------------------------------------------------
r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines
branches/5.1: Merge the test case from r5232 from branches/5.0:
------------------------------------------------------------------------
r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
(Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
Also, add a test case for Bug #40565.
rb://128 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
the bug fix we would assert on missing autoinc columns. With this fix we allow
MySQL to open the table but set the next autoinc value for the column to the
MAX value. This effectively disables the next value generation. INSERTs will
fail with a generic AUTOINC failure. However, the user should be able to
read/dump the table, set the column values explicitly, use ALTER TABLE to
set the next autoinc value and/or sync the two data dictionaries to resume
normal operations.
Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
index (PRIMARY)
rb://118
------------------------------------------------------------------------
r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
branches/5.1: The version of the result file checked in was broken in r5243.
------------------------------------------------------------------------
r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
branches/5.1:
Remove the word "Error" from the printout because the mysqltest suite
interprets it as an error and thus the innodb-autoinc test fails.
Approved by: Sunny (via IM)
------------------------------------------------------------------------
r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines
branches/5.1: Add missing #include "mtr0log.h" so that the code compiles
with -DUNIV_MUST_NOT_INLINE.
(null merge; this had already been committed in branches/zip)
------------------------------------------------------------------------
r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines
branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown,
refuse to unlock the record.
(Bug #45357, caused by the fix of Bug #39320).
rb://132 approved by Sunny Bains.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r5342.
------------------------------------------------------------------------
r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line
branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426)
------------------------------------------------------------------------
r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines
branches/zip: buf_page_get_zip(): Fix a bogus warning about
block_mutex being possibly uninitialized.
------------------------------------------------------------------------
r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: ha_innobase::check_if_incompatible_data(): When
ROW_FORMAT=DEFAULT, do not compare to get_row_type().
Without this change, fast index creation will be disabled
in recent versions of MySQL 5.1.
------------------------------------------------------------------------
r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Minor changes for Hot Backup to build correctly. (The
code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines
branches/zip: Add functions for checking the format of tablespaces
for Hot Backup build (UNIV_HOTBACKUP defined).
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines
branches/zip: change the header file path.
Change the header file path from ../storage/innobase/include/
to ../include/. In the planned 5.1 + plugin release, the source
directory of the plugin will not be in storage/innobase.
Approved by: Heikki (IM)
------------------------------------------------------------------------
r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines
branches/zip: remove relative path of header files.
Suggested by Marko.
------------------------------------------------------------------------
r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290.
------------------------------------------------------------------------
r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines
branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch.
This addresses Bug #44571 but does not fix it.
rb://135 approved by Sunny Bains.
------------------------------------------------------------------------
r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line
branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment.
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines
branches/zip: Fix typos.
------------------------------------------------------------------------
r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines
branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index():
Start prebuilt->trx before locking the table. This should fix Issue #293
and could fix Issue #229.
Approved by Sunny (over IM).
------------------------------------------------------------------------
r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines
branches/zip: buf_page_get_gen(): Fix a race condition when reading
buf_fix_count. This could explain Issue #156.
Tested by Michael.
------------------------------------------------------------------------
r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines
branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages():
Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED).
buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)).
Issue #289, rb://136 approved by Sunny Bains
------------------------------------------------------------------------
r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast.
Do not do arithmetics on void pointers.
------------------------------------------------------------------------
r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines
branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT
or SET GLOBAL innodb_file_format_check=DEFAULT.
innodb_file_format.test: New test for innodb_file_format and
innodb_file_format_check.
innodb_file_format_name_validate(): Store the string in *save.
innodb_file_format_name_update(): Check the string again.
innodb_file_format_check_validate(): Store the string in *save.
innodb_file_format_check_update(): Check the string again.
Issue #282, rb://140 approved by Heikki Tuuri
------------------------------------------------------------------------
r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines
branches/zip: lock_rec_validate_page(): Add another assertion
to track down Issue #289.
------------------------------------------------------------------------
r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line
branches/zip: Revert an accidentally made change in r5430 to univ.i.
------------------------------------------------------------------------
r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: ibuf_dummy_index_free(): Beautify the comment.
------------------------------------------------------------------------
r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: fseg_free(): Remove this unused function.
------------------------------------------------------------------------
r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG.
This function is unused, but it could turn out to be a useful debugging aid.
------------------------------------------------------------------------
r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: ha_delete(): Remove this unused function that was
very similar to ha_search_and_delete_if_found().
------------------------------------------------------------------------
r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove.
------------------------------------------------------------------------
r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_event_create_auto(): Unused, remove.
------------------------------------------------------------------------
r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: que_graph_try_free(): Unused, remove.
------------------------------------------------------------------------
r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: row_build_row_ref_from_row(): Unused, remove.
------------------------------------------------------------------------
r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove.
------------------------------------------------------------------------
r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: srv_que_task_queue_check(): Unused, remove.
------------------------------------------------------------------------
r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: mem_heap_cat(): Unused, remove.
------------------------------------------------------------------------
r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql():
Invoke os_get_os_version() at most once.
------------------------------------------------------------------------
r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_file_close_no_error_handling(): Unused, remove.
------------------------------------------------------------------------
r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: page_set_max_trx_id(): Make the code compile
with UNIV_HOTBACKUP.
------------------------------------------------------------------------
r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: os_file_close_no_error_handling(): Restore,
as this function is used within InnoDB Hot Backup.
------------------------------------------------------------------------
r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line
branches/zip: os_process_set_priority_boost(): Unused, remove.
------------------------------------------------------------------------
r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines
branches/zip: Replace a non-ASCII character
(ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute.
------------------------------------------------------------------------
r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines
branches/zip
Non functional change. s/Percona/Percona Inc./
------------------------------------------------------------------------
r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines
branches/zip:
Use PAUSE instruction inside spinloop if it is available.
The patch was originally developed by Mikael Ronstrom <mikael@mysql.com>
and can be found here:
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799
http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800
Approved by: Heikki (rb://137)
------------------------------------------------------------------------
r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines
branches/zip:
Remove unnecessary quotes and simplify plug.in.
------------------------------------------------------------------------
r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines
branches/zip: add COPYING files for Percona and Sun Micro.
1.0.4 contains patches based on contributions from Percona
and Sun Microsystems.
------------------------------------------------------------------------
r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines
branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake.
Windows will support PAUSE instruction by default.
------------------------------------------------------------------------
r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines
branches/zip rb://126
Based on contribution from Google Inc.
This patch introduces a new parameter innodb_io_capacity to control the
rate at which master threads performs various tasks. The default value
is 200 and higher values imply more aggressive flushing and ibuf merges
from within the master thread.
This patch also changes the ibuf merge from synchronous to asynchronous.
Another minor change is not to force the master thread to wait for a
log flush to complete every second.
Approved by: Heikki
------------------------------------------------------------------------
r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines
branches/zip rb://138
The current implementation is to try to flush the neighbors of every
page that we flush. This patch makes the following distinction:
1) If the flush is from flush_list AND
2) If the flush is intended to move the oldest_modification LSN ahead
(this happens when a user thread sees little space in the log file and
attempts to flush pages from the buffer pool so that a checkpoint can
be made)
THEN
Do not try to flush the neighbors. Just focus on flushing dirty pages at
the end of flush_list
Approved by: Heikki
------------------------------------------------------------------------
r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines
branches/zip rb://133
This patch introduces heuristics based flushing rate of dirty pages to
avoid IO bursts at checkpoint.
1) log_capacity / log_generated per second gives us number of seconds
in which ALL dirty pages need to be flushed. Based on this rough
assumption we can say that
n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate
2) We use weighted averages (hard coded to 20 seconds) of
log_generation_rate to avoid resonance.
3) From the desired_flush_rate we subtract the number of pages that have
been flushed due to LRU flushing. That gives us pages that we should
flush as part of flush_list cleanup. And that is the number (capped by
maximum io_capacity) that we try to flush from the master thread.
Knobs:
======
innodb_adaptive_flushing: boolean, global, dynamic, default TRUE.
Since this heuristic is very experimental and has the potential to
dramatically change the IO pattern I think it is a good idea to leave a
knob to turn it off.
Approved by: Heikki
------------------------------------------------------------------------
r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines
branches/zip: fix PAUSE instruction patch on Windows
The original PAUSE instruction patch (r5470) does not
compile on Windows. Also, there is an elegant way of
doing it on Windows - YieldProcessor().
Approved by: Heikki (on IM)
------------------------------------------------------------------------
r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines
branches/zip:
Change the defaults for
innodb_sync_spin_loops: 20 -> 30
innodb_spin_wait_delay: 5 -> 6
This change was proposed by Sun/MySQL based on their performance testing,
see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4
------------------------------------------------------------------------
r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entry for 5489.
------------------------------------------------------------------------
r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines
branches/zip: add copyright info to files related to PAUSE
instruction patch, contributed by Sun Microsystems.
------------------------------------------------------------------------
r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines
branches/zip: add ChangeLog entries for r5484-r5486.
------------------------------------------------------------------------
r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines
branches/zip:
Restore the original value of innodb_sync_spin_loops at the end, previously
the test assumed that setting it to 20 will do this, but now the default is
30 and MTR's internal check failed.
------------------------------------------------------------------------
r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines
branches/zip rb://138 (REVERT)
Revert the flush neighbors patch as it shows regression in
the benchmarks run by Michael.
------------------------------------------------------------------------
r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines
branches/zip
Fixed warnings on windows where ulint != ib_uint64_t
------------------------------------------------------------------------
r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines
branches/zip: fix run-time symbols clash on Solaris.
This patch is from Sergey Vojtovich of Sun Microsystems,
to fix run-time symbols clash on Solaris with older C++
compiler:
- when finding out a way to hide symbols, make decision basing
on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
purpose.
------------------------------------------------------------------------
r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines
branches/zip: Merge r5341:5497 from branches/5.1, skipping:
c5419 because it is merge from branches/zip into branches/5.1
c5466 because the source code has been adjusted to match the MySQL
behavior and the innodb-autoinc test does not fail in branches/zip,
if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested
not to merge c5466.
and resolving conflicts in c5410, c5440, c5488:
------------------------------------------------------------------------
r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines
Changed paths:
M /branches/5.1/include/trx0sys.ic
M /branches/5.1/trx/trx0purge.c
M /branches/5.1/trx/trx0sys.c
M /branches/5.1/trx/trx0undo.c
branches/5.1: Add missing #include "mtr0log.h" to avoid warnings
when compiling with -DUNIV_MUST_NOT_INLINE.
------------------------------------------------------------------------
r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result
M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test
M /branches/5.1/mysql-test/innodb_bug42101.result
M /branches/5.1/mysql-test/innodb_bug42101.test
branches/5.1: Merge r5418 from branches/zip:
------------------------------------------------------------------------
r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
branches/zip: Fix a race condition caused by
SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749)
When innodb_commit_concurrency is initially set nonzero,
DEFAULT would change it back to 0, triggering Bug #42101.
rb://139 approved by Heikki Tuuri.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines
Changed paths:
M /branches/5.1/fil/fil0fil.c
branches/5.1:
Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation
by changing the URL from
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to
http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html
------------------------------------------------------------------------
r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Adjust the failing innodb-autoinc test to conform to the latest behavior
of the MySQL code. The idea and the comment in innodb-autoinc.test come
from Sunny.
------------------------------------------------------------------------
r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
A /branches/5.1/mysql-test/innodb_bug21704.result
A /branches/5.1/mysql-test/innodb_bug21704.test
branches/5.1:
Fix Bug#21704 Renaming column does not update FK definition
by checking whether a column that participates in a FK definition is being
renamed and denying the ALTER in this case.
The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>:
http://lists.mysql.com/commits/77714
and was later adjusted to conform to InnoDB coding style by me (Vasil),
I also added some more comments and moved the bug specific mysql-test to
a separate file to make it more manageable and flexible.
------------------------------------------------------------------------
------------------------------------------------------------------------
r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: add a missing file in Makefile.am
This change was suggested by MySQL.
------------------------------------------------------------------------
r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines
branches/zip: minor change
Remove an extra "with".
------------------------------------------------------------------------
r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines
branches/zip:
Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h
header file that is eventually used by mysqld.
------------------------------------------------------------------------
r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines
branches/zip:
Add include/ut0auxconf.h to noinst_HEADERS
------------------------------------------------------------------------
r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines
branches/zip:
Non-functional change:
put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort
alphabetically, so it is easier to find if a file is there or not and
also diffs show exactly the added or removed file instead of surrounding
lines too.
------------------------------------------------------------------------
r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines
branches/zip: fix compile errors on Win64
Both srv_read_ahead_factor and srv_io_capacity should
be defined as ulong.
Approved by: Sunny
------------------------------------------------------------------------
r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines
branches/zip: Support inlining of functions and prefetch with
Sun Studio
Those changes are contributed by Sun/MySQL. Two sets of changes
in this patch when Sun Studio is used:
- Explicit inlining of functions
- Prefetch Support
This patch has been tested by Sunny with the plugin statically
built in. Since we've never built the plugin as a dynamically
loaded module on Solaris, it is a separate task to change
plug.in.
rb://142
Approved by: Heikki
------------------------------------------------------------------------
r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines
branches/zip: add ChangeLog entry for r5508.
------------------------------------------------------------------------
r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Remove unused extern ref to timed_mutexes.
------------------------------------------------------------------------
r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Undo r5512
------------------------------------------------------------------------
r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines
branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined.
------------------------------------------------------------------------
r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines
branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup.
------------------------------------------------------------------------
r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip: Make this file usable from within HotBackup. A new file has
been introduced called hb_univ.i. This file should have all the HotBackup
specific configuration.
------------------------------------------------------------------------
r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines
Add /* UNIV_HOTBACK */
------------------------------------------------------------------------
r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines
branches/zip: Merge r5497:5518 from branches/5.1:
------------------------------------------------------------------------
r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2874.2.1
committer: Anurag Shekhar <anurag.shekhar@sun.com>
branch nick: mysql-5.1-bugteam-windows-warning
timestamp: Wed 2009-05-13 15:41:24 +0530
message:
Bug #39802 On Windows, 32-bit time_t should be enforced
This patch fixes compilation warning, "conversion from 'time_t' to 'ulong',
possible loss of data".
The fix is to typecast time_t to ulong before assigning it to ulong.
Backported this from 6.0-bugteam tree.
modified:
storage/archive/ha_archive.cc
storage/federated/ha_federated.cc
storage/innobase/handler/ha_innodb.cc
storage/myisam/ha_myisam.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines
branches/zip:
Add ChangeLog entries for r5498 and r5519.
------------------------------------------------------------------------
r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines
branches/zip
Change the read ahead parameter name to innodb_read_ahead_threshold.
Change the meaning of this parameter to signify the number of pages
that must be sequentially accessed for InnoDB to trigger a readahead
request.
Suggested by: Ken
------------------------------------------------------------------------
2009-07-21 00:09:29 +00:00
|
|
|
(const byte*) prebuilt->default_rec
|
|
|
|
+ templ->mysql_col_offset,
|
branches/innodb+: Merge revisions 3579:3599 from branches/zip:
------------------------------------------------------------------------
r3589 | marko | 2008-12-18 15:24:44 +0200 (Thu, 18 Dec 2008) | 2 lines
branches/zip: ha_innodb.cc: Do not include some unnecessary MySQL
header files.
------------------------------------------------------------------------
r3594 | marko | 2008-12-19 13:58:13 +0200 (Fri, 19 Dec 2008) | 4 lines
branches/zip: HASH_INSERT, HASH_DELETE: Add explicit type conversions,
so that the macros will expand to valid C++. Unlike C++, C allows
implicit type conversions from void* to other pointer types.
------------------------------------------------------------------------
r3597 | marko | 2008-12-22 12:27:16 +0200 (Mon, 22 Dec 2008) | 3 lines
branches/zip: Pass the caller's file name and line number to
row_mysql_lock_data_dictionary(), row_mysql_freeze_data_dictionary(),
to better track down locking issues that involve dict_operation_lock.
------------------------------------------------------------------------
r3599 | marko | 2008-12-22 15:41:47 +0200 (Mon, 22 Dec 2008) | 36 lines
branches/zip: Merge revisions 3479:3598 from branches/5.1:
------------------------------------------------------------------------
r3588 | inaam | 2008-12-18 14:26:54 +0200 (Thu, 18 Dec 2008) | 8 lines
branches/5.1
It is a bug in unused code. If we don't calculate the hash value when
calculating the mutex number then two pages which map to same hash
value can get two different mutex numbers.
Approved by: Marko
------------------------------------------------------------------------
r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
branches/5.1: When converting a record to MySQL format, copy the default
column values for columns that are SQL NULL. This addresses failures in
row-based replication (Bug #39648).
row_prebuilt_t: Add default_rec, for the default values of the columns in
MySQL format.
row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
padding columns.
rb://64 approved by Heikki Tuuri
------------------------------------------------------------------------
r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
branches/5.1: ibuf_delete_rec(): When the record cannot be found and
the tablespace has been dropped, commit the mini-transaction, so that
InnoDB will not hold the insert buffer tree latch in exclusive mode,
causing a potential deadlock. This bug was introduced in the fix of
Bug #27276 in r2924.
------------------------------------------------------------------------
------------------------------------------------------------------------
2008-12-22 14:02:10 +00:00
|
|
|
templ->mysql_col_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Builds a previous version of a clustered index record for a consistent read
|
|
|
|
@return DB_SUCCESS or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_build_prev_vers_for_mysql(
|
|
|
|
/*==============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
read_view_t* read_view, /*!< in: read view */
|
|
|
|
dict_index_t* clust_index, /*!< in: clustered index */
|
|
|
|
row_prebuilt_t* prebuilt, /*!< in: prebuilt struct */
|
|
|
|
const rec_t* rec, /*!< in: record in a clustered index */
|
|
|
|
ulint** offsets, /*!< in/out: offsets returned by
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_get_offsets(rec, clust_index) */
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t** offset_heap, /*!< in/out: memory heap from which
|
2005-10-27 07:29:40 +00:00
|
|
|
the offsets are allocated */
|
2009-05-25 06:46:10 +00:00
|
|
|
rec_t** old_vers, /*!< out: old version, or NULL if the
|
2005-10-27 07:29:40 +00:00
|
|
|
record does not exist in the view:
|
|
|
|
i.e., it was freshly inserted
|
|
|
|
afterwards */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint err;
|
|
|
|
|
|
|
|
if (prebuilt->old_vers_heap) {
|
|
|
|
mem_heap_empty(prebuilt->old_vers_heap);
|
|
|
|
} else {
|
|
|
|
prebuilt->old_vers_heap = mem_heap_create(200);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_vers_build_for_consistent_read(
|
|
|
|
rec, mtr, clust_index, offsets, read_view, offset_heap,
|
|
|
|
prebuilt->old_vers_heap, old_vers);
|
2005-10-27 07:29:40 +00:00
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Retrieves the clustered index record corresponding to a record in a
|
|
|
|
non-clustered index. Does the necessary locking. Used in the MySQL
|
2009-05-25 06:46:10 +00:00
|
|
|
interface.
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
@return DB_SUCCESS, DB_SUCCESS_LOCKED_REC, or error code */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
enum db_err
|
2005-10-27 07:29:40 +00:00
|
|
|
row_sel_get_clust_rec_for_mysql(
|
|
|
|
/*============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
row_prebuilt_t* prebuilt,/*!< in: prebuilt struct in the handle */
|
|
|
|
dict_index_t* sec_index,/*!< in: secondary index where rec resides */
|
|
|
|
const rec_t* rec, /*!< in: record in a non-clustered index; if
|
2005-10-27 07:29:40 +00:00
|
|
|
this is a locking read, then rec is not
|
|
|
|
allowed to be delete-marked, and that would
|
|
|
|
not make sense either */
|
2009-05-25 06:46:10 +00:00
|
|
|
que_thr_t* thr, /*!< in: query thread */
|
|
|
|
const rec_t** out_rec,/*!< out: clustered record or an old version of
|
2005-10-27 07:29:40 +00:00
|
|
|
it, NULL if the old version did not exist
|
|
|
|
in the read view, i.e., it was a fresh
|
|
|
|
inserted version */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint** offsets,/*!< in: offsets returned by
|
2007-09-25 07:20:56 +00:00
|
|
|
rec_get_offsets(rec, sec_index);
|
|
|
|
out: offsets returned by
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_get_offsets(out_rec, clust_index) */
|
2009-05-25 06:46:10 +00:00
|
|
|
mem_heap_t** offset_heap,/*!< in/out: memory heap from which
|
2005-10-27 07:29:40 +00:00
|
|
|
the offsets are allocated */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr used to get access to the
|
2005-10-27 07:29:40 +00:00
|
|
|
non-clustered record; the same mtr is used to
|
|
|
|
access the clustered index */
|
|
|
|
{
|
|
|
|
dict_index_t* clust_index;
|
2008-05-14 15:43:19 +00:00
|
|
|
const rec_t* clust_rec;
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_t* old_vers;
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
enum db_err err;
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_t* trx;
|
|
|
|
|
|
|
|
*out_rec = NULL;
|
|
|
|
trx = thr_get_trx(thr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-09-25 07:20:56 +00:00
|
|
|
row_build_row_ref_in_tuple(prebuilt->clust_ref, rec,
|
|
|
|
sec_index, *offsets, trx);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
clust_index = dict_table_get_first_index(sec_index->table);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_open_with_no_init(clust_index, prebuilt->clust_ref,
|
2006-08-29 09:30:31 +00:00
|
|
|
PAGE_CUR_LE, BTR_SEARCH_LEAF,
|
2011-12-29 16:12:55 +02:00
|
|
|
&prebuilt->clust_pcur, 0, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2011-12-29 16:12:55 +02:00
|
|
|
clust_rec = btr_pcur_get_rec(&prebuilt->clust_pcur);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2011-12-29 16:12:55 +02:00
|
|
|
prebuilt->clust_pcur.trx_if_known = trx;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Note: only if the search ends up on a non-infimum record is the
|
|
|
|
low_match value the real match to the search tuple */
|
|
|
|
|
|
|
|
if (!page_rec_is_user_rec(clust_rec)
|
2011-12-29 16:12:55 +02:00
|
|
|
|| btr_pcur_get_low_match(&prebuilt->clust_pcur)
|
2006-08-29 09:30:31 +00:00
|
|
|
< dict_index_get_n_unique(clust_index)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* In a rare case it is possible that no clust rec is found
|
|
|
|
for a delete-marked secondary index record: if in row0umod.c
|
|
|
|
in row_undo_mod_remove_clust_low() we have already removed
|
|
|
|
the clust rec, while purge is still cleaning and removing
|
|
|
|
secondary index records associated with earlier versions of
|
|
|
|
the clustered index record. In that case we know that the
|
|
|
|
clustered index record did not exist in the read view of
|
|
|
|
trx. */
|
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (!rec_get_deleted_flag(rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
dict_table_is_comp(sec_index->table))
|
|
|
|
|| prebuilt->select_lock_type != LOCK_NONE) {
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_print_timestamp(stderr);
|
2006-02-27 09:33:26 +00:00
|
|
|
fputs(" InnoDB: error clustered record"
|
2006-08-29 09:30:31 +00:00
|
|
|
" for sec rec not found\n"
|
|
|
|
"InnoDB: ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, trx, sec_index);
|
|
|
|
fputs("\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: sec index record ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print(stderr, rec, sec_index);
|
|
|
|
fputs("\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: clust index record ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print(stderr, clust_rec, clust_index);
|
|
|
|
putc('\n', stderr);
|
|
|
|
trx_print(stderr, trx, 600);
|
|
|
|
|
|
|
|
fputs("\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Submit a detailed bug report"
|
|
|
|
" to http://bugs.mysql.com\n", stderr);
|
2012-01-26 13:24:00 +02:00
|
|
|
ut_ad(0);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
clust_rec = NULL;
|
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
err = DB_SUCCESS;
|
2005-10-27 07:29:40 +00:00
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
*offsets = rec_get_offsets(clust_rec, clust_index, *offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, offset_heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (prebuilt->select_lock_type != LOCK_NONE) {
|
|
|
|
/* Try to place a lock on the index record; we are searching
|
|
|
|
the clust rec with a unique condition, hence
|
|
|
|
we set a LOCK_REC_NOT_GAP type lock */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = lock_clust_rec_read_check_and_lock(
|
2011-12-29 16:12:55 +02:00
|
|
|
0, btr_pcur_get_block(&prebuilt->clust_pcur),
|
2006-10-24 06:45:52 +00:00
|
|
|
clust_rec, clust_index, *offsets,
|
2006-09-19 10:14:07 +00:00
|
|
|
prebuilt->select_lock_type, LOCK_REC_NOT_GAP, thr);
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
|
|
|
|
|
|
|
old_vers = NULL;
|
|
|
|
|
|
|
|
/* If the isolation level allows reading of uncommitted data,
|
|
|
|
then we never look for an earlier version */
|
|
|
|
|
|
|
|
if (trx->isolation_level > TRX_ISO_READ_UNCOMMITTED
|
2006-09-19 10:14:07 +00:00
|
|
|
&& !lock_clust_rec_cons_read_sees(
|
|
|
|
clust_rec, clust_index, *offsets,
|
|
|
|
trx->read_view)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The following call returns 'offsets' associated with
|
|
|
|
'old_vers' */
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_sel_build_prev_vers_for_mysql(
|
|
|
|
trx->read_view, clust_index, prebuilt,
|
|
|
|
clust_rec, offsets, offset_heap, &old_vers,
|
|
|
|
mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2008-01-21 09:51:40 +00:00
|
|
|
if (err != DB_SUCCESS || old_vers == NULL) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
goto err_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
clust_rec = old_vers;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we had to go to an earlier version of row or the
|
|
|
|
secondary index record is delete marked, then it may be that
|
|
|
|
the secondary index record corresponding to clust_rec
|
|
|
|
(or old_vers) is not rec; in that case we must ignore
|
|
|
|
such row because in our snapshot rec would not have existed.
|
|
|
|
Remember that from rec we cannot see directly which transaction
|
|
|
|
id corresponds to it: we have to go to the clustered index
|
|
|
|
record. A query where we want to fetch all rows where
|
|
|
|
the secondary index value is in some interval would return
|
|
|
|
a wrong result if we would not drop rows which we come to
|
|
|
|
visit through secondary index records that would not really
|
|
|
|
exist in our snapshot. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-10-13 13:02:00 +00:00
|
|
|
if (clust_rec
|
|
|
|
&& (old_vers
|
branches/innodb+: Merge revisions 6364:6447 from branches/zip:
------------------------------------------------------------------------
r6367 | marko | 2009-12-28 15:39:19 +0200 (Mon, 28 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_add_to_cache(): Always free the index object,
also when returning DB_CORRUPTION.
------------------------------------------------------------------------
r6425 | marko | 2010-01-12 13:47:11 +0200 (Tue, 12 Jan 2010) | 45 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/row/row0mysql.c
branches/zip: Merge revisions 6350:6424 from branches/5.1:
------------------------------------------------------------------------
r6421 | jyang | 2010-01-12 07:59:16 +0200 (Tue, 12 Jan 2010) | 8 lines
Changed paths:
M /branches/5.1/row/row0mysql.c
branches/5.1: Fix bug #49238: Creating/Dropping a temporary table
while at 1023 transactions will cause assert. Handle possible
DB_TOO_MANY_CONCURRENT_TRXS when deleting metadata in
row_drop_table_for_mysql().
rb://220, approved by Marko
------------------------------------------------------------------------
r6422 | marko | 2010-01-12 11:34:27 +0200 (Tue, 12 Jan 2010) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1: Non-functional change:
Make innobase_get_int_col_max_value() a static function.
It does not access any fields of class ha_innobase.
------------------------------------------------------------------------
r6424 | marko | 2010-01-12 12:22:19 +0200 (Tue, 12 Jan 2010) | 16 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1: In innobase_initialize_autoinc(), do not attempt to read
the maximum auto-increment value from the table if
innodb_force_recovery is set to at least 4, so that writes are
disabled. (Bug #46193)
innobase_get_int_col_max_value(): Move the function definition before
ha_innobase::innobase_initialize_autoinc(), because that function now
calls this function.
ha_innobase::innobase_initialize_autoinc(): Change the return type to
void. Do not attempt to read the maximum auto-increment value from
the table if innodb_force_recovery is set to at least 4. Issue
ER_AUTOINC_READ_FAILED to the client when the auto-increment value
cannot be read.
rb://144 by Sunny, revised by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6426 | marko | 2010-01-12 15:36:14 +0200 (Tue, 12 Jan 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_sec_rec_is_for_clust_rec(): Document the return value
more accurately.
------------------------------------------------------------------------
r6433 | marko | 2010-01-13 13:19:00 +0200 (Wed, 13 Jan 2010) | 2 lines
Changed paths:
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
branches/zip: dict_sys_tables_get_flags(), dict_create_sys_*_tuple():
Add some const qualifiers and comments.
------------------------------------------------------------------------
r6445 | marko | 2010-01-13 17:15:29 +0200 (Wed, 13 Jan 2010) | 3 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
branches/zip: buf_pool_drop_hash_index(): Check block->page.state
before checking block->is_hashed, because the latter may be uninitialized
right after server startup.
------------------------------------------------------------------------
r6446 | marko | 2010-01-13 17:20:10 +0200 (Wed, 13 Jan 2010) | 3 lines
Changed paths:
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/mem/mem0dbg.c
M /branches/zip/sync/sync0sync.c
branches/zip: Treat mem_hash_mutex specially in mutex_free(),
and explicitly free mem_hash_mutex in mem_close().
This fixes the breakage of UNIV_MEM_DEBUG that was filed as Issue #434.
------------------------------------------------------------------------
r6447 | marko | 2010-01-13 17:43:44 +0200 (Wed, 13 Jan 2010) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/row/row0sel.c
branches/zip: row_sel_get_clust_rec_for_mysql(): On the READ UNCOMMITTED
isolation level, do not attempt to access a clustered index record
that has been marked for deletion. This fixes Issue #433.
Approved by Heikki over the IM.
------------------------------------------------------------------------
2010-01-13 20:01:10 +00:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_UNCOMMITTED
|
2006-10-13 13:02:00 +00:00
|
|
|
|| rec_get_deleted_flag(rec, dict_table_is_comp(
|
|
|
|
sec_index->table)))
|
2006-09-19 10:14:07 +00:00
|
|
|
&& !row_sel_sec_rec_is_for_clust_rec(
|
|
|
|
rec, sec_index, clust_rec, clust_index)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
clust_rec = NULL;
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
2008-01-11 12:19:59 +00:00
|
|
|
} else {
|
2006-08-29 09:30:31 +00:00
|
|
|
ut_a(clust_rec == NULL
|
2006-09-19 10:14:07 +00:00
|
|
|
|| row_sel_sec_rec_is_for_clust_rec(
|
|
|
|
rec, sec_index, clust_rec, clust_index));
|
2006-02-23 19:25:29 +00:00
|
|
|
#endif
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func_exit:
|
|
|
|
*out_rec = clust_rec;
|
|
|
|
|
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
|
|
|
if (prebuilt->select_lock_type != LOCK_NONE) {
|
|
|
|
/* We may use the cursor in update or in unlock_row():
|
|
|
|
store its position */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2011-12-29 16:12:55 +02:00
|
|
|
btr_pcur_store_position(&prebuilt->clust_pcur, mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
err_exit:
|
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Restores cursor position after it has been stored. We have to take into
|
|
|
|
account that the record cursor was positioned on may have been deleted.
|
2009-05-25 06:46:10 +00:00
|
|
|
Then we may have to move the cursor one step up or down.
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
@return TRUE if we may need to process the record the cursor is now
|
|
|
|
positioned on (i.e. we should not go to the next record yet) */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ibool
|
|
|
|
sel_restore_position_for_mysql(
|
|
|
|
/*===========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
ibool* same_user_rec, /*!< out: TRUE if we were able to restore
|
2005-10-27 07:29:40 +00:00
|
|
|
the cursor on a user record with the
|
|
|
|
same ordering prefix in in the
|
|
|
|
B-tree index */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint latch_mode, /*!< in: latch mode wished in
|
2005-10-27 07:29:40 +00:00
|
|
|
restoration */
|
2009-05-25 06:46:10 +00:00
|
|
|
btr_pcur_t* pcur, /*!< in: cursor whose position
|
2005-10-27 07:29:40 +00:00
|
|
|
has been stored */
|
2009-05-25 06:46:10 +00:00
|
|
|
ibool moves_up, /*!< in: TRUE if the cursor moves up
|
2005-10-27 07:29:40 +00:00
|
|
|
in the index */
|
2009-05-25 06:46:10 +00:00
|
|
|
mtr_t* mtr) /*!< in: mtr; CAUTION: may commit
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr temporarily! */
|
|
|
|
{
|
|
|
|
ibool success;
|
|
|
|
ulint relative_position;
|
|
|
|
|
|
|
|
relative_position = pcur->rel_pos;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
success = btr_pcur_restore_position(latch_mode, pcur, mtr);
|
|
|
|
|
|
|
|
*same_user_rec = success;
|
|
|
|
|
|
|
|
if (relative_position == BTR_PCUR_ON) {
|
|
|
|
if (success) {
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (moves_up) {
|
|
|
|
btr_pcur_move_to_next(pcur, mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (relative_position == BTR_PCUR_AFTER
|
2006-08-29 09:30:31 +00:00
|
|
|
|| relative_position == BTR_PCUR_AFTER_LAST_IN_TREE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (moves_up) {
|
|
|
|
return(TRUE);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
if (btr_pcur_is_on_user_rec(pcur)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_move_to_prev(pcur, mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(relative_position == BTR_PCUR_BEFORE
|
2006-08-29 09:30:31 +00:00
|
|
|
|| relative_position == BTR_PCUR_BEFORE_FIRST_IN_TREE);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2007-10-22 08:16:35 +00:00
|
|
|
if (moves_up && btr_pcur_is_on_user_rec(pcur)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_move_to_next(pcur, mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
2011-08-10 12:58:22 +03:00
|
|
|
/********************************************************************//**
|
2011-08-10 12:25:24 +03:00
|
|
|
Copies a cached field for MySQL from the fetch cache. */
|
|
|
|
static
|
|
|
|
void
|
|
|
|
row_sel_copy_cached_field_for_mysql(
|
|
|
|
/*================================*/
|
2011-08-10 12:58:22 +03:00
|
|
|
byte* buf, /*!< in/out: row buffer */
|
|
|
|
const byte* cache, /*!< in: cached row */
|
|
|
|
const mysql_row_templ_t*templ) /*!< in: column template */
|
2011-08-10 12:25:24 +03:00
|
|
|
{
|
|
|
|
ulint len;
|
|
|
|
|
|
|
|
buf += templ->mysql_col_offset;
|
|
|
|
cache += templ->mysql_col_offset;
|
|
|
|
|
|
|
|
UNIV_MEM_ASSERT_W(buf, templ->mysql_col_len);
|
|
|
|
|
|
|
|
if (templ->mysql_type == DATA_MYSQL_TRUE_VARCHAR
|
|
|
|
&& templ->type != DATA_INT) {
|
|
|
|
/* Check for != DATA_INT to make sure we do
|
|
|
|
not treat MySQL ENUM or SET as a true VARCHAR!
|
|
|
|
Find the actual length of the true VARCHAR field. */
|
|
|
|
row_mysql_read_true_varchar(
|
|
|
|
&len, cache, templ->mysql_length_bytes);
|
|
|
|
len += templ->mysql_length_bytes;
|
|
|
|
UNIV_MEM_INVALID(buf, templ->mysql_col_len);
|
|
|
|
} else {
|
|
|
|
len = templ->mysql_col_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_memcpy(buf, cache, len);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Pops a cached row for MySQL from the fetch cache. */
|
|
|
|
UNIV_INLINE
|
|
|
|
void
|
|
|
|
row_sel_pop_cached_row_for_mysql(
|
|
|
|
/*=============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
byte* buf, /*!< in/out: buffer where to copy the
|
2005-10-27 07:29:40 +00:00
|
|
|
row */
|
2009-05-25 06:46:10 +00:00
|
|
|
row_prebuilt_t* prebuilt) /*!< in: prebuilt struct */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
2010-10-19 08:58:53 +03:00
|
|
|
const mysql_row_templ_t*templ;
|
2011-08-10 12:58:22 +03:00
|
|
|
const byte* cached_rec;
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_ad(prebuilt->n_fetch_cached > 0);
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(prebuilt->mysql_prefix_len <= prebuilt->mysql_row_len);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2011-08-10 12:25:24 +03:00
|
|
|
UNIV_MEM_ASSERT_W(buf, prebuilt->mysql_row_len);
|
|
|
|
|
|
|
|
cached_rec = prebuilt->fetch_cache[prebuilt->fetch_cache_first];
|
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (UNIV_UNLIKELY(prebuilt->keep_other_fields_on_keyread)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
/* Copy cache record field by field, don't touch fields that
|
2005-10-27 07:29:40 +00:00
|
|
|
are not covered by current key */
|
|
|
|
|
|
|
|
for (i = 0; i < prebuilt->n_template; i++) {
|
|
|
|
templ = prebuilt->mysql_template + i;
|
2011-08-10 12:25:24 +03:00
|
|
|
row_sel_copy_cached_field_for_mysql(
|
|
|
|
buf, cached_rec, templ);
|
2006-02-23 19:25:29 +00:00
|
|
|
/* Copy NULL bit of the current field from cached_rec
|
2005-10-27 07:29:40 +00:00
|
|
|
to buf */
|
2006-02-27 09:33:26 +00:00
|
|
|
if (templ->mysql_null_bit_mask) {
|
2006-08-29 09:30:31 +00:00
|
|
|
buf[templ->mysql_null_byte_offset]
|
|
|
|
^= (buf[templ->mysql_null_byte_offset]
|
2006-09-22 10:22:03 +00:00
|
|
|
^ cached_rec[templ->mysql_null_byte_offset])
|
2006-08-29 09:30:31 +00:00
|
|
|
& (byte)templ->mysql_null_bit_mask;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
2011-08-10 12:25:24 +03:00
|
|
|
} else if (prebuilt->mysql_prefix_len > 63) {
|
|
|
|
/* The record is long. Copy it field by field, in case
|
|
|
|
there are some long VARCHAR column of which only a
|
|
|
|
small length is being used. */
|
|
|
|
UNIV_MEM_INVALID(buf, prebuilt->mysql_prefix_len);
|
|
|
|
|
|
|
|
/* First copy the NULL bits. */
|
|
|
|
ut_memcpy(buf, cached_rec, prebuilt->null_bitmap_len);
|
|
|
|
/* Then copy the requested fields. */
|
|
|
|
|
|
|
|
for (i = 0; i < prebuilt->n_template; i++) {
|
|
|
|
row_sel_copy_cached_field_for_mysql(
|
|
|
|
buf, cached_rec, prebuilt->mysql_template + i);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ut_memcpy(buf, cached_rec, prebuilt->mysql_prefix_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2011-08-10 12:25:24 +03:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
prebuilt->n_fetch_cached--;
|
|
|
|
prebuilt->fetch_cache_first++;
|
|
|
|
|
|
|
|
if (prebuilt->n_fetch_cached == 0) {
|
|
|
|
prebuilt->fetch_cache_first = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2010-06-29 16:19:07 +03:00
|
|
|
Pushes a row for MySQL to the fetch cache.
|
|
|
|
@return TRUE on success, FALSE if the record contains incomplete BLOBs */
|
|
|
|
UNIV_INLINE __attribute__((warn_unused_result))
|
|
|
|
ibool
|
2005-10-27 07:29:40 +00:00
|
|
|
row_sel_push_cache_row_for_mysql(
|
|
|
|
/*=============================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
row_prebuilt_t* prebuilt, /*!< in: prebuilt struct */
|
2010-10-19 09:35:14 +03:00
|
|
|
const rec_t* rec, /*!< in: record to push, in the index
|
2010-10-19 08:58:53 +03:00
|
|
|
which was described in prebuilt's
|
2010-10-19 09:35:14 +03:00
|
|
|
template, or in the clustered index;
|
|
|
|
must be protected by a page latch */
|
|
|
|
ibool rec_clust, /*!< in: TRUE if rec is in the
|
|
|
|
clustered index instead of
|
|
|
|
prebuilt->index */
|
|
|
|
const ulint* offsets) /*!< in: rec_get_offsets(rec) */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
byte* buf;
|
|
|
|
ulint i;
|
|
|
|
|
|
|
|
ut_ad(prebuilt->n_fetch_cached < MYSQL_FETCH_CACHE_SIZE);
|
|
|
|
ut_ad(rec_offs_validate(rec, NULL, offsets));
|
2010-10-19 08:58:53 +03:00
|
|
|
ut_ad(!rec_get_deleted_flag(rec, rec_offs_comp(offsets)));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_a(!prebuilt->templ_contains_blob);
|
|
|
|
|
|
|
|
if (prebuilt->fetch_cache[0] == NULL) {
|
|
|
|
/* Allocate memory for the fetch cache */
|
|
|
|
|
|
|
|
for (i = 0; i < MYSQL_FETCH_CACHE_SIZE; i++) {
|
|
|
|
|
|
|
|
/* A user has reported memory corruption in these
|
|
|
|
buffers in Linux. Put magic numbers there to help
|
|
|
|
to track a possible bug. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
buf = mem_alloc(prebuilt->mysql_row_len + 8);
|
|
|
|
|
|
|
|
prebuilt->fetch_cache[i] = buf + 4;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mach_write_to_4(buf, ROW_PREBUILT_FETCH_MAGIC_N);
|
|
|
|
mach_write_to_4(buf + 4 + prebuilt->mysql_row_len,
|
|
|
|
ROW_PREBUILT_FETCH_MAGIC_N);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ut_ad(prebuilt->fetch_cache_first == 0);
|
2010-05-05 13:14:06 +03:00
|
|
|
UNIV_MEM_INVALID(prebuilt->fetch_cache[prebuilt->n_fetch_cached],
|
|
|
|
prebuilt->mysql_row_len);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
if (UNIV_UNLIKELY(!row_sel_store_mysql_rec(
|
|
|
|
prebuilt->fetch_cache[
|
|
|
|
prebuilt->n_fetch_cached],
|
2010-10-19 08:58:53 +03:00
|
|
|
prebuilt, rec, rec_clust, offsets))) {
|
2010-06-29 16:19:07 +03:00
|
|
|
return(FALSE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
prebuilt->n_fetch_cached++;
|
2010-06-29 16:19:07 +03:00
|
|
|
return(TRUE);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Tries to do a shortcut to fetch a clustered index record with a unique key,
|
|
|
|
using the hash index if possible (not always). We assume that the search
|
|
|
|
mode is PAGE_CUR_GE, it is a consistent read, there is a read view in trx,
|
2009-05-25 06:46:10 +00:00
|
|
|
btr search latch has been locked in S-mode.
|
|
|
|
@return SEL_FOUND, SEL_EXHAUSTED, SEL_RETRY */
|
2005-10-27 07:29:40 +00:00
|
|
|
static
|
|
|
|
ulint
|
|
|
|
row_sel_try_search_shortcut_for_mysql(
|
|
|
|
/*==================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
const rec_t** out_rec,/*!< out: record if found */
|
|
|
|
row_prebuilt_t* prebuilt,/*!< in: prebuilt struct */
|
|
|
|
ulint** offsets,/*!< in/out: for rec_get_offsets(*out_rec) */
|
|
|
|
mem_heap_t** heap, /*!< in/out: heap for rec_get_offsets() */
|
|
|
|
mtr_t* mtr) /*!< in: started mtr */
|
2005-10-27 07:29:40 +00:00
|
|
|
{
|
|
|
|
dict_index_t* index = prebuilt->index;
|
2006-10-23 19:14:36 +00:00
|
|
|
const dtuple_t* search_tuple = prebuilt->search_tuple;
|
2011-12-29 16:12:55 +02:00
|
|
|
btr_pcur_t* pcur = &prebuilt->pcur;
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_t* trx = prebuilt->trx;
|
2008-05-14 15:43:19 +00:00
|
|
|
const rec_t* rec;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-03-09 17:26:02 +00:00
|
|
|
ut_ad(dict_index_is_clust(index));
|
2005-10-27 07:29:40 +00:00
|
|
|
ut_ad(!prebuilt->templ_contains_blob);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 10:15:07 +00:00
|
|
|
#ifndef UNIV_SEARCH_DEBUG
|
2005-10-27 07:29:40 +00:00
|
|
|
btr_pcur_open_with_no_init(index, search_tuple, PAGE_CUR_GE,
|
2006-08-29 09:30:31 +00:00
|
|
|
BTR_SEARCH_LEAF, pcur,
|
|
|
|
RW_S_LATCH,
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 10:15:07 +00:00
|
|
|
mtr);
|
|
|
|
#else /* UNIV_SEARCH_DEBUG */
|
|
|
|
btr_pcur_open_with_no_init(index, search_tuple, PAGE_CUR_GE,
|
|
|
|
BTR_SEARCH_LEAF, pcur,
|
2006-08-29 09:30:31 +00:00
|
|
|
0,
|
|
|
|
mtr);
|
branches/innodb+: Merge revisions 6560:6773 from branches/zip:
------------------------------------------------------------------------
r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Remove the additional check introduced in r6534 which tries
to check if the joining transaction has any other transactions waiting on
its locks. This optimization results in excessive deadlocks when running
Sysbench with a large number of threads. The function seems to return
FALSE positives.
rb://250
------------------------------------------------------------------------
r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_index(): Remove redundant condition
on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique,
because SYS_FIELDS is not indexed by TABLE_ID.
------------------------------------------------------------------------
r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/rem/rem0rec.c
branches/zip: rec_get_nth_field_offs_old():
Replace if (!cond) ut_error; tests with ut_a(cond).
------------------------------------------------------------------------
r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
branches/zip: btr_pcur_commit(): Unused function, remove.
------------------------------------------------------------------------
r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Check for !innodb_table.
------------------------------------------------------------------------
r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_field_print_low(): Add const qualifier.
------------------------------------------------------------------------
r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/dict/dict0boot.c
M /branches/zip/include/dict0boot.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: When dropping temporary indexes and tables at startup,
first load them to the data dictionary cache and use the normal
routines for dropping tables or indexes. This should reduce the
risk of bugs and also make the code compatible with the upcoming
TablespaceDictionary implementation.
DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME.
row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing
temporary indexes, and load the tables as needed. Invoke
row_merge_drop_index() to drop the indexes.
row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables,
load them with dict_load_table() and drop them with
row_drop_table_for_mysql().
rb://251, not yet reviewed
------------------------------------------------------------------------
r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/log/log0recv.c
M /branches/zip/srv/srv0start.c
branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files
innobase_start_or_create_for_mysql(): Roll back data dictionary
transactions before scanning the *.ibd files. Then, data dictionary
records can be loaded to the cache before opening the *.ibd files.
recv_recovery_rollback_active(): Refactored from
recv_recovery_from_checkpoint_finish().
rb://235, committing without review, because this is needed for
TablespaceDictionary.
------------------------------------------------------------------------
r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_rollback_active():
Drop the temporary tables and indexes after enabling sync order checks.
This should not make any difference. This could have been done in r6611.
------------------------------------------------------------------------
r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/plugin rb://242
Let the master thread sleep if the amount of work to be done is
calibrated as taking less than a second.
Approved by: Heikki
------------------------------------------------------------------------
r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Document r6614 in ChangeLog.
------------------------------------------------------------------------
r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/buf/buf0buf.c
M /branches/zip/lock/lock0lock.c
branches/zip: Merge revisions 6538:6613 from branches/5.1:
------------------------------------------------------------------------
r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines
Changed paths:
M /branches/5.1/lock/lock0lock.c
branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info
incorrect when deadlock detection aborts". Print the correct
lock owner when recursive function lock_deadlock_recursive()
exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK.
rb://217, approved by Marko.
------------------------------------------------------------------------
r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines
Changed paths:
M /branches/5.1/buf/buf0buf.c
M /branches/5.1/buf/buf0rea.c
M /branches/5.1/include/buf0rea.h
branches/5.1: Fix Bug #38901
InnoDB logs error repeatedly when trying to load page into buffer pool
In buf_page_get_gen() if we are unable to read a page (because of
corruption or some other reason) we keep on retrying. This fills up
error log with millions of entries in no time and we'd eventually run
out of disk space. This patch limits the number of attempts that we
make (currently set to 100) and after that we abort with a message.
rb://241 Approved by: Heikki
------------------------------------------------------------------------
------------------------------------------------------------------------
r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Clean up after r6559. Now that
btr_pcur_open_with_no_init() is a macro, do not mix preprocessor
directives in the macro invocation, because it is implementation-defined
whether that is going to work.
------------------------------------------------------------------------
r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0rseg.h
M /branches/zip/trx/trx0rseg.c
branches/zip: trx_rseg_create(): Unused function, remove.
------------------------------------------------------------------------
r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec.
row_undo_mod_remove_clust_low(): Augment the function comment.
row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(),
row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec():
Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC);
------------------------------------------------------------------------
r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/row/row0umod.c
branches/zip: Introduce thr_is_recv().
------------------------------------------------------------------------
r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines
Changed paths:
M /branches/zip/btr/btr0cur.c
M /branches/zip/include/trx0types.h
M /branches/zip/row/row0umod.c
branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452)
When rolling back an incomplete transaction in purge, tolerate missing
BLOBs also in update undo, when undoing an INSERT by updating a delete-marked
record, and the delete-marked record is no longer needed.
Previously, we only tolerated missing BLOBs in insert undo.
This merely fixes a debug assertion; the code performed correctly
without UNIV_DEBUG.
rb://249 approved by Sunny Bains.
------------------------------------------------------------------------
r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines
Changed paths:
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/mem/mem0mem.c
branches/zip bug# 49535
This is a backport of r4924.
mem_heap_get_size() scans all allocated blocks to calculate the total
size of the heap. This patch introduces a new, total_size, field in
mem_block_info_struct. This field is valid only for base block
(i.e.: the first block allocated for the heap) and is set to
ULINT_UNDEFINED in other blocks.
This considerably improves the performance of redo scan during recovery.
rb://108 issue#216
Approved by: Heikki
------------------------------------------------------------------------
r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: Remove bogus debug assertions introduced in r6660.
------------------------------------------------------------------------
r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip
ChangeLog entry for r6674.
------------------------------------------------------------------------
r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/trx/trx0trx.c
branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex
is held by the caller.
------------------------------------------------------------------------
r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Change the bit fields back to ulint. Bit fields were causing
problems with concurrency on SMP systems because of word packing issues.
The number of trx_t's in a system is not sufficient enough to require that
we try and save a few bytes in the data structure.
See rb://255 for details.
------------------------------------------------------------------------
r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Update the comments and fix the whitespace issues.
See rb://255 Approved by: Marko
------------------------------------------------------------------------
r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix comment. Non functional change.
------------------------------------------------------------------------
r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/log0log.ic
branches/zip: log_reserve_and_write_fast(): Correct a race condition
in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440.
------------------------------------------------------------------------
r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line
Changed paths:
M /branches/zip/include/trx0trx.h
branches/zip: Fix a comment.
------------------------------------------------------------------------
r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_table_other_has_incompatible():
Return an incompatible lock or NULL instead of TRUE or FALSE.
Approved by Sunny over IM.
------------------------------------------------------------------------
r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines
Changed paths:
M /branches/zip/os/os0file.c
branches/zip: Merge revisions 6613:6669 from branches/5.1:
------------------------------------------------------------------------
r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines
branches/5.1: Fix bug #50691, AIX implementation of readdir_r
causes InnoDB errors. readdir_r() returns an non-NULL value
in the case of reaching the end of a directory. It should
not be treated as an error return.
rb://238 approved by Marko
------------------------------------------------------------------------
------------------------------------------------------------------------
r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/include/fil0fil.h
branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid
for the first page of each ibdata* file, not *.ibd files.
Suggested by Heikki, in connection with the LSN warning noted in Issue #341.
------------------------------------------------------------------------
r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp_init_file_page_low(): Declare the page uninitialized
for Valgrind.
------------------------------------------------------------------------
r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/include/univ.i
branches/zip: Remove UNIV_BASIC_LOG_DEBUG.
This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341.
Suggested by Heikki.
------------------------------------------------------------------------
r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: Don't print the entire lock bit set if the block was not
found in the buffer pool. Only print the bits that are set and that
information is in the lock and not in the block.
See rb://256 approved by Marko.
------------------------------------------------------------------------
r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines
Changed paths:
M /branches/embedded-1.0/btr/btr0btr.c
M /branches/embedded-1.0/btr/btr0cur.c
M /branches/embedded-1.0/btr/btr0pcur.c
M /branches/embedded-1.0/buf/buf0buf.c
M /branches/embedded-1.0/buf/buf0flu.c
M /branches/embedded-1.0/buf/buf0lru.c
M /branches/embedded-1.0/dict/dict0boot.c
M /branches/embedded-1.0/dict/dict0crea.c
M /branches/embedded-1.0/dict/dict0dict.c
M /branches/embedded-1.0/dict/dict0load.c
M /branches/embedded-1.0/fil/fil0fil.c
M /branches/embedded-1.0/fsp/fsp0fsp.c
M /branches/embedded-1.0/ibuf/ibuf0ibuf.c
M /branches/embedded-1.0/include/btr0btr.h
M /branches/embedded-1.0/include/btr0cur.h
M /branches/embedded-1.0/include/btr0pcur.h
M /branches/embedded-1.0/include/btr0pcur.ic
M /branches/embedded-1.0/include/buf0buf.h
M /branches/embedded-1.0/include/buf0buf.ic
M /branches/embedded-1.0/include/dict0boot.h
M /branches/embedded-1.0/include/fil0fil.h
M /branches/embedded-1.0/include/lock0lock.h
M /branches/embedded-1.0/include/log0log.h
M /branches/embedded-1.0/include/log0log.ic
M /branches/embedded-1.0/include/log0recv.h
M /branches/embedded-1.0/include/mem0dbg.h
M /branches/embedded-1.0/include/mem0dbg.ic
M /branches/embedded-1.0/include/mem0mem.h
M /branches/embedded-1.0/include/mem0mem.ic
M /branches/embedded-1.0/include/os0file.h
M /branches/embedded-1.0/include/os0sync.h
M /branches/embedded-1.0/include/os0sync.ic
M /branches/embedded-1.0/include/os0thread.h
M /branches/embedded-1.0/include/que0que.h
M /branches/embedded-1.0/include/que0que.ic
M /branches/embedded-1.0/include/row0merge.h
M /branches/embedded-1.0/include/row0prebuilt.h
M /branches/embedded-1.0/include/srv0srv.h
M /branches/embedded-1.0/include/sync0sync.h
M /branches/embedded-1.0/include/trx0rseg.h
M /branches/embedded-1.0/include/trx0sys.h
M /branches/embedded-1.0/include/trx0trx.h
M /branches/embedded-1.0/include/trx0types.h
M /branches/embedded-1.0/include/trx0undo.h
M /branches/embedded-1.0/include/trx0xa.h
M /branches/embedded-1.0/include/univ.i
M /branches/embedded-1.0/include/ut0vec.h
M /branches/embedded-1.0/include/ut0vec.ic
M /branches/embedded-1.0/lock/lock0lock.c
M /branches/embedded-1.0/log/log0log.c
M /branches/embedded-1.0/log/log0recv.c
M /branches/embedded-1.0/mem/mem0mem.c
M /branches/embedded-1.0/os/os0file.c
M /branches/embedded-1.0/os/os0thread.c
M /branches/embedded-1.0/page/page0page.c
M /branches/embedded-1.0/rem/rem0rec.c
M /branches/embedded-1.0/row/row0ins.c
M /branches/embedded-1.0/row/row0merge.c
M /branches/embedded-1.0/row/row0prebuilt.c
M /branches/embedded-1.0/row/row0sel.c
M /branches/embedded-1.0/row/row0umod.c
M /branches/embedded-1.0/row/row0undo.c
M /branches/embedded-1.0/row/row0upd.c
M /branches/embedded-1.0/srv/srv0srv.c
M /branches/embedded-1.0/srv/srv0start.c
M /branches/embedded-1.0/sync/sync0sync.c
M /branches/embedded-1.0/trx/trx0sys.c
M /branches/embedded-1.0/trx/trx0trx.c
M /branches/embedded-1.0/trx/trx0undo.c
M /branches/embedded-1.0/ut/ut0mem.c
M /branches/innodb+/btr/btr0btr.c
M /branches/innodb+/btr/btr0cur.c
M /branches/innodb+/btr/btr0pcur.c
M /branches/innodb+/buf/buf0buf.c
M /branches/innodb+/buf/buf0lru.c
M /branches/innodb+/dict/dict0crea.c
M /branches/innodb+/dict/dict0dict.c
M /branches/innodb+/dict/dict0load.c
M /branches/innodb+/handler/ha_innodb.cc
M /branches/innodb+/handler/ha_innodb.h
M /branches/innodb+/handler/handler0alter.cc
M /branches/innodb+/include/btr0btr.h
M /branches/innodb+/include/btr0cur.h
M /branches/innodb+/include/btr0pcur.h
M /branches/innodb+/include/btr0pcur.ic
M /branches/innodb+/include/buf0buf.h
M /branches/innodb+/include/log0log.h
M /branches/innodb+/include/mem0dbg.h
M /branches/innodb+/include/mem0dbg.ic
M /branches/innodb+/include/os0file.h
M /branches/innodb+/include/row0mysql.h
M /branches/innodb+/include/srv0srv.h
M /branches/innodb+/include/sync0sync.h
M /branches/innodb+/include/trx0trx.h
M /branches/innodb+/lock/lock0lock.c
M /branches/innodb+/log/log0log.c
M /branches/innodb+/log/log0recv.c
M /branches/innodb+/mem/mem0dbg.c
M /branches/innodb+/os/os0file.c
M /branches/innodb+/page/page0page.c
M /branches/innodb+/row/row0ins.c
M /branches/innodb+/row/row0mysql.c
M /branches/innodb+/row/row0sel.c
M /branches/innodb+/srv/srv0srv.c
M /branches/innodb+/srv/srv0start.c
M /branches/innodb+/sync/sync0sync.c
M /branches/innodb+_metrics_table/btr/btr0btr.c
M /branches/innodb+_metrics_table/buf/buf0buf.c
M /branches/innodb+_metrics_table/buf/buf0flu.c
M /branches/innodb+_metrics_table/dict/dict0crea.c
M /branches/innodb+_metrics_table/dict/dict0dict.c
M /branches/innodb+_metrics_table/dict/dict0load.c
M /branches/innodb+_metrics_table/handler/ha_innodb.cc
M /branches/innodb+_metrics_table/handler/ha_innodb.h
M /branches/innodb+_metrics_table/handler/handler0alter.cc
M /branches/innodb+_metrics_table/handler/i_s.cc
M /branches/innodb+_metrics_table/handler/i_s.h
M /branches/innodb+_metrics_table/include/mem0dbg.h
M /branches/innodb+_metrics_table/include/mem0dbg.ic
M /branches/innodb+_metrics_table/include/srv0mon.h
M /branches/innodb+_metrics_table/include/srv0mon.ic
M /branches/innodb+_metrics_table/include/srv0srv.h
M /branches/innodb+_metrics_table/lock/lock0lock.c
M /branches/innodb+_metrics_table/log/log0log.c
M /branches/innodb+_metrics_table/mem/mem0dbg.c
M /branches/innodb+_metrics_table/os/os0file.c
M /branches/innodb+_metrics_table/page/page0zip.c
M /branches/innodb+_metrics_table/row/row0mysql.c
M /branches/innodb+_metrics_table/row/row0purge.c
M /branches/innodb+_metrics_table/row/row0sel.c
M /branches/innodb+_metrics_table/srv/srv0mon.c
M /branches/innodb+_metrics_table/srv/srv0srv.c
M /branches/innodb+_metrics_table/sync/sync0sync.c
M /branches/innodb+_metrics_table/trx/trx0roll.c
M /branches/innodb+_metrics_table/trx/trx0trx.c
M /branches/innodb+_persistent_stats/btr/btr0btr.c
M /branches/innodb+_persistent_stats/buf/buf0buf.c
M /branches/innodb+_persistent_stats/data/data0type.c
M /branches/innodb+_persistent_stats/dict/dict0boot.c
M /branches/innodb+_persistent_stats/dict/dict0crea.c
M /branches/innodb+_persistent_stats/dict/dict0dict.c
M /branches/innodb+_persistent_stats/dict/dict0load.c
M /branches/innodb+_persistent_stats/dict/dict0mem.c
M /branches/innodb+_persistent_stats/fil/fil0fil.c
M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c
M /branches/innodb+_persistent_stats/handler/ha_innodb.cc
M /branches/innodb+_persistent_stats/handler/ha_innodb.h
M /branches/innodb+_persistent_stats/handler/handler0alter.cc
M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c
M /branches/innodb+_persistent_stats/include/btr0pcur.h
M /branches/innodb+_persistent_stats/include/btr0pcur.ic
M /branches/innodb+_persistent_stats/include/db0err.h
M /branches/innodb+_persistent_stats/include/dict0dict.h
M /branches/innodb+_persistent_stats/include/dict0mem.h
M /branches/innodb+_persistent_stats/include/ha_prototypes.h
M /branches/innodb+_persistent_stats/include/lock0lock.h
M /branches/innodb+_persistent_stats/include/log0log.h
M /branches/innodb+_persistent_stats/include/log0recv.h
M /branches/innodb+_persistent_stats/include/mem0dbg.h
M /branches/innodb+_persistent_stats/include/mem0dbg.ic
M /branches/innodb+_persistent_stats/include/os0file.h
M /branches/innodb+_persistent_stats/include/pars0pars.h
M /branches/innodb+_persistent_stats/include/srv0srv.h
M /branches/innodb+_persistent_stats/include/sync0sync.h
M /branches/innodb+_persistent_stats/include/trx0sys.h
M /branches/innodb+_persistent_stats/include/trx0trx.h
M /branches/innodb+_persistent_stats/include/ut0lst.h
M /branches/innodb+_persistent_stats/include/ut0ut.h
M /branches/innodb+_persistent_stats/lock/lock0lock.c
M /branches/innodb+_persistent_stats/log/log0log.c
M /branches/innodb+_persistent_stats/log/log0recv.c
M /branches/innodb+_persistent_stats/mem/mem0dbg.c
M /branches/innodb+_persistent_stats/os/os0file.c
M /branches/innodb+_persistent_stats/page/page0page.c
M /branches/innodb+_persistent_stats/pars/pars0pars.c
M /branches/innodb+_persistent_stats/row/row0merge.c
M /branches/innodb+_persistent_stats/row/row0mysql.c
M /branches/innodb+_persistent_stats/row/row0sel.c
M /branches/innodb+_persistent_stats/row/row0umod.c
M /branches/innodb+_persistent_stats/row/row0upd.c
M /branches/innodb+_persistent_stats/srv/srv0srv.c
M /branches/innodb+_persistent_stats/srv/srv0start.c
M /branches/innodb+_persistent_stats/sync/sync0sync.c
M /branches/innodb+_persistent_stats/trx/trx0i_s.c
M /branches/innodb+_persistent_stats/trx/trx0sys.c
M /branches/innodb+_persistent_stats/trx/trx0trx.c
M /branches/innodb+_persistent_stats/ut/ut0ut.c
M /branches/innofts+/handler/ha_innodb.cc
M /branches/innofts+/handler/i_s.cc
M /branches/innofts+/handler/i_s.h
M /branches/innofts+/include/fut0fut.h
M /branches/performance_schema/btr/btr0sea.c
M /branches/performance_schema/buf/buf0buf.c
M /branches/performance_schema/dict/dict0dict.c
M /branches/performance_schema/fil/fil0fil.c
M /branches/performance_schema/handler/ha_innodb.cc
M /branches/performance_schema/include/srv0srv.h
M /branches/performance_schema/include/sync0rw.h
M /branches/performance_schema/include/sync0rw.ic
M /branches/performance_schema/include/sync0sync.h
M /branches/performance_schema/include/sync0sync.ic
M /branches/performance_schema/include/sync0types.h
M /branches/performance_schema/log/log0log.c
M /branches/performance_schema/srv/srv0srv.c
M /branches/performance_schema/sync/sync0rw.c
M /branches/performance_schema/trx/trx0i_s.c
M /branches/performance_schema/trx/trx0purge.c
M /branches/plugin-2.0/buf/buf0buf.c
M /branches/plugin-2.0/buf/buf0lru.c
M /branches/plugin-2.0/dict/dict0boot.c
M /branches/plugin-2.0/dict/dict0crea.c
M /branches/plugin-2.0/dict/dict0dict.c
M /branches/plugin-2.0/dict/dict0load.c
M /branches/plugin-2.0/dict/dict0mem.c
M /branches/plugin-2.0/fil/fil0fil.c
M /branches/plugin-2.0/fsp/fsp0fsp.c
M /branches/plugin-2.0/handler/ha_innodb.cc
M /branches/plugin-2.0/handler/ha_innodb.h
M /branches/plugin-2.0/handler/handler0alter.cc
M /branches/plugin-2.0/ibuf/ibuf0ibuf.c
M /branches/plugin-2.0/include/dict0mem.h
M /branches/plugin-2.0/include/ha_prototypes.h
M /branches/plugin-2.0/include/lock0lock.h
M /branches/plugin-2.0/include/log0log.h
M /branches/plugin-2.0/include/log0recv.h
M /branches/plugin-2.0/include/mem0dbg.h
M /branches/plugin-2.0/include/mem0dbg.ic
M /branches/plugin-2.0/include/os0file.h
M /branches/plugin-2.0/include/row0mysql.h
M /branches/plugin-2.0/include/srv0srv.h
M /branches/plugin-2.0/include/sync0sync.h
M /branches/plugin-2.0/include/trx0sys.h
M /branches/plugin-2.0/include/trx0trx.h
M /branches/plugin-2.0/lock/lock0lock.c
M /branches/plugin-2.0/log/log0log.c
M /branches/plugin-2.0/log/log0recv.c
M /branches/plugin-2.0/mem/mem0dbg.c
M /branches/plugin-2.0/os/os0file.c
M /branches/plugin-2.0/page/page0page.c
M /branches/plugin-2.0/row/row0merge.c
M /branches/plugin-2.0/row/row0mysql.c
M /branches/plugin-2.0/row/row0sel.c
M /branches/plugin-2.0/row/row0umod.c
M /branches/plugin-2.0/row/row0upd.c
M /branches/plugin-2.0/srv/srv0srv.c
M /branches/plugin-2.0/srv/srv0start.c
M /branches/plugin-2.0/sync/sync0sync.c
M /branches/plugin-2.0/trx/trx0i_s.c
M /branches/plugin-2.0/trx/trx0sys.c
M /branches/plugin-2.0/trx/trx0trx.c
M /branches/zip/btr/btr0btr.c
M /branches/zip/btr/btr0cur.c
M /branches/zip/btr/btr0pcur.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/buf/buf0lru.c
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/dict/dict0load.c
M /branches/zip/fsp/fsp0fsp.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
M /branches/zip/handler/handler0alter.cc
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0cur.h
M /branches/zip/include/btr0pcur.h
M /branches/zip/include/btr0pcur.ic
M /branches/zip/include/buf0buf.h
M /branches/zip/include/dict0boot.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0log.ic
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0dbg.h
M /branches/zip/include/mem0dbg.ic
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0mem.ic
M /branches/zip/include/os0file.h
M /branches/zip/include/que0que.h
M /branches/zip/include/que0que.ic
M /branches/zip/include/row0mysql.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/sync0sync.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0trx.h
M /branches/zip/include/trx0types.h
M /branches/zip/include/univ.i
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0mem.c
M /branches/zip/os/os0file.c
M /branches/zip/page/page0page.c
M /branches/zip/rem/rem0rec.c
M /branches/zip/row/row0ins.c
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
M /branches/zip/row/row0sel.c
M /branches/zip/row/row0umod.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0trx.c
Non-functional change: update copyright year to 2010 of the files
that have been modified after 2010-01-01 according to svn.
for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done
------------------------------------------------------------------------
r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines
Changed paths:
M /branches/zip/include/row0sel.h
M /branches/zip/row/row0sel.c
branches/zip: row_fetch_store_uint4(): Remove unused function.
This was added to trunk in r435.
------------------------------------------------------------------------
r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: Allocate the merge sort buffers from a heap, not stack.
The merge sort can use up to 48KiB of buffers when merging blocks.
That can cause a stack overflow, especially on 64-bit systems when not
building with inlined functions. This was reported as Issue #462.
row_merge_dup_report(): Allocate buf and offsets from a heap.
row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus
sizeof arithmetics that happened to work, because
sizeof(ulint)==sizeof(void*).
row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap.
row_merge_insert_index_tuples(): Allocate buf from graph_heap.
rb://258 approved and tested by Sunny Bains
------------------------------------------------------------------------
r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines
Changed paths:
M /branches/zip/srv/srv0srv.c
branches/zip: fix bug#51587
Non-functional change.
------------------------------------------------------------------------
r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines
Changed paths:
M /branches/zip/include/btr0btr.h
M /branches/zip/include/btr0btr.ic
branches/zip:
Add a NOTE to the comment of btr_node_ptr_get_child_page_no()
to prevent mysterious bugs.
------------------------------------------------------------------------
r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
branches/zip: Disallow duplicate index name when creating an index.
This should fix Mantis Issue #461.
innodb.test, innodb.result, innodb-index.test, innodb-index.result:
Adjust the test result and mention that the introduced restriction
has been reported as MySQL Bug #51451.
innobase_check_index_keys(): Add a parameter for the InnoDB table and
check that no duplicate index name is added. Report errors by
my_error() instead of sql_print_error().
rb://260 approved by Sunny Bains
------------------------------------------------------------------------
r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line
Changed paths:
M /branches/zip/ChangeLog
Document r6770.
------------------------------------------------------------------------
r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines
Changed paths:
M /branches/zip/row/row0row.c
branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning
of possibly uninitialized variable format_in_hex.
------------------------------------------------------------------------
2010-03-04 10:15:07 +00:00
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
rec = btr_pcur_get_rec(pcur);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!page_rec_is_user_rec(rec)) {
|
|
|
|
|
|
|
|
return(SEL_RETRY);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* As the cursor is now placed on a user record after a search with
|
|
|
|
the mode PAGE_CUR_GE, the up_match field in the cursor tells how many
|
2006-02-23 19:25:29 +00:00
|
|
|
fields in the user record matched to the search tuple */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (btr_pcur_get_up_match(pcur) < dtuple_get_n_fields(search_tuple)) {
|
|
|
|
|
|
|
|
return(SEL_EXHAUSTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
|
|
|
|
|
|
|
*offsets = rec_get_offsets(rec, index, *offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (!lock_clust_rec_cons_read_sees(rec, index,
|
2006-08-29 09:30:31 +00:00
|
|
|
*offsets, trx->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(SEL_RETRY);
|
|
|
|
}
|
|
|
|
|
2006-02-27 09:33:26 +00:00
|
|
|
if (rec_get_deleted_flag(rec, dict_table_is_comp(index->table))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
return(SEL_EXHAUSTED);
|
|
|
|
}
|
|
|
|
|
|
|
|
*out_rec = rec;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
return(SEL_FOUND);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/********************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Searches for rows in the database. This is used in the interface to
|
|
|
|
MySQL. This function opens a cursor, and also implements fetch next
|
|
|
|
and fetch prev. NOTE that if we do a search with a full key value
|
|
|
|
from a unique index (ROW_SEL_EXACT), then we will not store the cursor
|
2009-05-25 06:46:10 +00:00
|
|
|
position and fetch next or fetch prev must not be tried to the cursor!
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
@return DB_SUCCESS, DB_RECORD_NOT_FOUND, DB_END_OF_INDEX, DB_DEADLOCK,
|
|
|
|
DB_LOCK_TABLE_FULL, DB_CORRUPTION, or DB_TOO_BIG_RECORD */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint
|
|
|
|
row_search_for_mysql(
|
|
|
|
/*=================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
byte* buf, /*!< in/out: buffer for the fetched
|
2005-10-27 07:29:40 +00:00
|
|
|
row in the MySQL format */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint mode, /*!< in: search mode PAGE_CUR_L, ... */
|
|
|
|
row_prebuilt_t* prebuilt, /*!< in: prebuilt struct for the
|
2005-10-27 07:29:40 +00:00
|
|
|
table handle; this contains the info
|
|
|
|
of search_tuple, index; if search
|
|
|
|
tuple contains 0 fields then we
|
|
|
|
position the cursor at the start or
|
|
|
|
the end of the index, depending on
|
|
|
|
'mode' */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint match_mode, /*!< in: 0 or ROW_SEL_EXACT or
|
2006-02-23 19:25:29 +00:00
|
|
|
ROW_SEL_EXACT_PREFIX */
|
2009-05-25 06:46:10 +00:00
|
|
|
ulint direction) /*!< in: 0 or ROW_SEL_NEXT or
|
2005-10-27 07:29:40 +00:00
|
|
|
ROW_SEL_PREV; NOTE: if this is != 0,
|
|
|
|
then prebuilt must have a pcur
|
|
|
|
with stored position! In opening of a
|
|
|
|
cursor 'direction' should be 0. */
|
|
|
|
{
|
|
|
|
dict_index_t* index = prebuilt->index;
|
2006-02-27 09:33:26 +00:00
|
|
|
ibool comp = dict_table_is_comp(index->table);
|
2006-10-23 19:14:36 +00:00
|
|
|
const dtuple_t* search_tuple = prebuilt->search_tuple;
|
2011-12-29 16:12:55 +02:00
|
|
|
btr_pcur_t* pcur = &prebuilt->pcur;
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_t* trx = prebuilt->trx;
|
|
|
|
dict_index_t* clust_index;
|
|
|
|
que_thr_t* thr;
|
2008-05-14 15:43:19 +00:00
|
|
|
const rec_t* rec;
|
|
|
|
const rec_t* result_rec;
|
|
|
|
const rec_t* clust_rec;
|
2005-10-27 07:29:40 +00:00
|
|
|
ulint err = DB_SUCCESS;
|
|
|
|
ibool unique_search = FALSE;
|
|
|
|
ibool unique_search_from_clust_index = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
ibool mtr_has_extra_clust_latch = FALSE;
|
|
|
|
ibool moves_up = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool set_also_gap_locks = TRUE;
|
2006-09-19 10:14:07 +00:00
|
|
|
/* if the query is a plain locking SELECT, and the isolation level
|
|
|
|
is <= TRX_ISO_READ_COMMITTED, then this is set to FALSE */
|
2006-02-17 14:19:39 +00:00
|
|
|
ibool did_semi_consistent_read = FALSE;
|
2006-09-19 10:14:07 +00:00
|
|
|
/* if the returned record was locked and we did a semi-consistent
|
|
|
|
read (fetch the newest committed version), then this is set to
|
|
|
|
TRUE */
|
2005-10-27 07:29:40 +00:00
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
|
|
|
ulint cnt = 0;
|
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
ulint next_offs;
|
|
|
|
ibool same_user_rec;
|
|
|
|
mtr_t mtr;
|
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
2010-10-11 05:36:13 -07:00
|
|
|
ibool table_lock_waited = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_ad(index && pcur && search_tuple);
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->table->ibd_file_missing)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
ut_print_timestamp(stderr);
|
|
|
|
fprintf(stderr, " InnoDB: Error:\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: MySQL is trying to use a table handle"
|
|
|
|
" but the .ibd file for\n"
|
|
|
|
"InnoDB: table %s does not exist.\n"
|
|
|
|
"InnoDB: Have you deleted the .ibd file"
|
|
|
|
" from the database directory under\n"
|
|
|
|
"InnoDB: the MySQL datadir, or have you used"
|
|
|
|
" DISCARD TABLESPACE?\n"
|
|
|
|
"InnoDB: Look from\n"
|
branches/innodb+: Merge revisions 4660:5090 from branches/zip:
------------------------------------------------------------------------
r4670 | vasil | 2009-04-07 09:35:23 +0300 (Tue, 07 Apr 2009) | 11 lines
branches/zip:
Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for
indexes of InnoDB table
by replacing the pseudo random number generator with a better one (LCG).
This also fixes Mantis Issue#212.
Approved by: Heikki (rb://110)
------------------------------------------------------------------------
r4671 | vasil | 2009-04-07 09:37:31 +0300 (Tue, 07 Apr 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4670.
------------------------------------------------------------------------
r4673 | marko | 2009-04-07 15:45:28 +0300 (Tue, 07 Apr 2009) | 4 lines
branches/zip: Allow in-place updates of UTF-8 CHAR columns
from or to NULL in ROW_FORMAT=REDUNDANT. (Bug #44032)
rb://107 approved by Heikki Tuuri.
------------------------------------------------------------------------
r4677 | marko | 2009-04-07 16:19:31 +0300 (Tue, 07 Apr 2009) | 1 line
branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676.
------------------------------------------------------------------------
r4678 | inaam | 2009-04-07 18:45:37 +0300 (Tue, 07 Apr 2009) | 12 lines
branches/zip
Enable atomics on solaris (using the libc functions as defined in
atomic.h) if GCC atomic builtins are not present.
There still remains some work to be done (by Vasil?). This patch
makes changes to plug.in to check pthread_t size and presence of
atomic functions when running on solaris. The same has to become
a part of the generated Makefile.in when we bake our source.
Reviewed by: Heikki rb://106
------------------------------------------------------------------------
r4687 | vasil | 2009-04-08 13:08:59 +0300 (Wed, 08 Apr 2009) | 4 lines
branches/zip:
Whitespace fixup in the ChangeLog
------------------------------------------------------------------------
r4688 | vasil | 2009-04-08 13:11:15 +0300 (Wed, 08 Apr 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4678.
------------------------------------------------------------------------
r4689 | marko | 2009-04-08 14:24:49 +0300 (Wed, 08 Apr 2009) | 5 lines
branches/zip: Hide unnecessarily visible globals.
dict_ind_redundant, dict_ind_compact: Declare these UNIV_INTERN.
innodb_hton_ptr: Declare static. We do not attempt to access the
built-in InnoDB any more.
trx_roll_savepoints_free(): Declare UNIV_INTERN.
------------------------------------------------------------------------
r4700 | calvin | 2009-04-11 00:37:10 +0300 (Sat, 11 Apr 2009) | 9 lines
branches/zip: Rewrite CMakeLists.txt
CMakeLists.txt is completely rewritten:
- To replace the one written by mysql
- Print out some useful information, such as
system name, directory, generator used,
win64, Microsoft compiler, etc.
- Remove one workaround for mysqld.lib location.
User does not need to specify a build type
------------------------------------------------------------------------
r4702 | calvin | 2009-04-13 18:16:44 +0300 (Mon, 13 Apr 2009) | 3 lines
branches/zip: delete the original CMakeLists.txt
A new version will be committed, suggested by Ken.
------------------------------------------------------------------------
r4703 | calvin | 2009-04-13 18:20:45 +0300 (Mon, 13 Apr 2009) | 9 lines
branches/zip: new CMakeLists.txt
CMakeLists.txt is completely rewritten with enhancements:
- Print out useful information, such as
system name, directory, generator used,
win64, Microsoft compiler, etc.
- Remove one workaround for mysqld.lib location.
User does not need to specify a build type
when invoking MSVC generator.
------------------------------------------------------------------------
r4706 | vasil | 2009-04-14 14:32:11 +0300 (Tue, 14 Apr 2009) | 5 lines
branches/zip:
When using the random function, first take the modulus by the number of pages
and then typecast to ulint.
------------------------------------------------------------------------
r4707 | calvin | 2009-04-14 17:47:31 +0300 (Tue, 14 Apr 2009) | 13 lines
branches/zip: remove statically linked libraries from mysql
To make zlib and strings dynamically linked; mysqld will export
additional functions required by InnoDB.
Since the symbols will be resolved dynamically during runtime,
wdl_load_mapfile() is no longer able to make any function calls
to ones in mysqld. As the result, strtoull() (from strings.lib)
is replaced with _strtoui64().
rb://111
Approved by: Marko
------------------------------------------------------------------------
r4712 | vasil | 2009-04-15 12:26:32 +0300 (Wed, 15 Apr 2009) | 157 lines
branches/zip: Merge revisions 4481:4710 from branches/5.1:
(resolving conflict in r4574, r4575 and skipping r4699 and r4705 because
analogous changes to r4699 and r4705 were already made to branches/zip)
------------------------------------------------------------------------
r4573 | vasil | 2009-03-30 14:17:13 +0300 (Mon, 30 Mar 2009) | 4 lines
Changed paths:
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Fix email address from dev@innodb.com to innodb_dev_ww@oracle.com
------------------------------------------------------------------------
r4574 | vasil | 2009-03-30 14:27:08 +0300 (Mon, 30 Mar 2009) | 38 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Restore the state of INNODB_THREAD_CONCURRENCY to silence this warning:
TEST RESULT TIME (ms)
------------------------------------------------------------
worker[1] Using MTR_BUILD_THREAD 250, with reserved ports 12500..12509
main.innodb [ pass ] 8803
MTR's internal check of the test case 'main.innodb' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:12500 (socket /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-03-30 14:12:31.000000000 +0300
+++ /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-03-30 14:12:41.000000000 +0300
@@ -99,7 +99,7 @@
INNODB_SUPPORT_XA ON
INNODB_SYNC_SPIN_LOOPS 20
INNODB_TABLE_LOCKS ON
-INNODB_THREAD_CONCURRENCY 8
+INNODB_THREAD_CONCURRENCY 16
INNODB_THREAD_SLEEP_DELAY 10000
INSERT_ID 0
INTERACTIVE_TIMEOUT 28800
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r4575 | vasil | 2009-03-30 15:55:31 +0300 (Mon, 30 Mar 2009) | 8 lines
Changed paths:
M /branches/5.1/mysql-test/innodb.result
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Fix Bug#43309 Test main.innodb can't be run twice
Make the innodb mysql-test more flexible by inspecting how much a
variable of interest has changed since the start of the test. Do not
assume the variables have zero values at the start of the test.
------------------------------------------------------------------------
r4576 | vasil | 2009-03-30 16:25:10 +0300 (Mon, 30 Mar 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that I committed accidentally in c4574.
------------------------------------------------------------------------
r4659 | vasil | 2009-04-06 15:34:51 +0300 (Mon, 06 Apr 2009) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb.test
branches/5.1:
Followup to r4575 and the fix of Bug#43309 Test main.innodb can't be run twice:
Add an explanatory comment, as suggested by Patrick Crews in the bug report.
------------------------------------------------------------------------
r4699 | vasil | 2009-04-09 14:01:52 +0300 (Thu, 09 Apr 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/srv0srv.h
M /branches/5.1/page/page0cur.c
M /branches/5.1/srv/srv0srv.c
branches/5.1:
Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes
of InnoDB table
by replacing the PRNG that is used to pick random pages with a better
one.
This is based on r4670 but also adds a new configuration option and
enables the fix only if this option is changed. Please skip the present
revision when merging.
Approved by: Heikki (via email)
------------------------------------------------------------------------
r4705 | vasil | 2009-04-14 14:30:13 +0300 (Tue, 14 Apr 2009) | 5 lines
Changed paths:
M /branches/5.1/page/page0cur.c
branches/5.1:
When using the random function, first take the modulus by the number of pages
and then typecast to ulint.
------------------------------------------------------------------------
r4710 | vasil | 2009-04-15 11:55:18 +0300 (Wed, 15 Apr 2009) | 25 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a change from MySQL (looks like this is against 5.0 but they later
merged it to 5.1):
------------------------------------------------------------
revno: 1810.3846.1
committer: Alexey Botchkov <holyfoot@mysql.com>
branch nick: 31435
timestamp: Tue 2008-11-11 14:42:32 +0400
message:
Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse
I think we don't need to issue an error statement in the convert_search_mode_to_innobase().
Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this
case depending on the requirements.
per-file comments:
sql/ha_innodb.cc
Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse
no error issued in convert_search_mode_to_innobase.
ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't supported.
modified:
sql/ha_innodb.cc
------------------------------------------------------------------------
------------------------------------------------------------------------
r4713 | vasil | 2009-04-15 12:36:16 +0300 (Wed, 15 Apr 2009) | 4 lines
branches/zip:
Add missing ChangeLog entries
------------------------------------------------------------------------
r4714 | vasil | 2009-04-15 12:36:57 +0300 (Wed, 15 Apr 2009) | 4 lines
branches/zip:
Fix typo in the ChangeLog
------------------------------------------------------------------------
r4715 | vasil | 2009-04-15 12:39:04 +0300 (Wed, 15 Apr 2009) | 4 lines
branches/zip:
Whitespace cleanup in ChangeLog
------------------------------------------------------------------------
r4716 | vasil | 2009-04-15 21:36:06 +0300 (Wed, 15 Apr 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4543.
------------------------------------------------------------------------
r4717 | calvin | 2009-04-16 01:22:35 +0300 (Thu, 16 Apr 2009) | 18 lines
branches/zip: Use the Windows Interlocked functions for atomic memory
access
Mapping the atomic operations to Windows Interlocked functions:
os_compare_and_swap_* to InterlockedCompareExchange(64)
os_atomic_increment_* to InterlockedExchangeAdd(64)
os_atomic_test_and_set_byte to InterlockedExchange
In this patch, the legacy code under UNIV_CAN_USE_X86_ASSEMBLER is
removed all together, and add HAVE_WINDOWS_ATOMICS and
INNODB_RW_LOCKS_USE_ATOMICS to CMakeLists.txt
This is to address mantis issue#194.
rb://113
Approved by: Marko
------------------------------------------------------------------------
r4720 | vasil | 2009-04-16 09:44:48 +0300 (Thu, 16 Apr 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4717.
------------------------------------------------------------------------
r4721 | marko | 2009-04-16 10:32:09 +0300 (Thu, 16 Apr 2009) | 2 lines
branches/zip: row_scan_and_check_index(): Initialize prebuilt->index_usable.
This should have been done in r4631. Spotted by Michael.
------------------------------------------------------------------------
r4728 | marko | 2009-04-16 16:02:27 +0300 (Thu, 16 Apr 2009) | 3 lines
branches/zip: univ.i: Define REFMAN as the base URL of the
MySQL Reference Manual and use it in every string.
This fixes Issue #221.
------------------------------------------------------------------------
r4733 | calvin | 2009-04-17 08:13:20 +0300 (Fri, 17 Apr 2009) | 6 lines
branches/zip: minor changes to CMakeLists.txt
All are non-functional changes:
- should check for long (not int), spotted by Sunny
- comment out the project definition, avoiding to generate another
.sln file.
------------------------------------------------------------------------
r4748 | vasil | 2009-04-18 00:50:09 +0300 (Sat, 18 Apr 2009) | 118 lines
branches/zip: Merge revisions 4710:4746 from branches/5.1:
------------------------------------------------------------------------
r4746 | vasil | 2009-04-18 00:32:08 +0300 (Sat, 18 Apr 2009) | 110 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/pars0pars.h
branches/5.1:
Merge a change from MySQL:
------------------------------------------------------------
revno: 2728.10.2
committer: Ignacio Galarza <iggy@mysql.com>
branch nick: mysql-5.1-bugteam-bug29125
timestamp: Fri 2009-02-13 11:41:47 -0500
message:
Bug#29125 Windows Server X64: so many compiler warnings
- Remove bothersome warning messages. This change focuses on the warnings
that are covered by the ignore file: support-files/compiler_warnings.supp.
- Strings are guaranteed to be max uint in length
modified:
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlslap.c
client/mysqltest.cc
client/sql_string.cc
extra/comp_err.c
extra/yassl/src/buffer.cpp
extra/yassl/taocrypt/include/block.hpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/asn.cpp
include/config-win.h
libmysql/libmysql.c
mysys/array.c
mysys/base64.c
mysys/charset.c
mysys/checksum.c
mysys/default.c
mysys/default_modify.c
mysys/hash.c
mysys/mf_keycache.c
mysys/mf_tempdir.c
mysys/my_append.c
mysys/my_compress.c
mysys/my_conio.c
mysys/my_copy.c
mysys/my_getwd.c
mysys/my_pread.c
mysys/my_quick.c
mysys/my_read.c
mysys/safemalloc.c
mysys/string.c
server-tools/instance-manager/buffer.cc
server-tools/instance-manager/instance.cc
server-tools/instance-manager/options.cc
server-tools/instance-manager/parse.h
sql-common/client.c
sql-common/my_user.c
sql/event_data_objects.cc
sql/event_parse_data.cc
sql/events.cc
sql/gen_lex_hash.cc
sql/item.h
sql/item_func.cc
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/lock.cc
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/net_serv.cc
sql/sp_head.h
sql/spatial.h
sql/sql_class.h
sql/sql_connect.cc
sql/sql_crypt.cc
sql/sql_error.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_servers.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_view.cc
sql/udf_example.c
sql/uniques.cc
storage/archive/azio.c
storage/archive/azlib.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/csv/transparent_file.h
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/hp_write.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/pars0pars.h
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_packrec.c
storage/myisam/mi_search.c
storage/myisam/rt_index.c
storage/myisammrg/ha_myisammrg.cc
strings/ctype.c
strings/my_vsnprintf.c
tests/bug25714.c
tests/mysql_client_test.c
------------------------------------------------------------------------
r4749 | vasil | 2009-04-18 00:58:08 +0300 (Sat, 18 Apr 2009) | 4 lines
branches/zip:
Add ChangeLog entry for t4748.
------------------------------------------------------------------------
r4751 | vasil | 2009-04-18 01:29:16 +0300 (Sat, 18 Apr 2009) | 4 lines
branches/zip:
Silence warning about unused variables.
------------------------------------------------------------------------
r4752 | vasil | 2009-04-18 01:30:37 +0300 (Sat, 18 Apr 2009) | 4 lines
branches/zip:
Include the needed header for memset().
------------------------------------------------------------------------
r4753 | vasil | 2009-04-18 01:31:34 +0300 (Sat, 18 Apr 2009) | 4 lines
branches/zip:
Silence a compiler warning.
------------------------------------------------------------------------
r4756 | vasil | 2009-04-18 02:19:03 +0300 (Sat, 18 Apr 2009) | 5 lines
branches/zip:
Rename the aux config program and give it a more specific name because
more are coming.
------------------------------------------------------------------------
r4757 | vasil | 2009-04-18 02:22:33 +0300 (Sat, 18 Apr 2009) | 4 lines
branches/zip:
Add comment and copyright notice to the aux config program.
------------------------------------------------------------------------
r4758 | vasil | 2009-04-18 02:40:47 +0300 (Sat, 18 Apr 2009) | 5 lines
branches/zip:
Add aux config programs to emulate the newly added checks in plug.in
(from r4678).
------------------------------------------------------------------------
r4830 | marko | 2009-04-20 16:11:38 +0300 (Mon, 20 Apr 2009) | 6 lines
branches/zip: Cosmetic fixes.
row_unlock_for_mysql(): Add a const qualifier to read-only rec_t*.
Use dict_index_is_clust().
CMakeLists.txt: svn propset svn:eol-style native.
------------------------------------------------------------------------
r4893 | marko | 2009-04-23 09:32:36 +0300 (Thu, 23 Apr 2009) | 11 lines
branches/zip: Introduce the logical type names trx_id_t, roll_ptr_t,
and undo_no_t. Each type is still defined as dulint.
This is an initial step towards replacing dulint with a 64-bit data type.
Because modern compilers have no trouble supporting 64-bit arithmetics
even on 32-bit targets, the dulint struct is a relic that should go.
The last remaining major use of dulint is dictionary IDs
(table, index, and row ids).
rb://114 approved by Sunny Bains
------------------------------------------------------------------------
r4894 | marko | 2009-04-23 10:21:07 +0300 (Thu, 23 Apr 2009) | 1 line
branches/zip: ChangeLog: Document r4893.
------------------------------------------------------------------------
r4895 | marko | 2009-04-23 10:22:06 +0300 (Thu, 23 Apr 2009) | 1 line
branches/zip: ChangeLog: Add the missing include/ to two files.
------------------------------------------------------------------------
r4896 | marko | 2009-04-23 10:37:40 +0300 (Thu, 23 Apr 2009) | 4 lines
branches/zip: row_scan_and_check_index(): Improve the diagnostics, by reporting
errors from row_search_for_mysql() in the error log.
The errors will still be ignored by CHECK TABLE.
This is somewhat related to Issue #211.
------------------------------------------------------------------------
r4897 | marko | 2009-04-23 10:40:34 +0300 (Thu, 23 Apr 2009) | 2 lines
branches/zip: row_scan_and_check_index(): Check
row_merge_is_index_usable() earlier, to make the logic clearer.
------------------------------------------------------------------------
r4898 | marko | 2009-04-23 15:15:07 +0300 (Thu, 23 Apr 2009) | 4 lines
branches/zip: Correct a misleading comment. PAGE_MAX_TRX_ID
will be updated in ibuf_insert_low() and updated from the
insert buffer tree page to the secondary index tree page
during the insert buffer merge.
------------------------------------------------------------------------
r4915 | marko | 2009-04-27 13:40:20 +0300 (Mon, 27 Apr 2009) | 2 lines
branches/zip: row_scan_and_check_index(): Add some comments on
prebuilt->index_usable, as suggested by Michael.
------------------------------------------------------------------------
r4921 | marko | 2009-04-29 11:51:25 +0300 (Wed, 29 Apr 2009) | 2 lines
branches/zip: btr_cur_optimistic_insert(): Remove a redundant condition.
The insert buffer tree is a clustered index.
------------------------------------------------------------------------
r4922 | marko | 2009-04-29 23:23:27 +0300 (Wed, 29 Apr 2009) | 22 lines
branches/zip: Distinguish temporary tables in MLOG_FILE_CREATE.
This addresses Mantis Issue #23 in InnoDB Hot Backup and some
of MySQL Bug #41609.
In MLOG_FILE_CREATE, we need to distinguish temporary tables, so that
InnoDB Hot Backup can work correctly. It turns out that we can do this
easily, by using a bit of the previously unused parameter for page number.
(The page number parameter of MLOG_FILE_CREATE has been written as 0
ever since MySQL 4.1, which introduced MLOG_FILE_CREATE.)
MLOG_FILE_FLAG_TEMP: A flag for indicating a temporary table in
the page number parameter of MLOG_FILE_ operations.
fil_op_write_log(): Add the parameter log_flags.
fil_op_log_parse_or_replay(): Add the parameter log_flags.
Do not replay MLOG_FILE_CREATE when MLOG_FILE_FLAG_TEMP is set in log_flags.
This only affects ibbackup --apply-log. InnoDB itself never replays file
operations.
rb://117 approved by Heikki Tuuri
------------------------------------------------------------------------
r4977 | marko | 2009-05-13 15:49:38 +0300 (Wed, 13 May 2009) | 12 lines
branches/zip: Merge revisions 4746:4976 from branches/5.1:
------------------------------------------------------------------------
r4976 | marko | 2009-05-13 15:44:54 +0300 (Wed, 13 May 2009) | 6 lines
branches/5.1: Display DB_ROLL_PTR in the COLUMNS section of the
innodb_table_monitor output. It was accidentally omitted due to an
off-by-one loop condition. (Bug #44320)
rb://116 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r4978 | vasil | 2009-05-13 16:21:55 +0300 (Wed, 13 May 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4977.
------------------------------------------------------------------------
r4995 | marko | 2009-05-14 15:31:43 +0300 (Thu, 14 May 2009) | 24 lines
branches/zip: Merge revisions 4976:4994 from branches/5.1:
------------------------------------------------------------------------
r4994 | marko | 2009-05-14 15:04:55 +0300 (Thu, 14 May 2009) | 18 lines
branches/5.1: Prevent a race condition in innobase_commit() by ensuring
that innodb_commit_concurrency>0 remains constant at run time. (Bug #42101)
srv_commit_concurrency: Make this a static variable in ha_innodb.cc.
innobase_commit_concurrency_validate(): Check that innodb_commit_concurrency
is not changed from or to 0 at run time. This is needed, because
innobase_commit() assumes that innodb_commit_concurrency>0 remains constant.
Without this limitation, the checks for innodb_commit_concurrency>0
in innobase_commit() should be removed and that function would have to
acquire and release commit_cond_m at least twice per invocation.
Normally, innodb_commit_concurrency=0, and introducing the mutex operations
would mean significant overhead.
innodb_bug42101.test, innodb_bug42101-nonzero.test: Test cases.
rb://123 approved by Heikki Tuuri
------------------------------------------------------------------------
------------------------------------------------------------------------
r5000 | vasil | 2009-05-14 20:13:41 +0300 (Thu, 14 May 2009) | 4 lines
branches/zip:
Add ChangeLog entry for r4994.
------------------------------------------------------------------------
r5026 | marko | 2009-05-18 16:29:51 +0300 (Mon, 18 May 2009) | 1 line
branches/zip: buf_validate(): Add missing out: comment.
------------------------------------------------------------------------
r5027 | marko | 2009-05-18 16:36:10 +0300 (Mon, 18 May 2009) | 1 line
branches/zip: Add some missing out: comments to buf0buf.h, buf0buf.c.
------------------------------------------------------------------------
r5028 | marko | 2009-05-18 16:40:07 +0300 (Mon, 18 May 2009) | 11 lines
branches/zip: When executing an optimistic update by delete-and-insert,
correctly estimate the free space on the compressed page by
page_zip_available(..., create=TRUE). This was reported as Issue #231.
btr_cur_update_alloc_zip(): Add the parameter ibool create and pass it
to page_zip_available(). The parameter was previously passed as 0.
btr_cur_optimistic_update(): Pass create=TRUE to btr_cur_update_alloc_zip().
rb://120 approved by Heikki Tuuri
------------------------------------------------------------------------
r5030 | marko | 2009-05-19 10:04:04 +0300 (Tue, 19 May 2009) | 2 lines
branches/zip: os_thread_get_curr_id(), os_thread_get_curr():
Add missing out: comments.
------------------------------------------------------------------------
r5031 | marko | 2009-05-19 10:30:02 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: Add missing out: comments to nullary functions.
------------------------------------------------------------------------
r5033 | marko | 2009-05-19 11:00:51 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: Remove bogus out: comments of functions returning void.
------------------------------------------------------------------------
r5034 | marko | 2009-05-19 12:41:32 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: row_update_prebuilt_trx(): Correct bogus comment.
------------------------------------------------------------------------
r5035 | marko | 2009-05-19 13:04:58 +0300 (Tue, 19 May 2009) | 3 lines
branches/zip: ut0auxconf_have_solaris_atomics.c: Get the
function declarations from <atomic.h>.
Call the functions with proper arguments.
------------------------------------------------------------------------
r5036 | marko | 2009-05-19 13:05:50 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: Add proper comments to some file page accessors.
------------------------------------------------------------------------
r5037 | marko | 2009-05-19 13:08:16 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: Fix a typo that was introduced in r5036.
------------------------------------------------------------------------
r5038 | marko | 2009-05-19 22:59:07 +0300 (Tue, 19 May 2009) | 30 lines
branches/zip: Write PAGE_MAX_TRX_ID to the redo log. Otherwise,
transactions that are started before the rollback of incomplete
transactions has finished may have an inconsistent view of the
secondary indexes.
dict_index_is_sec_or_ibuf(): Auxiliary function for controlling
updates and checks of PAGE_MAX_TRX_ID: check whether an index is a
secondary index or the insert buffer tree.
page_set_max_trx_id(), page_update_max_trx_id(),
lock_rec_insert_check_and_lock(),
lock_sec_rec_modify_check_and_lock(), btr_cur_ins_lock_and_undo(),
btr_cur_upd_lock_and_undo(): Add the parameter mtr.
page_set_max_trx_id(): Allow mtr to be NULL. When mtr==NULL, do not
attempt to write to the redo log. This only occurs when creating a
page or reorganizing a compressed page. In these cases, the
PAGE_MAX_TRX_ID will be set correctly during the application of redo
log records, even though there is no explicit log record about it.
btr_discard_only_page_on_level(): Preserve PAGE_MAX_TRX_ID. This
function should be unreachable, though.
btr_cur_pessimistic_update(): Update PAGE_MAX_TRX_ID.
Add some assertions for checking that PAGE_MAX_TRX_ID is set on all
secondary index leaf pages.
rb://115 tested by Michael, fixes Issue #211
------------------------------------------------------------------------
r5039 | marko | 2009-05-19 23:13:12 +0300 (Tue, 19 May 2009) | 1 line
branches/zip: ib_wqueue_wait(): Add decorative comment.
------------------------------------------------------------------------
r5041 | marko | 2009-05-20 08:42:12 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: Add missing function comments.
------------------------------------------------------------------------
r5042 | marko | 2009-05-20 08:46:01 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: sync0rw.ic: Remove an extra ; that was added in r5041.
------------------------------------------------------------------------
r5044 | marko | 2009-05-20 11:11:58 +0300 (Wed, 20 May 2009) | 2 lines
branches/zip: mlog_parse_index(): Correct a parameter comment
and add a const qualifier that was missing.
------------------------------------------------------------------------
r5045 | marko | 2009-05-20 11:37:08 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: fil0fil.c: Correct some comments.
------------------------------------------------------------------------
r5046 | marko | 2009-05-20 12:19:40 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: Fix some function comments.
------------------------------------------------------------------------
r5047 | marko | 2009-05-20 12:26:49 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: ut_snprintf(): Fix the function comments.
------------------------------------------------------------------------
r5048 | marko | 2009-05-20 12:28:44 +0300 (Wed, 20 May 2009) | 3 lines
branches/zip: inno_bcmp(): Remove this memcmp replacement.
srv0start.c does not (any longer) call memcmp.
srv_parse_megabytes(): Add a function comment.
------------------------------------------------------------------------
r5052 | marko | 2009-05-20 12:32:37 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: ib_vector_is_empty(): Fix the function comment.
------------------------------------------------------------------------
r5054 | marko | 2009-05-20 12:35:33 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: page_cur_lcg_prng(): Add missing parameter list.
------------------------------------------------------------------------
r5057 | marko | 2009-05-20 12:45:17 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: Remove bogus in: comments from struct members.
------------------------------------------------------------------------
r5058 | marko | 2009-05-20 13:06:03 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: Clean up some function comments.
------------------------------------------------------------------------
r5060 | marko | 2009-05-20 14:06:59 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: Clean up some comments.
------------------------------------------------------------------------
r5061 | marko | 2009-05-20 14:07:49 +0300 (Wed, 20 May 2009) | 2 lines
branches/zip: innodb_export_status(): Remove the return(0),
now that the function was declared void in r5060.
------------------------------------------------------------------------
r5062 | marko | 2009-05-20 14:45:03 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: ha_innodb.cc: Clean up some comments.
------------------------------------------------------------------------
r5063 | marko | 2009-05-20 16:10:17 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: ut_dulint_sort(): Write proper comments.
------------------------------------------------------------------------
r5064 | marko | 2009-05-20 16:17:26 +0300 (Wed, 20 May 2009) | 2 lines
branches/zip: innobase_end(), innobase_flush_logs():
Document the function parameters.
------------------------------------------------------------------------
r5065 | marko | 2009-05-20 23:17:43 +0300 (Wed, 20 May 2009) | 1 line
branches/zip: ha_innodb.cc: Add some missing function comments.
------------------------------------------------------------------------
r5066 | marko | 2009-05-21 00:51:23 +0300 (Thu, 21 May 2009) | 2 lines
branches/zip: Fix some function comments.
------------------------------------------------------------------------
r5070 | vasil | 2009-05-21 08:27:00 +0300 (Thu, 21 May 2009) | 4 lines
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
2009-05-25 06:20:53 +00:00
|
|
|
"InnoDB: " REFMAN "innodb-troubleshooting.html\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: how you can resolve the problem.\n",
|
|
|
|
prebuilt->table->name);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2011-04-05 10:18:43 +03:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
return(DB_ERROR);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 4528:4657 from branches/zip:
------------------------------------------------------------------------
r4530 | marko | 2009-03-24 14:02:29 +0200 (Tue, 24 Mar 2009) | 3 lines
branches/zip: Remove references to UNIV_HOTBACKUP from files that are
not used when building InnoDB Hot Backup. Declare
innobase_invalidate_query_cache() in ha_prototypes.h.
------------------------------------------------------------------------
r4531 | marko | 2009-03-24 15:46:12 +0200 (Tue, 24 Mar 2009) | 7 lines
branches/zip: Note that buf_page_t::list and buf_page_t::in_flush_list
are only protected by buf_pool_mutex, not by the block mutex.
buf_page_release(): Remove the assertion on in_flush_list.
The function is only holding block->mutex, not buf_pool_mutex.
This was reported by Sunny. This was the only piece of code
that accessed in_flush_list while not holding buf_pool_mutex.
------------------------------------------------------------------------
r4532 | calvin | 2009-03-24 17:59:45 +0200 (Tue, 24 Mar 2009) | 13 lines
branches/zip: Mantis issue #201 - remove innodb_plugin_init() due to
new option --ignore_builtin_innodb
Starting 5.1.33, MySQL has a new option --ignore_builtin_innodb
for using the dynamic plugin. It is required to remove
innodb_plugin_init() in the plugin.
This patch removes innodb_plugin_init() as well as functions,
variables used by innodb_plugin_init().
rb://98
Approved by: Marko
------------------------------------------------------------------------
r4543 | inaam | 2009-03-25 19:18:33 +0200 (Wed, 25 Mar 2009) | 17 lines
branches/zip
SHOW ENGINE INNODB MUTEX shows all mutexes and rw_locks. This can
be overwhelming particularly when the buffer pool is very large
(note that each block in buffer pool has at least one mutex, one
rw_lock and an additional mutex if rw_lock does not use atomics).
With this patch status of following mutexes and rw-locks is not shown:
1) block->mutex
2) block->lock
3) block->lock->mutex (if applicable)
4) All other mutexes and rw-locks for which number of os-waits are zero
Addresses issue# 179 rb://99
Approved by: Marko
------------------------------------------------------------------------
r4579 | marko | 2009-03-31 10:40:58 +0300 (Tue, 31 Mar 2009) | 3 lines
branches/zip: struct read_view_struct: Add clarifying comments about
low_limit_id and up_limit_id.
------------------------------------------------------------------------
r4630 | calvin | 2009-04-02 15:46:47 +0300 (Thu, 02 Apr 2009) | 6 lines
branches/zip: Mantis issue #197 - Make srv_spin_wait_delay configurable
New parameter innodb_spin_wait_delay to set the maximum delay between
polling for a spin lock. 5 is the default.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r4631 | marko | 2009-04-02 16:23:12 +0300 (Thu, 02 Apr 2009) | 24 lines
branches/zip: Refuse to use newly created indexes that may lack
history. This addresses Mantis issue #116.
dict_index_t: Enable the storage of trx_id.
row_prebuilt_t: Make many fields bit-fields to reduce the memory
footprint. Add index_usable.
ha_innobase::change_active_index(): Check if the index is usable and
set prebuilt->index_usable accordingly. Unfortunately, the return
status of this function is ignored by MySQL, and the actual refusal to
use the index must be made in row_search_for_mysql().
row_search_for_mysql(): Return DB_MISSING_HISTORY if
!prebuilt->index_usable.
convert_error_code_to_mysql(): Map DB_MISSING_HISTORY to
HA_ERR_TABLE_DEF_CHANGED.
innodb-index.test: Add a test case where access to a newly created
secondary index must be blocked for old transactions.
rb://100 approved by Heikki Tuuri
------------------------------------------------------------------------
r4647 | vasil | 2009-04-06 10:05:25 +0300 (Mon, 06 Apr 2009) | 4 lines
branches/zip:
Add changelog entry for c4630.
------------------------------------------------------------------------
r4648 | vasil | 2009-04-06 10:07:26 +0300 (Mon, 06 Apr 2009) | 4 lines
branches/zip:
Fix formatting in ChangeLog to be consistent.
------------------------------------------------------------------------
r4657 | marko | 2009-04-06 15:13:45 +0300 (Mon, 06 Apr 2009) | 1 line
branches/zip: Remove the bogus failure reported in Issue #219.
------------------------------------------------------------------------
2009-04-06 11:18:22 +00:00
|
|
|
if (UNIV_UNLIKELY(!prebuilt->index_usable)) {
|
|
|
|
|
2011-04-05 10:18:43 +03:00
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
branches/innodb+: Merge revisions 4528:4657 from branches/zip:
------------------------------------------------------------------------
r4530 | marko | 2009-03-24 14:02:29 +0200 (Tue, 24 Mar 2009) | 3 lines
branches/zip: Remove references to UNIV_HOTBACKUP from files that are
not used when building InnoDB Hot Backup. Declare
innobase_invalidate_query_cache() in ha_prototypes.h.
------------------------------------------------------------------------
r4531 | marko | 2009-03-24 15:46:12 +0200 (Tue, 24 Mar 2009) | 7 lines
branches/zip: Note that buf_page_t::list and buf_page_t::in_flush_list
are only protected by buf_pool_mutex, not by the block mutex.
buf_page_release(): Remove the assertion on in_flush_list.
The function is only holding block->mutex, not buf_pool_mutex.
This was reported by Sunny. This was the only piece of code
that accessed in_flush_list while not holding buf_pool_mutex.
------------------------------------------------------------------------
r4532 | calvin | 2009-03-24 17:59:45 +0200 (Tue, 24 Mar 2009) | 13 lines
branches/zip: Mantis issue #201 - remove innodb_plugin_init() due to
new option --ignore_builtin_innodb
Starting 5.1.33, MySQL has a new option --ignore_builtin_innodb
for using the dynamic plugin. It is required to remove
innodb_plugin_init() in the plugin.
This patch removes innodb_plugin_init() as well as functions,
variables used by innodb_plugin_init().
rb://98
Approved by: Marko
------------------------------------------------------------------------
r4543 | inaam | 2009-03-25 19:18:33 +0200 (Wed, 25 Mar 2009) | 17 lines
branches/zip
SHOW ENGINE INNODB MUTEX shows all mutexes and rw_locks. This can
be overwhelming particularly when the buffer pool is very large
(note that each block in buffer pool has at least one mutex, one
rw_lock and an additional mutex if rw_lock does not use atomics).
With this patch status of following mutexes and rw-locks is not shown:
1) block->mutex
2) block->lock
3) block->lock->mutex (if applicable)
4) All other mutexes and rw-locks for which number of os-waits are zero
Addresses issue# 179 rb://99
Approved by: Marko
------------------------------------------------------------------------
r4579 | marko | 2009-03-31 10:40:58 +0300 (Tue, 31 Mar 2009) | 3 lines
branches/zip: struct read_view_struct: Add clarifying comments about
low_limit_id and up_limit_id.
------------------------------------------------------------------------
r4630 | calvin | 2009-04-02 15:46:47 +0300 (Thu, 02 Apr 2009) | 6 lines
branches/zip: Mantis issue #197 - Make srv_spin_wait_delay configurable
New parameter innodb_spin_wait_delay to set the maximum delay between
polling for a spin lock. 5 is the default.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r4631 | marko | 2009-04-02 16:23:12 +0300 (Thu, 02 Apr 2009) | 24 lines
branches/zip: Refuse to use newly created indexes that may lack
history. This addresses Mantis issue #116.
dict_index_t: Enable the storage of trx_id.
row_prebuilt_t: Make many fields bit-fields to reduce the memory
footprint. Add index_usable.
ha_innobase::change_active_index(): Check if the index is usable and
set prebuilt->index_usable accordingly. Unfortunately, the return
status of this function is ignored by MySQL, and the actual refusal to
use the index must be made in row_search_for_mysql().
row_search_for_mysql(): Return DB_MISSING_HISTORY if
!prebuilt->index_usable.
convert_error_code_to_mysql(): Map DB_MISSING_HISTORY to
HA_ERR_TABLE_DEF_CHANGED.
innodb-index.test: Add a test case where access to a newly created
secondary index must be blocked for old transactions.
rb://100 approved by Heikki Tuuri
------------------------------------------------------------------------
r4647 | vasil | 2009-04-06 10:05:25 +0300 (Mon, 06 Apr 2009) | 4 lines
branches/zip:
Add changelog entry for c4630.
------------------------------------------------------------------------
r4648 | vasil | 2009-04-06 10:07:26 +0300 (Mon, 06 Apr 2009) | 4 lines
branches/zip:
Fix formatting in ChangeLog to be consistent.
------------------------------------------------------------------------
r4657 | marko | 2009-04-06 15:13:45 +0300 (Mon, 06 Apr 2009) | 1 line
branches/zip: Remove the bogus failure reported in Issue #219.
------------------------------------------------------------------------
2009-04-06 11:18:22 +00:00
|
|
|
return(DB_MISSING_HISTORY);
|
|
|
|
}
|
|
|
|
|
2011-08-16 18:07:59 -07:00
|
|
|
if (dict_index_is_corrupted(index)) {
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
|
|
|
return(DB_CORRUPTION);
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_UNLIKELY(prebuilt->magic_n != ROW_PREBUILT_ALLOCATED)) {
|
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Error: trying to free a corrupt\n"
|
|
|
|
"InnoDB: table handle. Magic n %lu, table name ",
|
|
|
|
(ulong) prebuilt->magic_n);
|
2006-06-13 20:23:26 +00:00
|
|
|
ut_print_name(stderr, trx, TRUE, prebuilt->table->name);
|
2005-10-27 07:29:40 +00:00
|
|
|
putc('\n', stderr);
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
mem_analyze_corruption(prebuilt);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
#if 0
|
|
|
|
/* August 19, 2005 by Heikki: temporarily disable this error
|
|
|
|
print until the cursor lock count is done correctly.
|
|
|
|
See bugs #12263 and #12456!*/
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (trx->n_mysql_tables_in_use == 0
|
2006-08-29 09:30:31 +00:00
|
|
|
&& UNIV_UNLIKELY(prebuilt->select_lock_type == LOCK_NONE)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Note that if MySQL uses an InnoDB temp table that it
|
|
|
|
created inside LOCK TABLES, then n_mysql_tables_in_use can
|
|
|
|
be zero; in that case select_lock_type is set to LOCK_X in
|
|
|
|
::start_stmt. */
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
fputs("InnoDB: Error: MySQL is trying to perform a SELECT\n"
|
|
|
|
"InnoDB: but it has not locked"
|
|
|
|
" any tables in ::external_lock()!\n",
|
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_print(stderr, trx, 600);
|
2006-02-23 19:25:29 +00:00
|
|
|
fputc('\n', stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-08-29 09:30:31 +00:00
|
|
|
#endif
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
#if 0
|
|
|
|
fprintf(stderr, "Match mode %lu\n search tuple ",
|
|
|
|
(ulong) match_mode);
|
2005-10-27 07:29:40 +00:00
|
|
|
dtuple_print(search_tuple);
|
2006-08-29 09:30:31 +00:00
|
|
|
fprintf(stderr, "N tables locked %lu\n",
|
|
|
|
(ulong) trx->mysql_n_tables_locked);
|
|
|
|
#endif
|
2005-10-27 07:29:40 +00:00
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 0: Release a possible s-latch we are holding on the
|
|
|
|
adaptive hash index latch if there is someone waiting behind */
|
|
|
|
|
branches/innodb+: Merge revisions 4072:4150 from branches/zip:
------------------------------------------------------------------------
r4074 | vasil | 2009-01-31 08:05:24 +0200 (Sat, 31 Jan 2009) | 4 lines
branches/zip:
Adjust the failing patch patches/information_schema.diff.
------------------------------------------------------------------------
r4076 | vasil | 2009-02-02 09:32:04 +0200 (Mon, 02 Feb 2009) | 4 lines
branches/zip:
Add ChangeLog entry for the change in r4072.
------------------------------------------------------------------------
r4077 | marko | 2009-02-02 10:48:05 +0200 (Mon, 02 Feb 2009) | 2 lines
branches/zip: innobase_start_or_create_for_mysql(): Remove a factual error
in the function comment. Parameters are not read from a file "srv_init".
------------------------------------------------------------------------
r4081 | marko | 2009-02-02 14:28:17 +0200 (Mon, 02 Feb 2009) | 4 lines
branches/zip: Enclose some backup functions in #ifdef UNIV_HOTBACKUP.
recv_read_cp_info_for_backup(), recv_scan_log_seg_for_backup():
These functions are only called by InnoDB Hot Backup.
------------------------------------------------------------------------
r4082 | vasil | 2009-02-02 18:24:08 +0200 (Mon, 02 Feb 2009) | 10 lines
branches/zip:
Fix a mysql-test failure in innodb-zip:
main.innodb-zip [ fail ]
Test ended at 2009-02-02 18:13:25
CURRENT_TEST: main.innodb-zip
mysqltest: At line 160: Found line beginning with -- that didn't contain a valid mysqltest command, check your syntax or use # if you intended to write a comment
------------------------------------------------------------------------
r4083 | vasil | 2009-02-02 18:33:20 +0200 (Mon, 02 Feb 2009) | 6 lines
branches/zip:
Fix the failing innodb-zip test to restore the environment as it was before
the test execution because a newly added feature in the mysql-test framework
does check for this.
------------------------------------------------------------------------
r4088 | calvin | 2009-02-03 02:35:56 +0200 (Tue, 03 Feb 2009) | 8 lines
branches/zip: fix a compiler error and a warning
Both are minor changes:
1) Compiler error introduced in r4072: double ';' at the end.
2) Warning introduced in r3613: \mem\mem0pool.c(481) :
warning C4098: 'mem_area_free' : 'void' function returning a value
Approved by: Sunny (IM)
------------------------------------------------------------------------
r4098 | marko | 2009-02-03 09:52:45 +0200 (Tue, 03 Feb 2009) | 4 lines
branches/zip: mem_area_free(): Correct a bug that was introduced in r4088.
free() is not the same as ut_free(). ut_free() pairs with ut_malloc(),
not malloc(). free() pairs with malloc() and some other functions.
------------------------------------------------------------------------
r4114 | marko | 2009-02-04 16:09:24 +0200 (Wed, 04 Feb 2009) | 2 lines
branches/zip: buf_block_align(): Fix a bogus debug assertion
that was introduced in r4036, to address Issue #161.
------------------------------------------------------------------------
r4139 | vasil | 2009-02-09 13:47:16 +0200 (Mon, 09 Feb 2009) | 5 lines
branches/zip:
Remove mysql-test/patches/bug35261.diff because that bug has been fixed
in the MySQL repository.
------------------------------------------------------------------------
r4141 | marko | 2009-02-09 15:35:50 +0200 (Mon, 09 Feb 2009) | 1 line
branches/zip: fil_write_lsn_and_arch_no_to_file(): Plug a memory leak.
------------------------------------------------------------------------
r4144 | inaam | 2009-02-10 01:36:25 +0200 (Tue, 10 Feb 2009) | 9 lines
branches/zip rb://30
This patch changes the innodb mutexes and rw_locks implementation.
On supported platforms it uses GCC builtin atomics. These changes
are based on the patch sent by Mark Callaghan of Google under BSD
license. More technical discussion can be found at rb://30
Approved by: Heikki
------------------------------------------------------------------------
r4145 | vasil | 2009-02-10 07:34:43 +0200 (Tue, 10 Feb 2009) | 9 lines
branches/zip:
Non-functional change: Fix a compilation warning introduced in r4144:
gcc -DHAVE_CONFIG_H -I. -I../../include -I../../include -I../../include -I../../regex -I../../storage/innobase/include -I../../sql -I. -Werror -Wall -g -MT libinnobase_a-sync0arr.o -MD -MP -MF .deps/libinnobase_a-sync0arr.Tpo -c -o libinnobase_a-sync0arr.o `test -f 'sync/sync0arr.c' || echo './'`sync/sync0arr.c
cc1: warnings being treated as errors
sync/sync0arr.c: In function 'sync_array_object_signalled':
sync/sync0arr.c:869: warning: pointer targets in passing argument 1 of 'os_atomic_increment' differ in signedness
------------------------------------------------------------------------
r4148 | marko | 2009-02-10 10:38:41 +0200 (Tue, 10 Feb 2009) | 12 lines
branches/zip: Map ut_malloc(), ut_realloc(), ut_free() to
malloc(), realloc(), free() when innodb_use_sys_malloc is set.
ut_free_all_mem(): If innodb_use_sys_malloc is set, do nothing,
because then ut_mem_block_list_inited will never be set.
log_init(): Use mem_alloc() instead of ut_malloc(), so that the
memory will be freed. (Tested with Valgrind, although it is not
clear why the memory would be freed.)
rb://86 approved by Heikki Tuuri and Ken Jacobs. This addresses Issue #168.
------------------------------------------------------------------------
r4149 | marko | 2009-02-10 11:09:15 +0200 (Tue, 10 Feb 2009) | 1 line
branches/zip: ChangeLog: Document recent changes.
------------------------------------------------------------------------
r4150 | marko | 2009-02-10 11:51:43 +0200 (Tue, 10 Feb 2009) | 6 lines
branches/zip: get_share(), free_share(): Make table locking case sensitive.
If lower_case_table_names=1, MySQL will pass the table names in lower case.
Thus, we can use a binary comparison (strcmp) in the hash table.
rb://87 approved by Heikki Tuuri, to address Bug #41676 and Issue #167.
------------------------------------------------------------------------
2009-02-10 10:03:42 +00:00
|
|
|
if (UNIV_UNLIKELY(rw_lock_get_writer(&btr_search_latch) != RW_LOCK_NOT_LOCKED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& trx->has_search_latch) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* There is an x-latch request on the adaptive hash index:
|
|
|
|
release the s-latch to reduce starvation and wait for
|
|
|
|
BTR_SEA_TIMEOUT rounds before trying to keep it again over
|
|
|
|
calls from MySQL */
|
|
|
|
|
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
|
|
|
trx->has_search_latch = FALSE;
|
|
|
|
|
|
|
|
trx->search_latch_timeout = BTR_SEA_TIMEOUT;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-02-17 14:19:39 +00:00
|
|
|
/* Reset the new record lock info if srv_locks_unsafe_for_binlog
|
2006-04-12 09:32:17 +00:00
|
|
|
is set or session is using a READ COMMITED isolation level. Then
|
|
|
|
we are able to remove the record locks set here on an individual
|
|
|
|
row. */
|
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
|
|
|
prebuilt->new_rec_locks = 0;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 1: Try to pop the row from the prefetch cache */
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(direction == 0)) {
|
|
|
|
trx->op_info = "starting index read";
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
prebuilt->n_rows_fetched = 0;
|
|
|
|
prebuilt->n_fetch_cached = 0;
|
|
|
|
prebuilt->fetch_cache_first = 0;
|
|
|
|
|
|
|
|
if (prebuilt->sel_graph == NULL) {
|
|
|
|
/* Build a dummy select query graph */
|
|
|
|
row_prebuild_sel_graph(prebuilt);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
trx->op_info = "fetching rows";
|
|
|
|
|
|
|
|
if (prebuilt->n_rows_fetched == 0) {
|
|
|
|
prebuilt->fetch_direction = direction;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(direction != prebuilt->fetch_direction)) {
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->n_fetch_cached > 0)) {
|
|
|
|
ut_error;
|
|
|
|
/* TODO: scrollable cursor: restore cursor to
|
|
|
|
the place of the latest returned row,
|
|
|
|
or better: prevent caching for a scroll
|
|
|
|
cursor! */
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
prebuilt->n_rows_fetched = 0;
|
|
|
|
prebuilt->n_fetch_cached = 0;
|
|
|
|
prebuilt->fetch_cache_first = 0;
|
|
|
|
|
|
|
|
} else if (UNIV_LIKELY(prebuilt->n_fetch_cached > 0)) {
|
|
|
|
row_sel_pop_cached_row_for_mysql(buf, prebuilt);
|
|
|
|
|
|
|
|
prebuilt->n_rows_fetched++;
|
|
|
|
|
|
|
|
srv_n_rows_read++;
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prebuilt->fetch_cache_first > 0
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->fetch_cache_first < MYSQL_FETCH_CACHE_SIZE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* The previous returned row was popped from the fetch
|
|
|
|
cache, but the cache was not full at the time of the
|
|
|
|
popping: no more rows can exist in the result set */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
prebuilt->n_rows_fetched++;
|
|
|
|
|
|
|
|
if (prebuilt->n_rows_fetched > 1000000000) {
|
|
|
|
/* Prevent wrap-over */
|
|
|
|
prebuilt->n_rows_fetched = 500000000;
|
|
|
|
}
|
|
|
|
|
|
|
|
mode = pcur->search_mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* In a search where at most one record in the index may match, we
|
2006-08-29 09:30:31 +00:00
|
|
|
can use a LOCK_REC_NOT_GAP type record lock when locking a
|
|
|
|
non-delete-marked matching record.
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
Note that in a unique secondary index there may be different
|
|
|
|
delete-marked versions of a record where only the primary key
|
|
|
|
values differ: thus in a secondary index we must use next-key
|
|
|
|
locks when locking delete-marked records. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (match_mode == ROW_SEL_EXACT
|
2007-04-16 09:21:39 +00:00
|
|
|
&& dict_index_is_unique(index)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& dtuple_get_n_fields(search_tuple)
|
|
|
|
== dict_index_get_n_unique(index)
|
|
|
|
&& (dict_index_is_clust(index)
|
|
|
|
|| !dtuple_contains_null(search_tuple))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Note above that a UNIQUE secondary index can contain many
|
|
|
|
rows with the same key value if one of the columns is the SQL
|
|
|
|
null. A clustered index under MySQL can never contain null
|
|
|
|
columns because we demand that all the columns in primary key
|
|
|
|
are non-null. */
|
|
|
|
|
|
|
|
unique_search = TRUE;
|
|
|
|
|
|
|
|
/* Even if the condition is unique, MySQL seems to try to
|
|
|
|
retrieve also a second row if a primary key contains more than
|
|
|
|
1 column. Return immediately if this is not a HANDLER
|
|
|
|
command. */
|
|
|
|
|
2006-08-29 09:30:31 +00:00
|
|
|
if (UNIV_UNLIKELY(direction != 0
|
|
|
|
&& !prebuilt->used_in_HANDLER)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 2: Try fast adaptive hash index search if possible */
|
|
|
|
|
|
|
|
/* Next test if this is the special case where we can use the fast
|
|
|
|
adaptive hash index to try the search. Since we must release the
|
|
|
|
search system latch when we retrieve an externally stored field, we
|
|
|
|
cannot use the adaptive hash index in a search in the case the row
|
|
|
|
may be long and there may be externally stored fields */
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(direction == 0)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& unique_search
|
|
|
|
&& dict_index_is_clust(index)
|
|
|
|
&& !prebuilt->templ_contains_blob
|
|
|
|
&& !prebuilt->used_in_HANDLER
|
|
|
|
&& (prebuilt->mysql_row_len < UNIV_PAGE_SIZE / 8)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
mode = PAGE_CUR_GE;
|
|
|
|
|
|
|
|
unique_search_from_clust_index = TRUE;
|
|
|
|
|
|
|
|
if (trx->mysql_n_tables_locked == 0
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type == LOCK_NONE
|
|
|
|
&& trx->isolation_level > TRX_ISO_READ_UNCOMMITTED
|
|
|
|
&& trx->read_view) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* This is a SELECT query done as a consistent read,
|
|
|
|
and the read view has already been allocated:
|
|
|
|
let us try a search shortcut through the hash
|
|
|
|
index.
|
|
|
|
NOTE that we must also test that
|
|
|
|
mysql_n_tables_locked == 0, because this might
|
|
|
|
also be INSERT INTO ... SELECT ... or
|
|
|
|
CREATE TABLE ... SELECT ... . Our algorithm is
|
|
|
|
NOT prepared to inserts interleaved with the SELECT,
|
|
|
|
and if we try that, we can deadlock on the adaptive
|
|
|
|
hash index semaphore! */
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
#ifndef UNIV_SEARCH_DEBUG
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!trx->has_search_latch) {
|
|
|
|
rw_lock_s_lock(&btr_search_latch);
|
|
|
|
trx->has_search_latch = TRUE;
|
|
|
|
}
|
|
|
|
#endif
|
2006-09-19 10:14:07 +00:00
|
|
|
switch (row_sel_try_search_shortcut_for_mysql(
|
|
|
|
&rec, prebuilt, &offsets, &heap,
|
|
|
|
&mtr)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
case SEL_FOUND:
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
|
|
|
ut_a(0 == cmp_dtuple_rec(search_tuple,
|
2006-08-29 09:30:31 +00:00
|
|
|
rec, offsets));
|
2006-02-23 19:25:29 +00:00
|
|
|
#endif
|
2008-01-11 19:59:47 +00:00
|
|
|
/* At this point, rec is protected by
|
|
|
|
a page latch that was acquired by
|
|
|
|
row_sel_try_search_shortcut_for_mysql().
|
|
|
|
The latch will not be released until
|
|
|
|
mtr_commit(&mtr). */
|
2010-08-18 14:40:02 +03:00
|
|
|
ut_ad(!rec_get_deleted_flag(rec, comp));
|
2008-01-11 19:59:47 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (!row_sel_store_mysql_rec(buf, prebuilt,
|
2010-10-19 08:58:53 +03:00
|
|
|
rec, FALSE,
|
|
|
|
offsets)) {
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
/* Only fresh inserts may contain
|
2010-06-29 16:19:07 +03:00
|
|
|
incomplete externally stored
|
|
|
|
columns. Pretend that such
|
|
|
|
records do not exist. Such
|
|
|
|
records may only be accessed
|
|
|
|
at the READ UNCOMMITTED
|
|
|
|
isolation level or when
|
|
|
|
rolling back a recovered
|
|
|
|
transaction. Rollback happens
|
|
|
|
at a lower level, not here. */
|
|
|
|
ut_a(trx->isolation_level
|
|
|
|
== TRX_ISO_READ_UNCOMMITTED);
|
|
|
|
|
2010-06-30 12:55:10 +03:00
|
|
|
/* Proceed as in case SEL_RETRY. */
|
|
|
|
break;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* ut_print_name(stderr, index->name);
|
|
|
|
fputs(" shortcut\n", stderr); */
|
|
|
|
|
|
|
|
srv_n_rows_read++;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
err = DB_SUCCESS;
|
2006-07-04 11:55:26 +00:00
|
|
|
goto release_search_latch_if_needed;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
case SEL_EXHAUSTED:
|
2006-02-23 19:25:29 +00:00
|
|
|
mtr_commit(&mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* ut_print_name(stderr, index->name);
|
|
|
|
fputs(" record not found 2\n", stderr); */
|
|
|
|
|
2006-07-04 11:55:26 +00:00
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
release_search_latch_if_needed:
|
2005-10-27 07:29:40 +00:00
|
|
|
if (trx->search_latch_timeout > 0
|
2006-08-29 09:30:31 +00:00
|
|
|
&& trx->has_search_latch) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
trx->search_latch_timeout--;
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
2005-10-27 07:29:40 +00:00
|
|
|
trx->has_search_latch = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE that we do NOT store the cursor
|
|
|
|
position */
|
|
|
|
goto func_exit;
|
2006-07-04 11:55:26 +00:00
|
|
|
|
|
|
|
case SEL_RETRY:
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
ut_ad(0);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2010-06-30 12:55:10 +03:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_commit(&mtr);
|
|
|
|
mtr_start(&mtr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 3: Open or restore index cursor position */
|
|
|
|
|
|
|
|
if (trx->has_search_latch) {
|
|
|
|
rw_lock_s_unlock(&btr_search_latch);
|
|
|
|
trx->has_search_latch = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-06-01 14:40:15 +03:00
|
|
|
ut_ad(prebuilt->sql_stat_start || trx->conc_state == TRX_ACTIVE);
|
|
|
|
ut_ad(trx->conc_state == TRX_NOT_STARTED
|
|
|
|
|| trx->conc_state == TRX_ACTIVE);
|
|
|
|
ut_ad(prebuilt->sql_stat_start
|
|
|
|
|| prebuilt->select_lock_type != LOCK_NONE
|
|
|
|
|| trx->read_view);
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx_start_if_not_started(trx);
|
|
|
|
|
|
|
|
if (trx->isolation_level <= TRX_ISO_READ_COMMITTED
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE
|
2008-05-14 15:43:19 +00:00
|
|
|
&& trx->mysql_thd != NULL
|
2008-09-17 19:52:30 +00:00
|
|
|
&& thd_is_select(trx->mysql_thd)) {
|
|
|
|
/* It is a plain locking SELECT and the isolation
|
|
|
|
level is low: do not lock gaps */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-09-17 19:52:30 +00:00
|
|
|
set_also_gap_locks = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Note that if the search mode was GE or G, then the cursor
|
|
|
|
naturally moves upward (in fetch next) in alphabetical order,
|
|
|
|
otherwise downward */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_UNLIKELY(direction == 0)) {
|
|
|
|
if (mode == PAGE_CUR_GE || mode == PAGE_CUR_G) {
|
|
|
|
moves_up = TRUE;
|
|
|
|
}
|
|
|
|
} else if (direction == ROW_SEL_NEXT) {
|
|
|
|
moves_up = TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
thr = que_fork_get_first_thr(prebuilt->sel_graph);
|
|
|
|
|
|
|
|
que_thr_move_to_run_state_for_mysql(thr, trx);
|
|
|
|
|
|
|
|
clust_index = dict_table_get_first_index(index->table);
|
|
|
|
|
2010-10-04 13:38:05 +03:00
|
|
|
/* Do some start-of-statement preparations */
|
|
|
|
|
|
|
|
if (!prebuilt->sql_stat_start) {
|
|
|
|
/* No need to set an intention lock or assign a read view */
|
|
|
|
|
|
|
|
if (trx->read_view == NULL
|
|
|
|
&& prebuilt->select_lock_type == LOCK_NONE) {
|
|
|
|
|
|
|
|
fputs("InnoDB: Error: MySQL is trying to"
|
|
|
|
" perform a consistent read\n"
|
|
|
|
"InnoDB: but the read view is not assigned!\n",
|
|
|
|
stderr);
|
|
|
|
trx_print(stderr, trx, 600);
|
|
|
|
fputc('\n', stderr);
|
|
|
|
ut_error;
|
|
|
|
}
|
|
|
|
} else if (prebuilt->select_lock_type == LOCK_NONE) {
|
|
|
|
/* This is a consistent read */
|
|
|
|
/* Assign a read view for the query */
|
|
|
|
|
|
|
|
trx_assign_read_view(trx);
|
|
|
|
prebuilt->sql_stat_start = FALSE;
|
|
|
|
} else {
|
2010-10-11 05:36:13 -07:00
|
|
|
wait_table_again:
|
2010-10-04 13:38:05 +03:00
|
|
|
err = lock_table(0, index->table,
|
|
|
|
prebuilt->select_lock_type == LOCK_S
|
|
|
|
? LOCK_IS : LOCK_IX, thr);
|
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
2010-10-11 05:36:13 -07:00
|
|
|
table_lock_waited = TRUE;
|
|
|
|
goto lock_table_wait;
|
2010-10-04 13:38:05 +03:00
|
|
|
}
|
|
|
|
prebuilt->sql_stat_start = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open or restore index cursor position */
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_LIKELY(direction != 0)) {
|
2006-09-19 10:14:07 +00:00
|
|
|
ibool need_to_process = sel_restore_position_for_mysql(
|
|
|
|
&same_user_rec, BTR_SEARCH_LEAF,
|
|
|
|
pcur, moves_up, &mtr);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(need_to_process)) {
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->row_read_type
|
2006-08-29 09:30:31 +00:00
|
|
|
== ROW_READ_DID_SEMI_CONSISTENT)) {
|
2006-02-17 14:19:39 +00:00
|
|
|
/* We did a semi-consistent read,
|
|
|
|
but the record was removed in
|
|
|
|
the meantime. */
|
|
|
|
prebuilt->row_read_type
|
|
|
|
= ROW_READ_TRY_SEMI_CONSISTENT;
|
|
|
|
}
|
|
|
|
} else if (UNIV_LIKELY(prebuilt->row_read_type
|
2006-08-29 09:30:31 +00:00
|
|
|
!= ROW_READ_DID_SEMI_CONSISTENT)) {
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
/* The cursor was positioned on the record
|
|
|
|
that we returned previously. If we need
|
|
|
|
to repeat a semi-consistent read as a
|
|
|
|
pessimistic locking read, the record
|
|
|
|
cannot be skipped. */
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (dtuple_get_n_fields(search_tuple) > 0) {
|
|
|
|
|
|
|
|
btr_pcur_open_with_no_init(index, search_tuple, mode,
|
2006-08-29 09:30:31 +00:00
|
|
|
BTR_SEARCH_LEAF,
|
|
|
|
pcur, 0, &mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
pcur->trx_if_known = trx;
|
2007-05-14 09:07:15 +00:00
|
|
|
|
|
|
|
rec = btr_pcur_get_rec(pcur);
|
|
|
|
|
|
|
|
if (!moves_up
|
|
|
|
&& !page_rec_is_supremum(rec)
|
|
|
|
&& set_also_gap_locks
|
|
|
|
&& !(srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED)
|
2007-05-14 09:07:15 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE) {
|
|
|
|
|
|
|
|
/* Try to place a gap lock on the next index record
|
|
|
|
to prevent phantoms in ORDER BY ... DESC queries */
|
2008-05-14 15:43:19 +00:00
|
|
|
const rec_t* next = page_rec_get_next_const(rec);
|
2007-05-14 09:07:15 +00:00
|
|
|
|
2008-05-14 15:43:19 +00:00
|
|
|
offsets = rec_get_offsets(next, index, offsets,
|
2007-05-14 09:07:15 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
|
|
|
err = sel_set_rec_lock(btr_pcur_get_block(pcur),
|
2008-05-14 15:43:19 +00:00
|
|
|
next, index, offsets,
|
2007-05-14 09:07:15 +00:00
|
|
|
prebuilt->select_lock_type,
|
|
|
|
LOCK_GAP, thr);
|
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2007-05-14 09:07:15 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
if (mode == PAGE_CUR_G) {
|
2006-09-19 10:14:07 +00:00
|
|
|
btr_pcur_open_at_index_side(
|
|
|
|
TRUE, index, BTR_SEARCH_LEAF, pcur, FALSE,
|
|
|
|
&mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
} else if (mode == PAGE_CUR_L) {
|
2006-09-19 10:14:07 +00:00
|
|
|
btr_pcur_open_at_index_side(
|
|
|
|
FALSE, index, BTR_SEARCH_LEAF, pcur, FALSE,
|
|
|
|
&mtr);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
rec_loop:
|
2013-01-14 10:49:51 +05:30
|
|
|
DEBUG_SYNC_C("row_search_rec_loop");
|
2012-10-15 09:49:50 +05:30
|
|
|
if (trx_is_interrupted(trx)) {
|
2013-01-14 10:49:51 +05:30
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
2012-10-15 09:49:50 +05:30
|
|
|
err = DB_INTERRUPTED;
|
|
|
|
goto normal_return;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 4: Look for matching records in a loop */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
rec = btr_pcur_get_rec(pcur);
|
|
|
|
ut_ad(!!page_rec_is_comp(rec) == comp);
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
2006-08-29 09:30:31 +00:00
|
|
|
/*
|
2005-10-27 07:29:40 +00:00
|
|
|
fputs("Using ", stderr);
|
|
|
|
dict_index_name_print(stderr, index);
|
|
|
|
fprintf(stderr, " cnt %lu ; Page no %lu\n", cnt,
|
2006-10-12 07:02:36 +00:00
|
|
|
page_get_page_no(page_align(rec)));
|
2005-10-27 07:29:40 +00:00
|
|
|
rec_print(rec);
|
2006-08-29 09:30:31 +00:00
|
|
|
*/
|
2005-10-27 07:29:40 +00:00
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
|
|
|
|
if (page_rec_is_infimum(rec)) {
|
|
|
|
|
|
|
|
/* The infimum record on a page cannot be in the result set,
|
|
|
|
and neither can a record lock be placed on it: we skip such
|
|
|
|
a record. */
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (page_rec_is_supremum(rec)) {
|
|
|
|
|
|
|
|
if (set_also_gap_locks
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !(srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Try to place a lock on the index record */
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If innodb_locks_unsafe_for_binlog option is used
|
|
|
|
or this session is using a READ COMMITTED isolation
|
|
|
|
level we do not lock gaps. Supremum record is really
|
2005-10-27 07:29:40 +00:00
|
|
|
a gap and therefore we do not set locks there. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED, &heap);
|
2006-10-24 06:45:52 +00:00
|
|
|
err = sel_set_rec_lock(btr_pcur_get_block(pcur),
|
|
|
|
rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
prebuilt->select_lock_type,
|
|
|
|
LOCK_ORDINARY, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* A page supremum record cannot be in the result set: skip
|
|
|
|
it now that we have placed a possible lock on it */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* Do sanity checks in case our cursor has bumped into page
|
|
|
|
corruption */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (comp) {
|
|
|
|
next_offs = rec_get_next_offs(rec, TRUE);
|
|
|
|
if (UNIV_UNLIKELY(next_offs < PAGE_NEW_SUPREMUM)) {
|
|
|
|
|
|
|
|
goto wrong_offs;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
next_offs = rec_get_next_offs(rec, FALSE);
|
|
|
|
if (UNIV_UNLIKELY(next_offs < PAGE_OLD_SUPREMUM)) {
|
|
|
|
|
|
|
|
goto wrong_offs;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(next_offs >= UNIV_PAGE_SIZE - PAGE_DIR)) {
|
|
|
|
|
|
|
|
wrong_offs:
|
|
|
|
if (srv_force_recovery == 0 || moves_up == FALSE) {
|
|
|
|
ut_print_timestamp(stderr);
|
2012-02-02 12:31:57 +02:00
|
|
|
buf_page_print(page_align(rec), 0,
|
|
|
|
BUF_PAGE_PRINT_NO_CRASH);
|
2005-10-27 07:29:40 +00:00
|
|
|
fprintf(stderr,
|
2006-10-31 09:59:15 +00:00
|
|
|
"\nInnoDB: rec address %p,"
|
2006-08-29 09:30:31 +00:00
|
|
|
" buf block fix count %lu\n",
|
2006-10-31 09:59:15 +00:00
|
|
|
(void*) rec, (ulong)
|
2006-10-18 11:39:31 +00:00
|
|
|
btr_cur_get_block(btr_pcur_get_btr_cur(pcur))
|
2006-11-30 12:27:49 +00:00
|
|
|
->page.buf_fix_count);
|
2005-10-27 07:29:40 +00:00
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Index corruption: rec offs %lu"
|
|
|
|
" next offs %lu, page no %lu,\n"
|
|
|
|
"InnoDB: ",
|
2006-09-19 10:14:07 +00:00
|
|
|
(ulong) page_offset(rec),
|
2005-10-27 07:29:40 +00:00
|
|
|
(ulong) next_offs,
|
2006-10-12 07:02:36 +00:00
|
|
|
(ulong) page_get_page_no(page_align(rec)));
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, trx, index);
|
|
|
|
fputs(". Run CHECK TABLE. You may need to\n"
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: restore from a backup, or"
|
|
|
|
" dump + drop + reimport the table.\n",
|
|
|
|
stderr);
|
2012-02-02 12:31:57 +02:00
|
|
|
ut_ad(0);
|
2005-10-27 07:29:40 +00:00
|
|
|
err = DB_CORRUPTION;
|
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
} else {
|
|
|
|
/* The user may be dumping a corrupt table. Jump
|
|
|
|
over the corruption to recover as much as possible. */
|
|
|
|
|
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Index corruption: rec offs %lu"
|
|
|
|
" next offs %lu, page no %lu,\n"
|
|
|
|
"InnoDB: ",
|
2006-09-19 10:14:07 +00:00
|
|
|
(ulong) page_offset(rec),
|
2006-08-29 09:30:31 +00:00
|
|
|
(ulong) next_offs,
|
2006-10-12 07:02:36 +00:00
|
|
|
(ulong) page_get_page_no(page_align(rec)));
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, trx, index);
|
|
|
|
fputs(". We try to skip the rest of the page.\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
btr_pcur_move_to_last_on_page(pcur, &mtr);
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
|
|
|
|
/* Calculate the 'offsets' associated with 'rec' */
|
|
|
|
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets, ULINT_UNDEFINED, &heap);
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(srv_force_recovery > 0)) {
|
|
|
|
if (!rec_validate(rec, offsets)
|
2006-08-29 09:30:31 +00:00
|
|
|
|| !btr_index_rec_validate(rec, index, FALSE)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
fprintf(stderr,
|
2006-08-29 09:30:31 +00:00
|
|
|
"InnoDB: Index corruption: rec offs %lu"
|
|
|
|
" next offs %lu, page no %lu,\n"
|
|
|
|
"InnoDB: ",
|
2006-09-19 10:14:07 +00:00
|
|
|
(ulong) page_offset(rec),
|
2006-08-29 09:30:31 +00:00
|
|
|
(ulong) next_offs,
|
2006-10-12 07:02:36 +00:00
|
|
|
(ulong) page_get_page_no(page_align(rec)));
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, trx, index);
|
|
|
|
fputs(". We try to skip the record.\n",
|
2006-08-29 09:30:31 +00:00
|
|
|
stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that we cannot trust the up_match value in the cursor at this
|
|
|
|
place because we can arrive here after moving the cursor! Thus
|
|
|
|
we have to recompare rec and search_tuple to determine if they
|
|
|
|
match enough. */
|
|
|
|
|
|
|
|
if (match_mode == ROW_SEL_EXACT) {
|
|
|
|
/* Test if the index record matches completely to search_tuple
|
|
|
|
in prebuilt: if not, then we return with DB_RECORD_NOT_FOUND */
|
|
|
|
|
|
|
|
/* fputs("Comparing rec and search tuple\n", stderr); */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (0 != cmp_dtuple_rec(search_tuple, rec, offsets)) {
|
|
|
|
|
|
|
|
if (set_also_gap_locks
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !(srv_locks_unsafe_for_binlog
|
|
|
|
|| trx->isolation_level
|
2010-05-04 13:52:14 +03:00
|
|
|
<= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* Try to place a gap lock on the index
|
2005-10-27 07:29:40 +00:00
|
|
|
record only if innodb_locks_unsafe_for_binlog
|
2006-04-12 09:32:17 +00:00
|
|
|
option is not set or this session is not
|
|
|
|
using a READ COMMITTED isolation level. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = sel_set_rec_lock(
|
2006-10-24 06:45:52 +00:00
|
|
|
btr_pcur_get_block(pcur),
|
2006-09-19 10:14:07 +00:00
|
|
|
rec, index, offsets,
|
|
|
|
prebuilt->select_lock_type, LOCK_GAP,
|
|
|
|
thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
|
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
/* ut_print_name(stderr, index->name);
|
|
|
|
fputs(" record not found 3\n", stderr); */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto normal_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
} else if (match_mode == ROW_SEL_EXACT_PREFIX) {
|
|
|
|
|
|
|
|
if (!cmp_dtuple_is_prefix_of_rec(search_tuple, rec, offsets)) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (set_also_gap_locks
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !(srv_locks_unsafe_for_binlog
|
|
|
|
|| trx->isolation_level
|
2010-05-04 13:52:14 +03:00
|
|
|
<= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
/* Try to place a gap lock on the index
|
2005-10-27 07:29:40 +00:00
|
|
|
record only if innodb_locks_unsafe_for_binlog
|
2006-04-12 09:32:17 +00:00
|
|
|
option is not set or this session is not
|
|
|
|
using a READ COMMITTED isolation level. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = sel_set_rec_lock(
|
2006-10-24 06:45:52 +00:00
|
|
|
btr_pcur_get_block(pcur),
|
2006-09-19 10:14:07 +00:00
|
|
|
rec, index, offsets,
|
|
|
|
prebuilt->select_lock_type, LOCK_GAP,
|
|
|
|
thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
case DB_SUCCESS:
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
|
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
/* ut_print_name(stderr, index->name);
|
|
|
|
fputs(" record not found 4\n", stderr); */
|
|
|
|
|
|
|
|
goto normal_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We are ready to look at a possible new index entry in the result
|
|
|
|
set: the cursor is now placed on a user record */
|
|
|
|
|
|
|
|
if (prebuilt->select_lock_type != LOCK_NONE) {
|
|
|
|
/* Try to place a lock on the index record; note that delete
|
|
|
|
marked records are a special case in a unique search. If there
|
|
|
|
is a non-delete marked record, then it is enough to lock its
|
|
|
|
existence with LOCK_REC_NOT_GAP. */
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
/* If innodb_locks_unsafe_for_binlog option is used
|
|
|
|
or this session is using a READ COMMITED isolation
|
|
|
|
level we lock only the record, i.e., next-key locking is
|
2005-10-27 07:29:40 +00:00
|
|
|
not used. */
|
|
|
|
|
|
|
|
ulint lock_type;
|
|
|
|
|
|
|
|
if (!set_also_gap_locks
|
2006-08-29 09:30:31 +00:00
|
|
|
|| srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED
|
2006-08-29 09:30:31 +00:00
|
|
|
|| (unique_search
|
2006-04-12 09:32:17 +00:00
|
|
|
&& !UNIV_UNLIKELY(rec_get_deleted_flag(rec, comp)))) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
goto no_gap_lock;
|
|
|
|
} else {
|
|
|
|
lock_type = LOCK_ORDINARY;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we are doing a 'greater or equal than a primary key
|
|
|
|
value' search from a clustered index, and we find a record
|
|
|
|
that has that exact primary key value, then there is no need
|
|
|
|
to lock the gap before the record, because no insert in the
|
|
|
|
gap can be in our search range. That is, no phantom row can
|
|
|
|
appear that way.
|
|
|
|
|
|
|
|
An example: if col1 is the primary key, the search is WHERE
|
|
|
|
col1 >= 100, and we find a record where col1 = 100, then no
|
|
|
|
need to lock the gap before that record. */
|
|
|
|
|
|
|
|
if (index == clust_index
|
2006-08-29 09:30:31 +00:00
|
|
|
&& mode == PAGE_CUR_GE
|
|
|
|
&& direction == 0
|
|
|
|
&& dtuple_get_n_fields_cmp(search_tuple)
|
|
|
|
== dict_index_get_n_unique(index)
|
|
|
|
&& 0 == cmp_dtuple_rec(search_tuple, rec, offsets)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
no_gap_lock:
|
|
|
|
lock_type = LOCK_REC_NOT_GAP;
|
|
|
|
}
|
|
|
|
|
2006-10-24 06:45:52 +00:00
|
|
|
err = sel_set_rec_lock(btr_pcur_get_block(pcur),
|
|
|
|
rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
prebuilt->select_lock_type,
|
|
|
|
lock_type, thr);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-17 14:19:39 +00:00
|
|
|
switch (err) {
|
2008-05-14 15:43:19 +00:00
|
|
|
const rec_t* old_vers;
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
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
|
|
|
if (srv_locks_unsafe_for_binlog
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
|| trx->isolation_level
|
|
|
|
<= TRX_ISO_READ_COMMITTED) {
|
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
|
|
|
/* Note that a record of
|
|
|
|
prebuilt->index was locked. */
|
|
|
|
prebuilt->new_rec_locks = 1;
|
|
|
|
}
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
err = DB_SUCCESS;
|
|
|
|
case DB_SUCCESS:
|
2006-02-17 14:19:39 +00:00
|
|
|
break;
|
|
|
|
case DB_LOCK_WAIT:
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
/* Never unlock rows that were part of a conflict. */
|
|
|
|
prebuilt->new_rec_locks = 0;
|
|
|
|
|
2006-02-17 14:19:39 +00:00
|
|
|
if (UNIV_LIKELY(prebuilt->row_read_type
|
2006-02-23 19:25:29 +00:00
|
|
|
!= ROW_READ_TRY_SEMI_CONSISTENT)
|
2010-05-04 12:51:25 +03:00
|
|
|
|| unique_search
|
2006-08-29 09:30:31 +00:00
|
|
|
|| index != clust_index) {
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The following call returns 'offsets'
|
|
|
|
associated with 'old_vers' */
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_sel_build_committed_vers_for_mysql(
|
|
|
|
clust_index, prebuilt, rec,
|
|
|
|
&offsets, &heap, &old_vers, &mtr);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
if (trx->was_chosen_as_deadlock_victim) {
|
|
|
|
mutex_exit(&kernel_mutex);
|
2007-10-24 10:59:54 +00:00
|
|
|
err = DB_DEADLOCK;
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
if (UNIV_LIKELY(trx->wait_lock != NULL)) {
|
2006-09-19 10:14:07 +00:00
|
|
|
lock_cancel_waiting_and_release(
|
|
|
|
trx->wait_lock);
|
2006-02-17 14:19:39 +00:00
|
|
|
} else {
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
|
|
|
|
/* The lock was granted while we were
|
|
|
|
searching for the last committed version.
|
|
|
|
Do a normal locking read. */
|
|
|
|
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
2006-08-29 09:30:31 +00:00
|
|
|
ULINT_UNDEFINED,
|
|
|
|
&heap);
|
2006-02-17 14:19:39 +00:00
|
|
|
err = DB_SUCCESS;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
|
|
|
|
if (old_vers == NULL) {
|
|
|
|
/* The row was not yet committed */
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
did_semi_consistent_read = TRUE;
|
|
|
|
rec = old_vers;
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* This is a non-locking consistent read: if necessary, fetch
|
|
|
|
a previous version of the record */
|
|
|
|
|
|
|
|
if (trx->isolation_level == TRX_ISO_READ_UNCOMMITTED) {
|
|
|
|
|
|
|
|
/* Do nothing: we let a non-locking SELECT read the
|
|
|
|
latest version of the record */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
} else if (index == clust_index) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Fetch a previous version of the row if the current
|
|
|
|
one is not visible in the snapshot; if we have a very
|
|
|
|
high force recovery level set, we try to avoid crashes
|
|
|
|
by skipping this lookup */
|
|
|
|
|
|
|
|
if (UNIV_LIKELY(srv_force_recovery < 5)
|
2006-09-19 10:14:07 +00:00
|
|
|
&& !lock_clust_rec_cons_read_sees(
|
|
|
|
rec, index, offsets, trx->read_view)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-02-17 14:19:39 +00:00
|
|
|
rec_t* old_vers;
|
2005-10-27 07:29:40 +00:00
|
|
|
/* The following call returns 'offsets'
|
|
|
|
associated with 'old_vers' */
|
2006-09-19 10:14:07 +00:00
|
|
|
err = row_sel_build_prev_vers_for_mysql(
|
|
|
|
trx->read_view, clust_index,
|
|
|
|
prebuilt, rec, &offsets, &heap,
|
|
|
|
&old_vers, &mtr);
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if (err != DB_SUCCESS) {
|
|
|
|
|
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (old_vers == NULL) {
|
|
|
|
/* The row did not exist yet in
|
|
|
|
the read view */
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
rec = old_vers;
|
|
|
|
}
|
2010-08-18 14:40:02 +03:00
|
|
|
} else {
|
2005-10-27 07:29:40 +00:00
|
|
|
/* We are looking into a non-clustered index,
|
|
|
|
and to get the right version of the record we
|
|
|
|
have to look also into the clustered index: this
|
|
|
|
is necessary, because we can only get the undo
|
|
|
|
information via the clustered index record. */
|
|
|
|
|
2010-08-18 14:40:02 +03:00
|
|
|
ut_ad(!dict_index_is_clust(index));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2010-08-18 14:40:02 +03:00
|
|
|
if (!lock_sec_rec_cons_read_sees(
|
|
|
|
rec, trx->read_view)) {
|
|
|
|
goto requires_clust_rec;
|
|
|
|
}
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* NOTE that at this point rec can be an old version of a clustered
|
|
|
|
index record built for a consistent read. We cannot assume after this
|
|
|
|
point that rec is on a buffer pool page. Functions like
|
|
|
|
page_rec_is_comp() cannot be used! */
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(rec_get_deleted_flag(rec, comp))) {
|
|
|
|
|
|
|
|
/* The record is delete-marked: we can skip it */
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if ((srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE
|
|
|
|
&& !did_semi_consistent_read) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* No need to keep a lock on a delete-marked record
|
|
|
|
if we do not want to use next-key locking. */
|
|
|
|
|
|
|
|
row_unlock_for_mysql(prebuilt, TRUE);
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
/* This is an optimization to skip setting the next key lock
|
|
|
|
on the record that follows this delete-marked record. This
|
|
|
|
optimization works because of the unique search criteria
|
|
|
|
which precludes the presence of a range lock between this
|
|
|
|
delete marked record and the record following it.
|
|
|
|
|
|
|
|
For now this is applicable only to clustered indexes while
|
|
|
|
doing a unique search. There is scope for further optimization
|
|
|
|
applicable to unique secondary indexes. Current behaviour is
|
|
|
|
to widen the scope of a lock on an already delete marked record
|
|
|
|
if the same record is deleted twice by the same transaction */
|
Fix Bug#13510739 63775: SERVER CRASH ON HANDLER READ NEXT AFTER DELETE RECORD.
CREATE TABLE bug13510739 (c INTEGER NOT NULL, PRIMARY KEY (c)) ENGINE=INNODB;
INSERT INTO bug13510739 VALUES (1), (2), (3), (4);
DELETE FROM bug13510739 WHERE c=2;
HANDLER bug13510739 OPEN;
HANDLER bug13510739 READ `primary` = (2);
HANDLER bug13510739 READ `primary` NEXT; <-- crash
The bug is that in the particular testcase row_search_for_mysql() picked up
a delete-marked record and quit, leaving the cursor non-positioned state and
on the subsequent 'get next' call the code crashed because of the
non-positioned cursor.
In row0sel.cc (line numbers from mysql-trunk):
4653 if (rec_get_deleted_flag(rec, comp)) {
...
4679 if (index == clust_index && unique_search) {
4680
4681 err = DB_RECORD_NOT_FOUND;
4682
4683 goto normal_return;
4684 }
it quit from here, not storing the cursor position.
In contrast, if the record=2 is not found at all (e.g. sleep(1) after DELETE
to let the purge wipe it away completely) then 'get = 2' does find record=3
and quits from here:
4366 if (0 != cmp_dtuple_rec(search_tuple, rec, offsets)) {
...
4394 btr_pcur_store_position(pcur, &mtr);
4395
4396 err = DB_RECORD_NOT_FOUND;
4397 #if 0
4398 ut_print_name(stderr, trx, FALSE, index->name);
4399 fputs(" record not found 3\n", stderr);
4400 #endif
4401
4402 goto normal_return;
Another fix could be to extend the condition on line 4366 to hold only if
seach_tuple matches rec AND if rec is not delete marked.
Notice that in the above test case if we wait about 1 second somewhere after
DELETE and before 'get = 2', then the testcase does not crash and returns 4
instead. Not sure if this is the correct behavior, but this bugfix removes
the crash and makes the code return what it also returns in the non-crashing
case (if rec=2 is not found during 'get = 2', e.g. we have sleep(1) there).
Approved by: Marko (http://bur03.no.oracle.com/rb/r/863/)
2011-12-22 12:55:44 +02:00
|
|
|
if (index == clust_index && unique_search
|
|
|
|
&& !prebuilt->used_in_HANDLER) {
|
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
|
|
|
|
goto normal_return;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the clustered index record if needed, if we did not do the
|
|
|
|
search using the clustered index. */
|
|
|
|
|
|
|
|
if (index != clust_index && prebuilt->need_to_access_clustered) {
|
|
|
|
|
|
|
|
requires_clust_rec:
|
|
|
|
/* We use a 'goto' to the preceding label if a consistent
|
|
|
|
read of a secondary index record requires us to look up old
|
|
|
|
versions of the associated clustered index record. */
|
|
|
|
|
|
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
|
|
|
|
/* It was a non-clustered index and we must fetch also the
|
|
|
|
clustered index record */
|
|
|
|
|
|
|
|
mtr_has_extra_clust_latch = TRUE;
|
|
|
|
|
|
|
|
/* The following call returns 'offsets' associated with
|
|
|
|
'clust_rec'. Note that 'clust_rec' can be an old version
|
|
|
|
built for a consistent read. */
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
err = row_sel_get_clust_rec_for_mysql(prebuilt, index, rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
thr, &clust_rec,
|
|
|
|
&offsets, &heap, &mtr);
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
switch (err) {
|
|
|
|
case DB_SUCCESS:
|
|
|
|
if (clust_rec == NULL) {
|
|
|
|
/* The record did not exist in the read view */
|
|
|
|
ut_ad(prebuilt->select_lock_type == LOCK_NONE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
Merge from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3495
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-02 13:37:14 +0300
message:
Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
In semi-consistent read, only unlock freshly locked non-matching records.
lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
operation where a record lock was created.
lock_sec_rec_read_check_and_lock(),
lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
new record lock was created. Adjust callers.
row_unlock_for_mysql(): Correct the function documentation.
row_prebuilt_t::new_rec_locks: Correct the documentation.
2010-06-02 14:37:33 +03:00
|
|
|
goto next_rec;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DB_SUCCESS_LOCKED_REC:
|
|
|
|
ut_a(clust_rec != NULL);
|
|
|
|
if (srv_locks_unsafe_for_binlog
|
|
|
|
|| trx->isolation_level
|
|
|
|
<= TRX_ISO_READ_COMMITTED) {
|
|
|
|
/* Note that the clustered index record
|
|
|
|
was locked. */
|
|
|
|
prebuilt->new_rec_locks = 2;
|
|
|
|
}
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
break;
|
|
|
|
default:
|
2005-10-27 07:29:40 +00:00
|
|
|
goto lock_wait_or_error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(rec_get_deleted_flag(clust_rec, comp))) {
|
|
|
|
|
|
|
|
/* The record is delete marked: we can skip it */
|
|
|
|
|
2006-04-12 09:32:17 +00:00
|
|
|
if ((srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& prebuilt->select_lock_type != LOCK_NONE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* No need to keep a lock on a delete-marked
|
|
|
|
record if we do not want to use next-key
|
|
|
|
locking. */
|
|
|
|
|
|
|
|
row_unlock_for_mysql(prebuilt, TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2010-10-19 08:58:53 +03:00
|
|
|
result_rec = clust_rec;
|
|
|
|
ut_ad(rec_offs_validate(result_rec, clust_index, offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
} else {
|
|
|
|
result_rec = rec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We found a qualifying record 'result_rec'. At this point,
|
|
|
|
'offsets' are associated with 'result_rec'. */
|
|
|
|
|
|
|
|
ut_ad(rec_offs_validate(result_rec,
|
|
|
|
result_rec != rec ? clust_index : index,
|
|
|
|
offsets));
|
2010-10-19 08:58:53 +03:00
|
|
|
ut_ad(!rec_get_deleted_flag(result_rec, comp));
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2008-01-11 19:59:47 +00:00
|
|
|
/* At this point, the clustered index record is protected
|
|
|
|
by a page latch that was acquired when pcur was positioned.
|
|
|
|
The latch will not be released until mtr_commit(&mtr). */
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
if ((match_mode == ROW_SEL_EXACT
|
2006-08-29 09:30:31 +00:00
|
|
|
|| prebuilt->n_rows_fetched >= MYSQL_FETCH_CACHE_THRESHOLD)
|
|
|
|
&& prebuilt->select_lock_type == LOCK_NONE
|
|
|
|
&& !prebuilt->templ_contains_blob
|
|
|
|
&& !prebuilt->clust_index_was_generated
|
|
|
|
&& !prebuilt->used_in_HANDLER
|
|
|
|
&& prebuilt->template_type
|
|
|
|
!= ROW_MYSQL_DUMMY_TEMPLATE) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Inside an update, for example, we do not cache rows,
|
|
|
|
since we may use the cursor position to do the actual
|
|
|
|
update, that is why we require ...lock_type == LOCK_NONE.
|
|
|
|
Since we keep space in prebuilt only for the BLOBs of
|
|
|
|
a single row, we cannot cache rows in the case there
|
|
|
|
are BLOBs in the fields to be fetched. In HANDLER we do
|
|
|
|
not cache rows because there the cursor is a scrollable
|
|
|
|
cursor. */
|
|
|
|
|
2010-06-29 16:19:07 +03:00
|
|
|
if (!row_sel_push_cache_row_for_mysql(prebuilt, result_rec,
|
2010-10-19 09:35:14 +03:00
|
|
|
result_rec != rec,
|
2010-06-29 16:19:07 +03:00
|
|
|
offsets)) {
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
/* Only fresh inserts may contain incomplete
|
|
|
|
externally stored columns. Pretend that such
|
|
|
|
records do not exist. Such records may only be
|
|
|
|
accessed at the READ UNCOMMITTED isolation
|
|
|
|
level or when rolling back a recovered
|
|
|
|
transaction. Rollback happens at a lower
|
|
|
|
level, not here. */
|
2010-06-29 16:19:07 +03:00
|
|
|
ut_a(trx->isolation_level == TRX_ISO_READ_UNCOMMITTED);
|
|
|
|
} else if (prebuilt->n_fetch_cached
|
|
|
|
== MYSQL_FETCH_CACHE_SIZE) {
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
goto got_row;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto next_rec;
|
|
|
|
} else {
|
2010-10-19 08:58:53 +03:00
|
|
|
if (UNIV_UNLIKELY
|
|
|
|
(prebuilt->template_type == ROW_MYSQL_DUMMY_TEMPLATE)) {
|
|
|
|
/* CHECK TABLE: fetch the row */
|
|
|
|
|
|
|
|
if (result_rec != rec
|
|
|
|
&& !prebuilt->need_to_access_clustered) {
|
|
|
|
/* We used 'offsets' for the clust
|
|
|
|
rec, recalculate them for 'rec' */
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
|
|
|
ULINT_UNDEFINED,
|
|
|
|
&heap);
|
|
|
|
result_rec = rec;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
memcpy(buf + 4, result_rec
|
2006-08-29 09:30:31 +00:00
|
|
|
- rec_offs_extra_size(offsets),
|
|
|
|
rec_offs_size(offsets));
|
2005-10-27 07:29:40 +00:00
|
|
|
mach_write_to_4(buf,
|
|
|
|
rec_offs_extra_size(offsets) + 4);
|
|
|
|
} else {
|
2010-10-19 08:58:53 +03:00
|
|
|
/* Returning a row to MySQL */
|
|
|
|
|
|
|
|
if (!row_sel_store_mysql_rec(buf, prebuilt, result_rec,
|
|
|
|
result_rec != rec,
|
|
|
|
offsets)) {
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
/* Only fresh inserts may contain
|
|
|
|
incomplete externally stored
|
|
|
|
columns. Pretend that such records do
|
|
|
|
not exist. Such records may only be
|
|
|
|
accessed at the READ UNCOMMITTED
|
2010-06-29 16:19:07 +03:00
|
|
|
isolation level or when rolling back a
|
Merge Bug #54358 comment corrections from mysql-5.1-innodb:
------------------------------------------------------------
revno: 3533
revision-id: marko.makela@oracle.com-20100630093149-wmc37t128gic933v
parent: marko.makela@oracle.com-20100629131219-pjbkpk5rsqztmw27
committer: Marko Mäkelä <marko.makela@oracle.com>
branch nick: 5.1-innodb
timestamp: Wed 2010-06-30 12:31:49 +0300
message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.
(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())
=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
rec_t* rec;
ulint* offsets;
mtr_start(&mtr);
+ os_thread_sleep(5000000);
btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
BTR_MODIFY_TREE, &cursor, 0,
=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
rec_offs_init(offsets_);
mtr_start(mtr);
+ os_thread_sleep(5000000);
ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
rec = btr_cur_get_rec(btr_cur);
2010-06-30 12:52:41 +03:00
|
|
|
recovered transaction. Rollback
|
|
|
|
happens at a lower level, not here. */
|
2010-06-29 16:19:07 +03:00
|
|
|
ut_a(trx->isolation_level
|
|
|
|
== TRX_ISO_READ_UNCOMMITTED);
|
|
|
|
goto next_rec;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prebuilt->clust_index_was_generated) {
|
|
|
|
if (result_rec != rec) {
|
2006-09-19 10:14:07 +00:00
|
|
|
offsets = rec_get_offsets(
|
|
|
|
rec, index, offsets, ULINT_UNDEFINED,
|
|
|
|
&heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
row_sel_store_row_id_to_prebuilt(prebuilt, rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
index, offsets);
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* From this point on, 'offsets' are invalid. */
|
|
|
|
|
|
|
|
got_row:
|
|
|
|
/* We have an optimization to save CPU time: if this is a consistent
|
|
|
|
read on a unique condition on the clustered index, then we do not
|
|
|
|
store the pcur position, because any fetch next or prev will anyway
|
2006-02-23 19:25:29 +00:00
|
|
|
return 'end of file'. Exceptions are locking reads and the MySQL
|
|
|
|
HANDLER command where the user can move the cursor with PREV or NEXT
|
2006-02-17 14:19:39 +00:00
|
|
|
even after a unique search. */
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (!unique_search_from_clust_index
|
2006-08-29 09:30:31 +00:00
|
|
|
|| prebuilt->select_lock_type != LOCK_NONE
|
|
|
|
|| prebuilt->used_in_HANDLER) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
/* Inside an update always store the cursor position */
|
|
|
|
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
}
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
|
|
|
|
goto normal_return;
|
|
|
|
|
|
|
|
next_rec:
|
2006-02-17 14:19:39 +00:00
|
|
|
/* Reset the old and new "did semi-consistent read" flags. */
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->row_read_type
|
2006-08-29 09:30:31 +00:00
|
|
|
== ROW_READ_DID_SEMI_CONSISTENT)) {
|
2006-02-17 14:19:39 +00:00
|
|
|
prebuilt->row_read_type = ROW_READ_TRY_SEMI_CONSISTENT;
|
|
|
|
}
|
|
|
|
did_semi_consistent_read = FALSE;
|
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
|
|
|
prebuilt->new_rec_locks = 0;
|
2006-02-17 14:19:39 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
/* PHASE 5: Move the cursor to the next index record */
|
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(mtr_has_extra_clust_latch)) {
|
|
|
|
/* We must commit mtr if we are moving to the next
|
|
|
|
non-clustered index record, because we could break the
|
|
|
|
latching order if we would access a different clustered
|
|
|
|
index page right away without releasing the previous. */
|
|
|
|
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
mtr_has_extra_clust_latch = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_start(&mtr);
|
|
|
|
if (sel_restore_position_for_mysql(&same_user_rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
BTR_SEARCH_LEAF,
|
|
|
|
pcur, moves_up, &mtr)) {
|
2005-10-27 07:29:40 +00:00
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
|
|
|
cnt++;
|
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
|
|
|
|
goto rec_loop;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-02-23 19:25:29 +00:00
|
|
|
if (moves_up) {
|
2005-10-27 07:29:40 +00:00
|
|
|
if (UNIV_UNLIKELY(!btr_pcur_move_to_next(pcur, &mtr))) {
|
|
|
|
not_moved:
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
|
|
|
|
if (match_mode != 0) {
|
|
|
|
err = DB_RECORD_NOT_FOUND;
|
|
|
|
} else {
|
|
|
|
err = DB_END_OF_INDEX;
|
|
|
|
}
|
|
|
|
|
|
|
|
goto normal_return;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (UNIV_UNLIKELY(!btr_pcur_move_to_prev(pcur, &mtr))) {
|
|
|
|
goto not_moved;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
|
|
|
cnt++;
|
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
|
|
|
|
goto rec_loop;
|
|
|
|
|
|
|
|
lock_wait_or_error:
|
2006-02-17 14:19:39 +00:00
|
|
|
/* Reset the old and new "did semi-consistent read" flags. */
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->row_read_type
|
2006-08-29 09:30:31 +00:00
|
|
|
== ROW_READ_DID_SEMI_CONSISTENT)) {
|
2006-02-17 14:19:39 +00:00
|
|
|
prebuilt->row_read_type = ROW_READ_TRY_SEMI_CONSISTENT;
|
|
|
|
}
|
|
|
|
did_semi_consistent_read = FALSE;
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
|
|
|
|
btr_pcur_store_position(pcur, &mtr);
|
|
|
|
|
2010-10-11 05:36:13 -07:00
|
|
|
lock_table_wait:
|
2005-10-27 07:29:40 +00:00
|
|
|
mtr_commit(&mtr);
|
|
|
|
mtr_has_extra_clust_latch = FALSE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
trx->error_state = err;
|
|
|
|
|
|
|
|
/* The following is a patch for MySQL */
|
|
|
|
|
|
|
|
que_thr_stop_for_mysql(thr);
|
|
|
|
|
|
|
|
thr->lock_state = QUE_THR_LOCK_ROW;
|
|
|
|
|
|
|
|
if (row_mysql_handle_errors(&err, trx, thr, NULL)) {
|
|
|
|
/* It was a lock wait, and it ended */
|
|
|
|
|
|
|
|
thr->lock_state = QUE_THR_LOCK_NOLOCK;
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
2010-10-11 05:36:13 -07:00
|
|
|
/* Table lock waited, go try to obtain table lock
|
|
|
|
again */
|
|
|
|
if (table_lock_waited) {
|
|
|
|
table_lock_waited = FALSE;
|
|
|
|
|
|
|
|
goto wait_table_again;
|
|
|
|
}
|
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
sel_restore_position_for_mysql(&same_user_rec,
|
2006-08-29 09:30:31 +00:00
|
|
|
BTR_SEARCH_LEAF, pcur,
|
|
|
|
moves_up, &mtr);
|
2006-04-12 09:32:17 +00:00
|
|
|
|
|
|
|
if ((srv_locks_unsafe_for_binlog
|
2010-05-04 13:52:14 +03:00
|
|
|
|| trx->isolation_level <= TRX_ISO_READ_COMMITTED)
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !same_user_rec) {
|
2006-04-12 09:32:17 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* Since we were not able to restore the cursor
|
|
|
|
on the same user record, we cannot use
|
|
|
|
row_unlock_for_mysql() to unlock any records, and
|
|
|
|
we must thus reset the new rec lock info. Since
|
|
|
|
in lock0lock.c we have blocked the inheriting of gap
|
|
|
|
X-locks, we actually do not have any new record locks
|
|
|
|
set in this case.
|
|
|
|
|
|
|
|
Note that if we were able to restore on the 'same'
|
|
|
|
user record, it is still possible that we were actually
|
|
|
|
waiting on a delete-marked record, and meanwhile
|
|
|
|
it was removed by purge and inserted again by some
|
|
|
|
other user. But that is no problem, because in
|
|
|
|
rec_loop we will again try to set a lock, and
|
|
|
|
new_rec_lock_info in trx will be right at the end. */
|
|
|
|
|
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
|
|
|
prebuilt->new_rec_locks = 0;
|
2005-10-27 07:29:40 +00:00
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mode = pcur->search_mode;
|
|
|
|
|
|
|
|
goto rec_loop;
|
|
|
|
}
|
|
|
|
|
|
|
|
thr->lock_state = QUE_THR_LOCK_NOLOCK;
|
|
|
|
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
2006-08-29 09:30:31 +00:00
|
|
|
/* fputs("Using ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, index);
|
|
|
|
fprintf(stderr, " cnt %lu ret value %lu err\n", cnt, err); */
|
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
goto func_exit;
|
|
|
|
|
|
|
|
normal_return:
|
|
|
|
/*-------------------------------------------------------------*/
|
|
|
|
que_thr_stop_for_mysql_no_error(thr, trx);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
|
|
|
|
if (prebuilt->n_fetch_cached > 0) {
|
|
|
|
row_sel_pop_cached_row_for_mysql(buf, prebuilt);
|
|
|
|
|
|
|
|
err = DB_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef UNIV_SEARCH_DEBUG
|
2006-08-29 09:30:31 +00:00
|
|
|
/* fputs("Using ", stderr);
|
2005-10-27 07:29:40 +00:00
|
|
|
dict_index_name_print(stderr, index);
|
|
|
|
fprintf(stderr, " cnt %lu ret value %lu err\n", cnt, err); */
|
|
|
|
#endif /* UNIV_SEARCH_DEBUG */
|
|
|
|
if (err == DB_SUCCESS) {
|
|
|
|
srv_n_rows_read++;
|
|
|
|
}
|
|
|
|
|
|
|
|
func_exit:
|
|
|
|
trx->op_info = "";
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
/* Set or reset the "did semi-consistent read" flag on return.
|
|
|
|
The flag did_semi_consistent_read is set if and only if
|
|
|
|
the record being returned was fetched with a semi-consistent read. */
|
|
|
|
ut_ad(prebuilt->row_read_type != ROW_READ_WITH_LOCKS
|
2006-08-29 09:30:31 +00:00
|
|
|
|| !did_semi_consistent_read);
|
2006-02-17 14:19:39 +00:00
|
|
|
|
|
|
|
if (UNIV_UNLIKELY(prebuilt->row_read_type != ROW_READ_WITH_LOCKS)) {
|
|
|
|
if (UNIV_UNLIKELY(did_semi_consistent_read)) {
|
|
|
|
prebuilt->row_read_type = ROW_READ_DID_SEMI_CONSISTENT;
|
|
|
|
} else {
|
|
|
|
prebuilt->row_read_type = ROW_READ_TRY_SEMI_CONSISTENT;
|
|
|
|
}
|
|
|
|
}
|
2011-04-05 10:18:43 +03:00
|
|
|
|
|
|
|
#ifdef UNIV_SYNC_DEBUG
|
|
|
|
ut_ad(!sync_thread_levels_nonempty_trx(trx->has_search_latch));
|
|
|
|
#endif /* UNIV_SYNC_DEBUG */
|
2005-10-27 07:29:40 +00:00
|
|
|
return(err);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*******************************************************************//**
|
2005-10-27 07:29:40 +00:00
|
|
|
Checks if MySQL at the moment is allowed for this table to retrieve a
|
2009-05-25 06:46:10 +00:00
|
|
|
consistent read result, or store it to the query cache.
|
|
|
|
@return TRUE if storing or retrieving from the query cache is permitted */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2005-10-27 07:29:40 +00:00
|
|
|
ibool
|
|
|
|
row_search_check_if_query_cache_permitted(
|
|
|
|
/*======================================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
trx_t* trx, /*!< in: transaction object */
|
|
|
|
const char* norm_name) /*!< in: concatenation of database name,
|
2005-10-27 07:29:40 +00:00
|
|
|
'/' char, table name */
|
|
|
|
{
|
|
|
|
dict_table_t* table;
|
2006-02-23 19:25:29 +00:00
|
|
|
ibool ret = FALSE;
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2007-01-02 14:36:59 +00:00
|
|
|
table = dict_table_get(norm_name, FALSE);
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
if (table == NULL) {
|
|
|
|
|
|
|
|
return(FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
|
|
|
|
/* Start the transaction if it is not started yet */
|
|
|
|
|
|
|
|
trx_start_if_not_started_low(trx);
|
|
|
|
|
|
|
|
/* If there are locks on the table or some trx has invalidated the
|
|
|
|
cache up to our trx id, then ret = FALSE.
|
|
|
|
We do not check what type locks there are on the table, though only
|
|
|
|
IX type locks actually would require ret = FALSE. */
|
|
|
|
|
|
|
|
if (UT_LIST_GET_LEN(table->locks) == 0
|
2010-06-23 14:06:59 +03:00
|
|
|
&& trx->id >= table->query_cache_inv_trx_id) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
|
|
|
ret = TRUE;
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
/* If the isolation level is high, assign a read view for the
|
|
|
|
transaction if it does not yet have one */
|
|
|
|
|
|
|
|
if (trx->isolation_level >= TRX_ISO_REPEATABLE_READ
|
2006-08-29 09:30:31 +00:00
|
|
|
&& !trx->read_view) {
|
2005-10-27 07:29:40 +00:00
|
|
|
|
2006-09-19 10:14:07 +00:00
|
|
|
trx->read_view = read_view_open_now(
|
|
|
|
trx->id, trx->global_read_view_heap);
|
2005-10-27 07:29:40 +00:00
|
|
|
trx->global_read_view = trx->read_view;
|
|
|
|
}
|
|
|
|
}
|
2006-02-23 19:25:29 +00:00
|
|
|
|
2005-10-27 07:29:40 +00:00
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
|
|
|
|
return(ret);
|
|
|
|
}
|
2007-08-01 11:18:43 +00:00
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*******************************************************************//**
|
2007-11-16 13:57:27 +00:00
|
|
|
Read the AUTOINC column from the current row. If the value is less than
|
2009-05-25 06:46:10 +00:00
|
|
|
0 and the type is not unsigned then we reset the value to 0.
|
|
|
|
@return value read from the column */
|
2007-08-01 11:18:43 +00:00
|
|
|
static
|
2008-05-14 15:43:19 +00:00
|
|
|
ib_uint64_t
|
2007-08-01 11:18:43 +00:00
|
|
|
row_search_autoinc_read_column(
|
|
|
|
/*===========================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
dict_index_t* index, /*!< in: index to read from */
|
|
|
|
const rec_t* rec, /*!< in: current rec */
|
|
|
|
ulint col_no, /*!< in: column number */
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00
|
|
|
ulint mtype, /*!< in: column main type */
|
2009-05-25 06:46:10 +00:00
|
|
|
ibool unsigned_type) /*!< in: signed or unsigned flag */
|
2007-08-01 11:18:43 +00:00
|
|
|
{
|
|
|
|
ulint len;
|
|
|
|
const byte* data;
|
2008-05-14 15:43:19 +00:00
|
|
|
ib_uint64_t value;
|
2007-08-01 11:18:43 +00:00
|
|
|
mem_heap_t* heap = NULL;
|
|
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
|
|
ulint* offsets = offsets_;
|
|
|
|
|
2007-09-28 07:05:57 +00:00
|
|
|
rec_offs_init(offsets_);
|
2007-08-01 11:18:43 +00:00
|
|
|
|
2012-10-18 17:14:57 +03:00
|
|
|
offsets = rec_get_offsets(rec, index, offsets, col_no + 1, &heap);
|
2007-08-01 11:18:43 +00:00
|
|
|
|
2012-10-18 17:03:06 +03:00
|
|
|
if (rec_offs_nth_sql_null(offsets, col_no)) {
|
|
|
|
/* There is no non-NULL value in the auto-increment column. */
|
|
|
|
value = 0;
|
|
|
|
goto func_exit;
|
|
|
|
}
|
2007-08-01 11:18:43 +00:00
|
|
|
|
2012-10-18 17:14:57 +03:00
|
|
|
data = rec_get_nth_field(rec, offsets, col_no, &len);
|
2007-08-01 11:18:43 +00:00
|
|
|
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00
|
|
|
switch (mtype) {
|
|
|
|
case DATA_INT:
|
|
|
|
ut_a(len <= sizeof value);
|
|
|
|
value = mach_read_int_type(data, len, unsigned_type);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_FLOAT:
|
|
|
|
ut_a(len == sizeof(float));
|
branches/innodb+: Merge revisions r6897:6925 from branches/zip.
Skip r6900, which was backported from branches/innodb+ 6899.
------------------------------------------------------------------------
r6919 | mmakela | 2010-03-31 11:34:22 +0300 (Wed, 31 Mar 2010) | 54 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug38231.test
A /branches/zip/mysql-test/innodb_bug51920.result
A /branches/zip/mysql-test/innodb_bug51920.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
branches/zip: Merge revisions 6788:6918 from branches/5.1:
------------------------------------------------------------------------
r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1:
Typecast to silence a compiler warning:
row/row0sel.c: 4548
C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data
row/row0sel.c: 4553
C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data
Reported by: Jonas Oreland <Jonas.Oreland@Sun.COM>
Discussed with: Sunny Bains <sunny.bains@oracle.com>
------------------------------------------------------------------------
r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb_bug38231.test
branches/5.1:
Fix a non-determinism in innodb_bug38231.
Reported by: Sergey Vojtovich <svoj@Sun.COM>
------------------------------------------------------------------------
r6911 | vdimov | 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Whitespace fixup
------------------------------------------------------------------------
r6912 | vdimov | 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Whitespace fixup on line 354
------------------------------------------------------------------------
r6918 | mmakela | 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) | 6 lines
Changed paths:
A /branches/5.1/mysql-test/innodb_bug51920.result
A /branches/5.1/mysql-test/innodb_bug51920.test
M /branches/5.1/srv/srv0srv.c
branches/5.1: Obey KILL during a lock wait (Bug #51920).
srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
Check trx_is_interrupted() in addition to checking the lock wait timeout.
rb://279 approved by Sunny Bains
------------------------------------------------------------------------
------------------------------------------------------------------------
r6920 | mmakela | 2010-03-31 11:49:08 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Fix a compilation error that sneaked in in r6919.
------------------------------------------------------------------------
r6922 | mmakela | 2010-03-31 14:54:30 +0300 (Wed, 31 Mar 2010) | 11 lines
Changed paths:
M /branches/zip/mysql-test/innodb_bug51920.result
M /branches/zip/mysql-test/innodb_bug51920.test
branches/zip: Merge revisions 6918:6921 from branches/5.1:
------------------------------------------------------------------------
r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.result
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Make the test quicker and more
deterministic. Suggested by Vasil Dimov.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6925 | mmakela | 2010-03-31 15:30:56 +0300 (Wed, 31 Mar 2010) | 9 lines
branches/zip: Merge revisions 6921:6924 from branches/5.1:
------------------------------------------------------------------------
r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Fix a race condition.
------------------------------------------------------------------------
------------------------------------------------------------------------
2010-03-31 11:39:54 +00:00
|
|
|
value = (ib_uint64_t) mach_float_read(data);
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DATA_DOUBLE:
|
|
|
|
ut_a(len == sizeof(double));
|
branches/innodb+: Merge revisions r6897:6925 from branches/zip.
Skip r6900, which was backported from branches/innodb+ 6899.
------------------------------------------------------------------------
r6919 | mmakela | 2010-03-31 11:34:22 +0300 (Wed, 31 Mar 2010) | 54 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb_bug38231.test
A /branches/zip/mysql-test/innodb_bug51920.result
A /branches/zip/mysql-test/innodb_bug51920.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
branches/zip: Merge revisions 6788:6918 from branches/5.1:
------------------------------------------------------------------------
r6822 | vasil | 2010-03-15 10:17:31 +0200 (Mon, 15 Mar 2010) | 12 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1:
Typecast to silence a compiler warning:
row/row0sel.c: 4548
C4244: '=' : conversion from 'float' to 'ib_ulonglong', possible loss of data
row/row0sel.c: 4553
C4244: '=' : conversion from 'double' to 'ib_ulonglong', possible loss of data
Reported by: Jonas Oreland <Jonas.Oreland@Sun.COM>
Discussed with: Sunny Bains <sunny.bains@oracle.com>
------------------------------------------------------------------------
r6884 | vdimov | 2010-03-26 13:05:03 +0200 (Fri, 26 Mar 2010) | 6 lines
Changed paths:
M /branches/5.1/mysql-test/innodb_bug38231.test
branches/5.1:
Fix a non-determinism in innodb_bug38231.
Reported by: Sergey Vojtovich <svoj@Sun.COM>
------------------------------------------------------------------------
r6911 | vdimov | 2010-03-30 11:39:02 +0300 (Tue, 30 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Whitespace fixup
------------------------------------------------------------------------
r6912 | vdimov | 2010-03-30 12:18:46 +0300 (Tue, 30 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Whitespace fixup on line 354
------------------------------------------------------------------------
r6918 | mmakela | 2010-03-31 11:14:51 +0300 (Wed, 31 Mar 2010) | 6 lines
Changed paths:
A /branches/5.1/mysql-test/innodb_bug51920.result
A /branches/5.1/mysql-test/innodb_bug51920.test
M /branches/5.1/srv/srv0srv.c
branches/5.1: Obey KILL during a lock wait (Bug #51920).
srv_suspend_mysql_thread(), srv_lock_timeout_and_monitor_thread():
Check trx_is_interrupted() in addition to checking the lock wait timeout.
rb://279 approved by Sunny Bains
------------------------------------------------------------------------
------------------------------------------------------------------------
r6920 | mmakela | 2010-03-31 11:49:08 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: Fix a compilation error that sneaked in in r6919.
------------------------------------------------------------------------
r6922 | mmakela | 2010-03-31 14:54:30 +0300 (Wed, 31 Mar 2010) | 11 lines
Changed paths:
M /branches/zip/mysql-test/innodb_bug51920.result
M /branches/zip/mysql-test/innodb_bug51920.test
branches/zip: Merge revisions 6918:6921 from branches/5.1:
------------------------------------------------------------------------
r6921 | mmakela | 2010-03-31 14:33:04 +0300 (Wed, 31 Mar 2010) | 2 lines
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.result
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Make the test quicker and more
deterministic. Suggested by Vasil Dimov.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6925 | mmakela | 2010-03-31 15:30:56 +0300 (Wed, 31 Mar 2010) | 9 lines
branches/zip: Merge revisions 6921:6924 from branches/5.1:
------------------------------------------------------------------------
r6924 | mmakela | 2010-03-31 15:28:25 +0300 (Wed, 31 Mar 2010) | 1 line
Changed paths:
M /branches/5.1/mysql-test/innodb_bug51920.test
branches/5.1: innodb_bug51920.test: Fix a race condition.
------------------------------------------------------------------------
------------------------------------------------------------------------
2010-03-31 11:39:54 +00:00
|
|
|
value = (ib_uint64_t) mach_double_read(data);
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
ut_error;
|
|
|
|
}
|
2007-08-01 11:18:43 +00:00
|
|
|
|
2008-05-14 15:43:19 +00:00
|
|
|
if (!unsigned_type && (ib_int64_t) value < 0) {
|
2007-11-16 13:57:27 +00:00
|
|
|
value = 0;
|
|
|
|
}
|
2007-08-01 11:18:43 +00:00
|
|
|
|
2012-10-18 17:03:06 +03:00
|
|
|
func_exit:
|
|
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
|
|
mem_heap_free(heap);
|
|
|
|
}
|
|
|
|
|
2007-08-01 11:18:43 +00:00
|
|
|
return(value);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*******************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Get the last row.
|
|
|
|
@return current rec or NULL */
|
2007-08-01 11:18:43 +00:00
|
|
|
static
|
|
|
|
const rec_t*
|
|
|
|
row_search_autoinc_get_rec(
|
|
|
|
/*=======================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
btr_pcur_t* pcur, /*!< in: the current cursor */
|
|
|
|
mtr_t* mtr) /*!< in: mini transaction */
|
2007-08-01 11:18:43 +00:00
|
|
|
{
|
|
|
|
do {
|
|
|
|
const rec_t* rec = btr_pcur_get_rec(pcur);
|
|
|
|
|
|
|
|
if (page_rec_is_user_rec(rec)) {
|
|
|
|
return(rec);
|
|
|
|
}
|
|
|
|
} while (btr_pcur_move_to_prev(pcur, mtr));
|
|
|
|
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
/*******************************************************************//**
|
2009-05-25 06:46:10 +00:00
|
|
|
Read the max AUTOINC value from an index.
|
branches/innodb+: Merge revisions 5091:5143 from branches/zip:
------------------------------------------------------------------------
r5092 | marko | 2009-05-25 09:54:17 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Adjust some function comments after r5091.
------------------------------------------------------------------------
r5100 | marko | 2009-05-25 12:09:45 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Split some long lines that were introduced in r5091.
------------------------------------------------------------------------
r5101 | marko | 2009-05-25 12:42:47 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Introduce the macro TEMP_INDEX_PREFIX_STR.
This is to avoid triggering an error in Doxygen.
------------------------------------------------------------------------
r5102 | marko | 2009-05-25 13:47:14 +0300 (Mon, 25 May 2009) | 1 line
branches/zip: Add missing file comments.
------------------------------------------------------------------------
r5103 | marko | 2009-05-25 13:52:29 +0300 (Mon, 25 May 2009) | 10 lines
branches/zip: Add @file comments, and convert decorative
/*********************************
comments to Doxygen /** style like this:
/*****************************//**
This conversion was performed by the following command:
perl -i -e 'while(<ARGV>){if (m|^/\*{30}\**$|) {
s|\*{4}$|//**| if ++$com>1; $_ .= "\@file $ARGV\n" if $com==2}
print; if(eof){$.=0;undef $com}}' */*[ch] include/univ.i
------------------------------------------------------------------------
r5104 | marko | 2009-05-25 14:39:07 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Revert ut0auxconf_* to r5102,
that is, make Doxygen ignore these test programs.
------------------------------------------------------------------------
r5105 | marko | 2009-05-25 14:52:20 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Enclose some #error checks inside #ifndef DOXYGEN
to prevent bogus Doxygen errors.
------------------------------------------------------------------------
r5106 | marko | 2009-05-25 16:09:24 +0300 (Mon, 25 May 2009) | 2 lines
branches/zip: Add some Doxygen comments, mainly to structs, typedefs,
macros and global variables. Many more to go.
------------------------------------------------------------------------
r5108 | marko | 2009-05-26 00:32:35 +0300 (Tue, 26 May 2009) | 2 lines
branches/zip: lexyy.c: Remove the inadvertently added @file directive.
There is nothing for Doxygen to see in this file, move along.
------------------------------------------------------------------------
r5125 | marko | 2009-05-26 16:28:49 +0300 (Tue, 26 May 2009) | 3 lines
branches/zip: Add some Doxygen comments for many structs, typedefs,
#defines and global variables. Many are still missing.
------------------------------------------------------------------------
r5134 | marko | 2009-05-27 09:08:43 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add some Doxygen @return comments.
------------------------------------------------------------------------
r5139 | marko | 2009-05-27 10:01:40 +0300 (Wed, 27 May 2009) | 1 line
branches/zip: Add Doxyfile.
------------------------------------------------------------------------
r5143 | marko | 2009-05-27 10:57:25 +0300 (Wed, 27 May 2009) | 3 lines
branches/zip: buf0buf.h, Doxyfile: Fix the Doxygen translation.
@defgroup is for source code modules, not for field groups.
Tell Doxygen to expand the UT_LIST declarations.
------------------------------------------------------------------------
2009-05-27 09:52:16 +00:00
|
|
|
@return DB_SUCCESS if all OK else error code, DB_RECORD_NOT_FOUND if
|
|
|
|
column name can't be found in index */
|
2008-02-06 14:17:36 +00:00
|
|
|
UNIV_INTERN
|
2007-08-01 11:18:43 +00:00
|
|
|
ulint
|
|
|
|
row_search_max_autoinc(
|
|
|
|
/*===================*/
|
2009-05-25 06:46:10 +00:00
|
|
|
dict_index_t* index, /*!< in: index to search */
|
|
|
|
const char* col_name, /*!< in: name of autoinc column */
|
|
|
|
ib_uint64_t* value) /*!< out: AUTOINC value read */
|
2007-08-01 11:18:43 +00:00
|
|
|
{
|
|
|
|
ulint i;
|
|
|
|
ulint n_cols;
|
|
|
|
dict_field_t* dfield = NULL;
|
|
|
|
ulint error = DB_SUCCESS;
|
|
|
|
|
|
|
|
n_cols = dict_index_get_n_ordering_defined_by_user(index);
|
|
|
|
|
|
|
|
/* Search the index for the AUTOINC column name */
|
|
|
|
for (i = 0; i < n_cols; ++i) {
|
|
|
|
dfield = dict_index_get_nth_field(index, i);
|
|
|
|
|
|
|
|
if (strcmp(col_name, dfield->name) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
*value = 0;
|
|
|
|
|
|
|
|
/* Must find the AUTOINC column name */
|
|
|
|
if (i < n_cols && dfield) {
|
|
|
|
mtr_t mtr;
|
|
|
|
btr_pcur_t pcur;
|
|
|
|
|
|
|
|
mtr_start(&mtr);
|
|
|
|
|
|
|
|
/* Open at the high/right end (FALSE), and INIT
|
|
|
|
cursor (TRUE) */
|
|
|
|
btr_pcur_open_at_index_side(
|
|
|
|
FALSE, index, BTR_SEARCH_LEAF, &pcur, TRUE, &mtr);
|
|
|
|
|
|
|
|
if (page_get_n_recs(btr_pcur_get_page(&pcur)) > 0) {
|
|
|
|
const rec_t* rec;
|
|
|
|
|
|
|
|
rec = row_search_autoinc_get_rec(&pcur, &mtr);
|
|
|
|
|
|
|
|
if (rec != NULL) {
|
|
|
|
ibool unsigned_type = (
|
|
|
|
dfield->col->prtype & DATA_UNSIGNED);
|
|
|
|
|
|
|
|
*value = row_search_autoinc_read_column(
|
branches/innodb+: Merge revisions 6130:6364 from branches/zip:
------------------------------------------------------------------------
r6130 | marko | 2009-11-02 11:42:56 +0200 (Mon, 02 Nov 2009) | 9 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0sea.c
M /branches/zip/buf/buf0buf.c
M /branches/zip/dict/dict0dict.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/ibuf/ibuf0ibuf.c
M /branches/zip/include/btr0sea.h
M /branches/zip/include/dict0dict.h
M /branches/zip/include/fil0fil.h
M /branches/zip/include/ibuf0ibuf.h
M /branches/zip/include/lock0lock.h
M /branches/zip/include/log0log.h
M /branches/zip/include/log0recv.h
M /branches/zip/include/mem0mem.h
M /branches/zip/include/mem0pool.h
M /branches/zip/include/os0file.h
M /branches/zip/include/pars0pars.h
M /branches/zip/include/srv0srv.h
M /branches/zip/include/thr0loc.h
M /branches/zip/include/trx0i_s.h
M /branches/zip/include/trx0purge.h
M /branches/zip/include/trx0rseg.h
M /branches/zip/include/trx0sys.h
M /branches/zip/include/trx0undo.h
M /branches/zip/include/usr0sess.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/log/log0recv.c
M /branches/zip/mem/mem0dbg.c
M /branches/zip/mem/mem0pool.c
M /branches/zip/os/os0file.c
M /branches/zip/os/os0sync.c
M /branches/zip/os/os0thread.c
M /branches/zip/pars/lexyy.c
M /branches/zip/pars/pars0lex.l
M /branches/zip/que/que0que.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
M /branches/zip/sync/sync0arr.c
M /branches/zip/sync/sync0sync.c
M /branches/zip/thr/thr0loc.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0purge.c
M /branches/zip/trx/trx0rseg.c
M /branches/zip/trx/trx0sys.c
M /branches/zip/trx/trx0undo.c
M /branches/zip/usr/usr0sess.c
M /branches/zip/ut/ut0mem.c
branches/zip: Free all resources at shutdown. Set pointers to NULL, so
that Valgrind will not complain about freed data structures that are
reachable via pointers. This addresses Bug #45992 and Bug #46656.
This patch is mostly based on changes copied from branches/embedded-1.0,
mainly c5432, c3439, c3134, c2994, c2978, but also some other code was
copied. Some added cleanup code is specific to MySQL/InnoDB.
rb://199 approved by Sunny Bains
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 09:57:29 +0200 (Wed, 04 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
r6137 | marko | 2009-11-04 15:24:28 +0200 (Wed, 04 Nov 2009) | 1 line
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_index_too_big_for_undo(): Correct a typo.
------------------------------------------------------------------------
r6153 | vasil | 2009-11-10 15:33:22 +0200 (Tue, 10 Nov 2009) | 145 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6125:6152 from branches/5.1:
(everything except the last white-space change was skipped as it is already
in branches/zip)
------------------------------------------------------------------------
r6127 | vasil | 2009-10-30 11:18:25 +0200 (Fri, 30 Oct 2009) | 18 lines
Changed paths:
M /branches/5.1/Makefile.am
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1:
Backport c6121 from branches/zip:
------------------------------------------------------------------------
r6121 | sunny | 2009-10-30 01:42:11 +0200 (Fri, 30 Oct 2009) | 7 lines
Changed paths:
M /branches/zip/mysql-test/innodb-autoinc.result
branches/zip: This test has been problematic for sometime now. The underlying
bug is that the data dictionaries get out of sync. In the AUTOINC code we
try and apply salve to the symptoms. In the past MySQL made some unrelated
change and the dictionaries stopped getting out of sync and this test started
to fail. Now, it seems they have reverted that changed and the test is
passing again. I suspect this is not he last time that this test will change.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6129 | vasil | 2009-10-30 17:14:22 +0200 (Fri, 30 Oct 2009) | 4 lines
Changed paths:
M /branches/5.1/Makefile.am
branches/5.1:
Revert a change to Makefile.am that sneaked unnoticed in c6127.
------------------------------------------------------------------------
r6136 | marko | 2009-11-04 12:28:10 +0200 (Wed, 04 Nov 2009) | 15 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/ha_prototypes.h
M /branches/5.1/ut/ut0ut.c
branches/5.1: Port r6134 from branches/zip:
------------------------------------------------------------------------
r6134 | marko | 2009-11-04 07:57:29 +0000 (Wed, 04 Nov 2009) | 5 lines
branches/zip: innobase_convert_identifier(): Convert table names with
explain_filename() to address Bug #32430: 'show innodb status'
causes errors Invalid (old?) table or database name in logs.
rb://134 approved by Sunny Bains
------------------------------------------------------------------------
innobase_print_identifier(): Replace with innobase_convert_name().
innobase_convert_identifier(): New function, called by innobase_convert_name().
------------------------------------------------------------------------
r6149 | vasil | 2009-11-09 11:15:01 +0200 (Mon, 09 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/CMakeLists.txt
branches/5.1:
Followup to r5700: Adjust the changes so they are the same as in the BZR
repository.
------------------------------------------------------------------------
r6150 | vasil | 2009-11-09 11:43:31 +0200 (Mon, 09 Nov 2009) | 58 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
Merge a part of r2911.5.5 from MySQL:
(the other part of this was merged in c5700)
------------------------------------------------------------
revno: 2911.5.5
committer: Vladislav Vaintroub <vvaintroub@mysql.com>
branch nick: 5.1-innodb_plugin
timestamp: Wed 2009-06-10 10:59:49 +0200
message:
Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use
symbols exported from mysqld.
removed:
storage/innodb_plugin/handler/handler0vars.h
storage/innodb_plugin/handler/win_delay_loader.cc
added:
storage/mysql_storage_engine.cmake
win/create_def_file.js
modified:
CMakeLists.txt
include/m_ctype.h
include/my_global.h
include/my_sys.h
include/mysql/plugin.h
libmysqld/CMakeLists.txt
mysql-test/mysql-test-run.pl
mysql-test/t/plugin.test
mysql-test/t/plugin_load-master.opt
mysys/charset.c
sql/CMakeLists.txt
sql/handler.h
sql/mysql_priv.h
sql/mysqld.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_list.h
sql/sql_profile.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/blackhole/CMakeLists.txt
storage/csv/CMakeLists.txt
storage/example/CMakeLists.txt
storage/federated/CMakeLists.txt
storage/heap/CMakeLists.txt
storage/innobase/CMakeLists.txt
storage/innobase/handler/ha_innodb.cc
storage/innodb_plugin/CMakeLists.txt
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/handler0alter.cc
storage/innodb_plugin/handler/i_s.cc
storage/innodb_plugin/plug.in
storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt
win/Makefile.am
win/configure.js
------------------------------------------------------------------------
r6152 | vasil | 2009-11-10 15:30:20 +0200 (Tue, 10 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1:
White space fixup.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6157 | jyang | 2009-11-11 14:27:09 +0200 (Wed, 11 Nov 2009) | 10 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
A /branches/zip/mysql-test/innodb_bug47167.result
A /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_file_format.result
branches/zip: Fix an issue that a local variable defined
in innodb_file_format_check_validate() is being referenced
across function in innodb_file_format_check_update().
In addition, fix "set global innodb_file_format_check =
DEFAULT" call.
Bug #47167: "set global innodb_file_format_check" cannot
set value by User-Defined Variable."
rb://169 approved by Sunny Bains and Marko.
------------------------------------------------------------------------
r6159 | vasil | 2009-11-11 15:13:01 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
r6160 | vasil | 2009-11-11 15:33:49 +0200 (Wed, 11 Nov 2009) | 72 lines
Changed paths:
M /branches/zip/include/os0file.h
M /branches/zip/os/os0file.c
branches/zip: Merge r6152:6159 from branches/5.1:
(r6158 was skipped as an equivallent change has already been merged from MySQL)
------------------------------------------------------------------------
r6154 | calvin | 2009-11-11 02:51:17 +0200 (Wed, 11 Nov 2009) | 17 lines
Changed paths:
M /branches/5.1/include/os0file.h
M /branches/5.1/os/os0file.c
branches/5.1: fix bug#3139: Mysql crashes: 'windows error 995'
after several selects on a large DB
During stress environment, Windows AIO may fail with error code
ERROR_OPERATION_ABORTED. InnoDB does not handle the error, rather
crashes. The cause of the error is unknown, but likely due to
faulty hardware or driver.
This patch introduces a new error code OS_FILE_OPERATION_ABORTED,
which maps to Windows ERROR_OPERATION_ABORTED (995). When the error
is detected during AIO, the InnoDB will issue a synchronous retry
(read/write).
This patch has been extensively tested by MySQL support.
Approved by: Marko
rb://196
------------------------------------------------------------------------
r6158 | vasil | 2009-11-11 14:52:14 +0200 (Wed, 11 Nov 2009) | 37 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/handler/ha_innodb.h
branches/5.1:
Merge a change from MySQL:
(this has been reviewed by Calvin and Marko, and Calvin says Luis has
incorporated Marko's suggestions)
------------------------------------------------------------
revno: 3092.5.1
committer: Luis Soares <luis.soares@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-09-24 15:52:52 +0100
message:
BUG#42829: binlogging enabled for all schemas regardless of
binlog-db-db / binlog-ignore-db
InnoDB will return an error if statement based replication is used
along with transaction isolation level READ-COMMITTED (or weaker),
even if the statement in question is filtered out according to the
binlog-do-db rules set. In this case, an error should not be printed.
This patch addresses this issue by extending the existing check in
external_lock to take into account the filter rules before deciding to
print an error. Furthermore, it also changes decide_logging_format to
take into consideration whether the statement is filtered out from
binlog before decision is made.
added:
mysql-test/suite/binlog/r/binlog_stm_do_db.result
mysql-test/suite/binlog/t/binlog_stm_do_db-master.opt
mysql-test/suite/binlog/t/binlog_stm_do_db.test
modified:
sql/sql_base.cc
sql/sql_class.cc
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/ha_innodb.h
storage/innodb_plugin/handler/ha_innodb.cc
storage/innodb_plugin/handler/ha_innodb.h
------------------------------------------------------------------------
------------------------------------------------------------------------
r6161 | vasil | 2009-11-11 15:36:16 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add changelog entry for r6160.
------------------------------------------------------------------------
r6162 | vasil | 2009-11-11 16:00:12 +0200 (Wed, 11 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog for r6157.
------------------------------------------------------------------------
r6163 | calvin | 2009-11-11 17:53:20 +0200 (Wed, 11 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/handler/ha_innodb.h
branches/zip: Exclude thd_binlog_filter_ok() when building
with older version of MySQL.
thd_binlog_filter_ok() is introduced in MySQL 5.1.41. But the
plugin can be built with MySQL prior to 5.1.41.
Approved by Heikki (on IM).
------------------------------------------------------------------------
r6169 | calvin | 2009-11-12 14:40:43 +0200 (Thu, 12 Nov 2009) | 6 lines
Changed paths:
A /branches/zip/mysql-test/innodb_bug46676.result
A /branches/zip/mysql-test/innodb_bug46676.test
branches/zip: add test case for bug#46676
This crash is reproducible with InnoDB plugin 1.0.4 + MySQL 5.1.37.
But no longer reproducible after MySQL 5.1.38 (with plugin 1.0.5).
Add test case to catch future regression.
------------------------------------------------------------------------
r6170 | marko | 2009-11-12 15:49:08 +0200 (Thu, 12 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/db0err.h
M /branches/zip/row/row0merge.c
M /branches/zip/row/row0mysql.c
branches/zip: Allow CREATE INDEX to be interrupted. (Issue #354)
rb://183 approved by Heikki Tuuri
------------------------------------------------------------------------
r6175 | vasil | 2009-11-16 20:07:39 +0200 (Mon, 16 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Wrap line at 78th char in the ChangeLog
------------------------------------------------------------------------
r6177 | calvin | 2009-11-16 20:20:38 +0200 (Mon, 16 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip: add an entry to ChangeLog for r6065
------------------------------------------------------------------------
r6179 | marko | 2009-11-17 10:19:34 +0200 (Tue, 17 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: ha_innobase::change_active_index(): When the history is
missing, report it to the client, not to the error log.
------------------------------------------------------------------------
r6181 | vasil | 2009-11-17 12:21:41 +0200 (Tue, 17 Nov 2009) | 33 lines
Changed paths:
M /branches/zip/mysql-test/innodb-index.test
branches/zip:
At the end of innodb-index.test: restore the environment as it was before
the test was started to silence this warning:
MTR's internal check of the test case 'main.innodb-index' failed.
This means that the test case does not preserve the state that existed
before the test case was executed. Most likely the test case did not
do a proper clean-up.
This is the diff of the states of the servers before and after the
test case was executed:
mysqltest: Logging to '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
mysqltest: Results saved in '/tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
mysqltest: Connecting to server localhost:13000 (socket /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
mysqltest: ... Connected.
mysqltest: Start processing test commands from './include/check-testcase.test' ...
mysqltest: ... Done processing test commands.
--- /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-11-17 13:10:40.000000000 +0300
+++ /tmp/autotest.sh-20091117_033000-zip.btyZwu/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-11-17 13:10:54.000000000 +0300
@@ -84,7 +84,7 @@
INNODB_DOUBLEWRITE ON
INNODB_FAST_SHUTDOWN 1
INNODB_FILE_FORMAT Antelope
-INNODB_FILE_FORMAT_CHECK Antelope
+INNODB_FILE_FORMAT_CHECK Barracuda
INNODB_FILE_PER_TABLE OFF
INNODB_FLUSH_LOG_AT_TRX_COMMIT 1
INNODB_FLUSH_METHOD
mysqltest: Result content mismatch
not ok
------------------------------------------------------------------------
r6182 | marko | 2009-11-17 13:49:15 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-consistent.result
M /branches/zip/mysql-test/innodb-consistent.test
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc.result
M /branches/zip/mysql-test/innodb-use-sys-malloc.test
M /branches/zip/mysql-test/innodb_bug21704.result
M /branches/zip/mysql-test/innodb_bug21704.test
M /branches/zip/mysql-test/innodb_bug40360.test
M /branches/zip/mysql-test/innodb_bug40565.result
M /branches/zip/mysql-test/innodb_bug40565.test
M /branches/zip/mysql-test/innodb_bug41904.result
M /branches/zip/mysql-test/innodb_bug41904.test
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero.result
M /branches/zip/mysql-test/innodb_bug42101-nonzero.test
M /branches/zip/mysql-test/innodb_bug42101.result
M /branches/zip/mysql-test/innodb_bug42101.test
M /branches/zip/mysql-test/innodb_bug44032.result
M /branches/zip/mysql-test/innodb_bug44032.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
M /branches/zip/mysql-test/innodb_bug44571.result
M /branches/zip/mysql-test/innodb_bug44571.test
M /branches/zip/mysql-test/innodb_bug45357.test
M /branches/zip/mysql-test/innodb_bug46000.result
M /branches/zip/mysql-test/innodb_bug46000.test
M /branches/zip/mysql-test/innodb_bug46676.result
M /branches/zip/mysql-test/innodb_bug46676.test
M /branches/zip/mysql-test/innodb_bug47167.result
M /branches/zip/mysql-test/innodb_bug47167.test
M /branches/zip/mysql-test/innodb_bug47777.result
M /branches/zip/mysql-test/innodb_bug47777.test
M /branches/zip/mysql-test/innodb_file_format.result
M /branches/zip/mysql-test/innodb_file_format.test
branches/zip: Set svn:eol-style on mysql-test files.
------------------------------------------------------------------------
r6183 | marko | 2009-11-17 13:51:16 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-consistent-master.opt
M /branches/zip/mysql-test/innodb-master.opt
M /branches/zip/mysql-test/innodb-semi-consistent-master.opt
M /branches/zip/mysql-test/innodb-use-sys-malloc-master.opt
M /branches/zip/mysql-test/innodb_bug42101-nonzero-master.opt
branches/zip: Prepend loose_ to plugin-only mysql-test options.
------------------------------------------------------------------------
r6184 | marko | 2009-11-17 13:52:01 +0200 (Tue, 17 Nov 2009) | 1 line
Changed paths:
M /branches/zip/mysql-test/innodb-index.result
M /branches/zip/mysql-test/innodb-index.test
branches/zip: innodb-index.test: Restore innodb_file_format_check.
------------------------------------------------------------------------
r6185 | marko | 2009-11-17 16:44:20 +0200 (Tue, 17 Nov 2009) | 16 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/mysql-test/innodb.result
M /branches/zip/mysql-test/innodb.test
M /branches/zip/mysql-test/innodb_bug44369.result
M /branches/zip/mysql-test/innodb_bug44369.test
D /branches/zip/mysql-test/patches/innodb-index.diff
M /branches/zip/row/row0mysql.c
branches/zip: Report duplicate table names
to the client connection, not to the error log. This change will allow
innodb-index.test to be re-enabled. It was previously disabled, because
mysql-test-run does not like output in the error log.
row_create_table_for_mysql(): Do not output anything to the error log
when reporting DB_DUPLICATE_KEY. Let the caller report the error.
Add a TODO comment that the dict_table_t object is apparently not freed
when an error occurs.
create_table_def(): Convert InnoDB table names to the character set
of the client connection for reporting. Use my_error(ER_WRONG_COLUMN_NAME)
for reporting reserved column names. Report my_error(ER_TABLE_EXISTS_ERROR)
when row_create_table_for_mysql() returns DB_DUPLICATE_KEY.
rb://206
------------------------------------------------------------------------
r6186 | vasil | 2009-11-17 16:48:14 +0200 (Tue, 17 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6185.
------------------------------------------------------------------------
r6189 | marko | 2009-11-18 11:36:18 +0200 (Wed, 18 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): When creating the primary key
and the table is being locked by another transaction,
do not attempt to drop the table. (Bug #48782)
Approved by Sunny Bains over IM
------------------------------------------------------------------------
r6194 | vasil | 2009-11-19 09:24:45 +0200 (Thu, 19 Nov 2009) | 5 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip:
Increment version number from 1.0.5 to 1.0.6 since 1.0.5 was just released
by MySQL and we will soon release 1.0.6.
------------------------------------------------------------------------
r6197 | calvin | 2009-11-19 09:32:55 +0200 (Thu, 19 Nov 2009) | 6 lines
Changed paths:
M /branches/zip/CMakeLists.txt
branches/zip: merge the fix of bug#48317 (CMake file)
Due to MySQL changes to the CMake, it is no longer able
to build InnoDB plugin as a static library on Windows.
The fix is proposed by Vlad of MySQL.
------------------------------------------------------------------------
r6198 | vasil | 2009-11-19 09:44:31 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for r6197.
------------------------------------------------------------------------
r6199 | vasil | 2009-11-19 12:10:12 +0200 (Thu, 19 Nov 2009) | 31 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/btr/btr0btr.c
M /branches/zip/data/data0type.c
branches/zip: Merge r6159:6198 from branches/5.1:
------------------------------------------------------------------------
r6187 | jyang | 2009-11-18 05:27:30 +0200 (Wed, 18 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Fix bug #48469 "when innodb tablespace is
configured too small, crash and corruption!". Function
btr_create() did not check the return status of fseg_create(),
and continue the index creation even there is no sufficient
space.
rb://205 Approved by Marko
------------------------------------------------------------------------
r6188 | jyang | 2009-11-18 07:14:23 +0200 (Wed, 18 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/data/data0type.c
branches/5.1: Fix bug #48526 "Data type for float and
double is incorrectly reported in InnoDB table monitor".
Certain datatypes are not printed correctly in
dtype_print().
rb://204 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6201 | marko | 2009-11-19 14:09:11 +0200 (Thu, 19 Nov 2009) | 2 lines
Changed paths:
M /branches/zip/handler/handler0alter.cc
branches/zip: ha_innobase::add_index(): Clarify the comment
on orphaned tables when creating a primary key.
------------------------------------------------------------------------
r6202 | jyang | 2009-11-19 15:01:00 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/zip/btr/btr0btr.c
branches/zip: Function fseg_free() is no longer defined
in branches/zip. To port fix for bug #48469 to zip,
we can use btr_free_root() which frees the page,
and also does not require mini-transaction.
Approved by Marko.
------------------------------------------------------------------------
r6207 | vasil | 2009-11-20 10:19:14 +0200 (Fri, 20 Nov 2009) | 54 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Merge r6198:6206 from branches/5.1:
(r6203 was skipped as it is already in branches/zip)
------------------------------------------------------------------------
r6200 | vasil | 2009-11-19 12:14:23 +0200 (Thu, 19 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1:
White space fixup - indent under the opening (
------------------------------------------------------------------------
r6203 | jyang | 2009-11-19 15:12:22 +0200 (Thu, 19 Nov 2009) | 8 lines
Changed paths:
M /branches/5.1/btr/btr0btr.c
branches/5.1: Use btr_free_root() instead of fseg_free() for
the fix of bug #48469, because fseg_free() is not defined
in the zip branch. And we could save one mini-trasaction started
by fseg_free().
Approved by Marko.
------------------------------------------------------------------------
r6205 | jyang | 2009-11-20 07:55:48 +0200 (Fri, 20 Nov 2009) | 11 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Add a special case to handle the Duplicated Key error
and return DB_ERROR instead. This is to avoid a possible SIGSEGV
by mysql error handling re-entering the storage layer for dup key
info without proper table handle.
This is to prevent a server crash when error situation in bug
#45961 "DDL on partitioned innodb tables leaves data dictionary
in an inconsistent state" happens.
rb://157 approved by Sunny Bains.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 5 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Fix a minor code formating issue for
the parenthesis iplacement of the if condition in
rename_table().
------------------------------------------------------------------------
------------------------------------------------------------------------
r6208 | vasil | 2009-11-20 10:49:24 +0200 (Fri, 20 Nov 2009) | 4 lines
Changed paths:
M /branches/zip/ChangeLog
branches/zip:
Add ChangeLog entry for c6207.
------------------------------------------------------------------------
r6210 | vasil | 2009-11-20 23:39:48 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/zip/trx/trx0i_s.c
branches/zip:
Whitespace fixup.
------------------------------------------------------------------------
r6248 | marko | 2009-11-30 12:19:50 +0200 (Mon, 30 Nov 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: ChangeLog: Document r4922 that was forgotten.
------------------------------------------------------------------------
r6252 | marko | 2009-11-30 12:50:11 +0200 (Mon, 30 Nov 2009) | 23 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/dict/dict0boot.c
M /branches/zip/dict/dict0crea.c
M /branches/zip/dict/dict0load.c
M /branches/zip/dict/dict0mem.c
M /branches/zip/fil/fil0fil.c
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/dict0mem.h
M /branches/zip/row/row0mysql.c
branches/zip: Suppress errors about non-found temporary tables.
Write the is_temp flag to SYS_TABLES.MIX_LEN.
dict_table_t::flags: Add a flag for is_temporary, DICT_TF2_TEMPORARY.
Unlike other flags, this will not be written to the tablespace flags
or SYS_TABLES.TYPE, but only to SYS_TABLES.MIX_LEN.
dict_build_table_def_step(): Only pass DICT_TF_BITS to tablespaces.
dict_check_tablespaces_and_store_max_id(), dict_load_table():
Suppress errors about temporary tables not being found.
dict_create_sys_tables_tuple(): Write the DICT_TF2_TEMPORARY flag
to SYS_TABLES.MIX_LEN.
fil_space_create(), fil_create_new_single_table_tablespace(): Add assertions
about space->flags.
row_drop_table_for_mysql(): Do not complain about non-found temporary tables.
rb://160 approved by Heikki Tuuri. This addresses the second part of
Bug #41609 Crash recovery does not work for InnoDB temporary tables.
------------------------------------------------------------------------
r6263 | vasil | 2009-12-01 14:49:05 +0200 (Tue, 01 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/include/univ.i
branches/zip: Increment version number from 1.0.6 to 1.0.7
1.0.6 has been released
------------------------------------------------------------------------
r6264 | vasil | 2009-12-01 16:19:44 +0200 (Tue, 01 Dec 2009) | 1 line
Changed paths:
M /branches/zip/ChangeLog
branches/zip: Add ChangeLog entry for the release of 1.0.6.
------------------------------------------------------------------------
r6269 | marko | 2009-12-02 11:35:22 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): UNIV_IBUF_DEBUG
should not break crash recovery, but UNIV_IBUF_COUNT_DEBUG will.
------------------------------------------------------------------------
r6270 | marko | 2009-12-02 11:36:47 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/srv/srv0start.c
branches/zip: innobase_start_or_create_for_mysql(): Log the zlib version.
------------------------------------------------------------------------
r6271 | marko | 2009-12-02 11:43:49 +0200 (Wed, 02 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/ChangeLog
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: ChangeLog: Document that since r6270, the zlib version number
will be displayed at start-up.
------------------------------------------------------------------------
r6272 | marko | 2009-12-02 11:46:05 +0200 (Wed, 02 Dec 2009) | 1 line
Changed paths:
M /branches/zip/Makefile.am
M /branches/zip/include/univ.i
M /branches/zip/plug.in
branches/zip: Revert changes that were accidentally committed in r6271.
------------------------------------------------------------------------
r6274 | marko | 2009-12-03 14:47:12 +0200 (Thu, 03 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/dict/dict0dict.c
branches/zip: dict_table_check_for_dup_indexes(): Assert that the
data dictionary mutex is being held while table->indexes is accessed.
This is already the case.
Currently, only dict_table_get_next_index() and dict_table_get_first_index()
are being invoked without holding dict_sys->mutex.
------------------------------------------------------------------------
r6275 | pekka | 2009-12-03 18:32:47 +0200 (Thu, 03 Dec 2009) | 10 lines
Changed paths:
M /branches/zip/include/log0recv.h
M /branches/zip/include/trx0sys.h
M /branches/zip/log/log0recv.c
M /branches/zip/trx/trx0sys.c
branches/zip: Minor changes which allow build with UNIV_HOTBACKUP
defined to succeed:
include/trx0sys.h: Allow Hot Backup build to see some
TRX_SYS_DOUBLEWRITE_... macros.
trx/trx0sys.c: Exclude trx_sys_close() function from Hot Backup build.
log/log0recv.[ch]: Exclude recv_sys_var_init() function from Hot Backup build.
This change should not affect !UNIV_HOTBACKUP build.
------------------------------------------------------------------------
r6277 | marko | 2009-12-08 11:13:36 +0200 (Tue, 08 Dec 2009) | 1 line
Changed paths:
M /branches/zip/fsp/fsp0fsp.c
branches/zip: fsp0fsp.c: Add some missing in/out and const qualifiers.
------------------------------------------------------------------------
r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
Changed paths:
M /branches/zip/row/row0sel.c
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
------------------------------------------------------------------------
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
Changed paths:
M /branches/zip/row/row0upd.c
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.
Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it. Then I decided that it would be
too risky. The redundant check was part of the mapping. The
condition may have been dfield_is_null() initially.
This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285. As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
------------------------------------------------------------------------
r6305 | marko | 2009-12-14 13:03:57 +0200 (Mon, 14 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/row/row0umod.c
branches/zip: row_undo_mod_del_unmark_sec_and_undo_update(): Add a missing
const qualifier.
------------------------------------------------------------------------
r6309 | marko | 2009-12-15 14:05:50 +0200 (Tue, 15 Dec 2009) | 3 lines
Changed paths:
M /branches/zip/lock/lock0lock.c
branches/zip: lock_rec_insert_check_and_lock(): Avoid casting away constness.
Use page_rec_get_next_const() instead. This silences a gcc 4.2.4 warning.
Reported by Sunny Bains.
------------------------------------------------------------------------
r6312 | marko | 2009-12-16 10:10:36 +0200 (Wed, 16 Dec 2009) | 6 lines
Changed paths:
M /branches/zip/fil/fil0fil.c
branches/zip: fil_close(): Add #ifndef UNIV_HOTBACKUP around a debug
assertion on mutex.magic_n. InnoDB Hot Backup is a single-threaded
program and does not contain mutexes. This change allows InnoDB Hot
Backup to be compiled with UNIV_DEBUG.
Suggested by Michael Izioumtchenko.
------------------------------------------------------------------------
r6321 | marko | 2009-12-16 16:16:33 +0200 (Wed, 16 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/row/row0merge.c
branches/zip: row_merge_drop_temp_indexes(): Revert a hack to
transaction isolation level that was made unnecessary by r5826 (Issue #337).
When this function is called, any active data dictionary transaction
should have been rolled back.
------------------------------------------------------------------------
r6345 | marko | 2009-12-21 10:46:14 +0200 (Mon, 21 Dec 2009) | 7 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_scan_log_recs(): Non-functional change: Replace a
debug assertion ut_ad(len > 0) with ut_ad(len >= OS_FILE_LOG_BLOCK_SIZE).
This change is only for readability, for Issue #428. Another
assertion on len being an integer multiple of OS_FILE_LOG_BLOCK_SIZE
already ensured together with the old ut_ad(len > 0) that actually len
must be at least OS_FILE_LOG_BLOCK_SIZE.
------------------------------------------------------------------------
r6346 | marko | 2009-12-21 12:03:25 +0200 (Mon, 21 Dec 2009) | 2 lines
Changed paths:
M /branches/zip/log/log0recv.c
branches/zip: recv_recovery_from_checkpoint_finish():
Revert a change that was accidentally committed in r6345.
------------------------------------------------------------------------
r6348 | marko | 2009-12-22 11:04:34 +0200 (Tue, 22 Dec 2009) | 37 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/ha_prototypes.h
M /branches/zip/include/trx0trx.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/trx/trx0i_s.c
M /branches/zip/trx/trx0trx.c
branches/zip: Merge a change from MySQL:
------------------------------------------------------------
revno: 3236
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 17:48:57 +0530
message:
merge to mysql-5.1-bugteam
------------------------------------------------------------
revno: 3234.1.1
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-12-01 14:38:40 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
manual merge 5.0-->5.1, updating InnoDB plugin.
------------------------------------------------------------
revno: 1810.3968.13
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2009-12-01 14:24:44 +0400
message:
Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
The bug 38816 changed the lock that protects THD::query from
LOCK_thread_count to LOCK_thd_data, but didn't update the associated
InnoDB functions.
1. The innobase_mysql_prepare_print_arbitrary_thd and the
innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
removed, since now we have a per-thread mutex: now we don't need to wrap
several inter-thread access tries to THD::query with a single global
LOCK_thread_count lock, so we can simplify the code.
2. The innobase_mysql_print_thd function has been modified to lock
LOCK_thd_data in direct way.
------------------------------------------------------------------------
r6351 | marko | 2009-12-22 11:11:18 +0200 (Tue, 22 Dec 2009) | 1 line
Changed paths:
M /branches/zip/handler/ha_innodb.cc
branches/zip: Remove an obsolete declaration of LOCK_thread_count.
------------------------------------------------------------------------
r6352 | marko | 2009-12-22 12:33:01 +0200 (Tue, 22 Dec 2009) | 104 lines
Changed paths:
M /branches/zip/handler/ha_innodb.cc
M /branches/zip/include/lock0lock.h
M /branches/zip/include/srv0srv.h
M /branches/zip/lock/lock0lock.c
M /branches/zip/log/log0log.c
M /branches/zip/mysql-test/innodb-autoinc.result
M /branches/zip/mysql-test/innodb-autoinc.test
M /branches/zip/row/row0sel.c
M /branches/zip/srv/srv0srv.c
M /branches/zip/srv/srv0start.c
branches/zip: Merge revisions 6206:6350 from branches/5.1,
except r6347, r6349, r6350 which were committed separately
to both branches, and r6310, which was backported from zip to 5.1.
------------------------------------------------------------------------
r6206 | jyang | 2009-11-20 09:38:43 +0200 (Fri, 20 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
branches/5.1: Non-functional change, fix formatting.
------------------------------------------------------------------------
r6230 | sunny | 2009-11-24 23:52:43 +0200 (Tue, 24 Nov 2009) | 3 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
branches/5.1: Fix autoinc failing test results.
(this should be skipped when merging 5.1 into zip)
------------------------------------------------------------------------
r6231 | sunny | 2009-11-25 10:26:27 +0200 (Wed, 25 Nov 2009) | 7 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: Fix BUG#49032 - auto_increment field does not initialize to last value in InnoDB Storage Engine.
We use the appropriate function to read the column value for non-integer
autoinc column types, namely float and double.
rb://208. Approved by Marko.
------------------------------------------------------------------------
r6232 | sunny | 2009-11-25 10:27:39 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix white space errors.
------------------------------------------------------------------------
r6233 | sunny | 2009-11-25 10:28:35 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/include/mach0data.h
M /branches/5.1/include/mach0data.ic
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix tests and make read float/double arg const.
------------------------------------------------------------------------
r6234 | sunny | 2009-11-25 10:29:03 +0200 (Wed, 25 Nov 2009) | 2 lines
Changed paths:
M /branches/5.1/row/row0sel.c
branches/5.1: This is an interim fix, fix whitepsace issues.
------------------------------------------------------------------------
r6235 | sunny | 2009-11-26 01:14:42 +0200 (Thu, 26 Nov 2009) | 9 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: Fix Bug#47720 - REPLACE INTO Autoincrement column with negative values.
This bug is similiar to the negative autoinc filter patch from earlier,
with the additional handling of filtering out the negative column values
set explicitly by the user.
rb://184
Approved by Heikki.
------------------------------------------------------------------------
r6242 | vasil | 2009-11-27 22:07:12 +0200 (Fri, 27 Nov 2009) | 4 lines
Changed paths:
M /branches/5.1/export.sh
branches/5.1:
Minor changes to support plugin snapshots.
------------------------------------------------------------------------
r6306 | calvin | 2009-12-14 15:12:46 +0200 (Mon, 14 Dec 2009) | 5 lines
Changed paths:
M /branches/5.1/mysql-test/innodb-autoinc.result
M /branches/5.1/mysql-test/innodb-autoinc.test
branches/5.1: fix bug#49267: innodb-autoinc.test fails on windows
because of different case mode
There is no change to the InnoDB code, only to fix test case by
changing "T1" to "t1".
------------------------------------------------------------------------
r6324 | jyang | 2009-12-17 06:54:24 +0200 (Thu, 17 Dec 2009) | 8 lines
Changed paths:
M /branches/5.1/handler/ha_innodb.cc
M /branches/5.1/include/lock0lock.h
M /branches/5.1/include/srv0srv.h
M /branches/5.1/lock/lock0lock.c
M /branches/5.1/log/log0log.c
M /branches/5.1/srv/srv0srv.c
M /branches/5.1/srv/srv0start.c
branches/5.1: Fix bug #47814 - Diagnostics are frequently not
printed after a long lock wait in InnoDB. Separate out the
lock wait timeout check thread from monitor information
printing thread.
rb://200 Approved by Marko.
------------------------------------------------------------------------
------------------------------------------------------------------------
r6364 | marko | 2009-12-26 21:06:31 +0200 (Sat, 26 Dec 2009) | 4 lines
Changed paths:
M /branches/zip/ibuf/ibuf0ibuf.c
branches/zip: ibuf_bitmap_get_map_page():
Define a wrapper macro that passes __FILE__, __LINE__ of the caller
to buf_page_get_gen().
This will ease the diagnosis of the likes of Issue #135.
------------------------------------------------------------------------
2009-12-26 19:17:43 +00:00
|
|
|
index, rec, i,
|
|
|
|
dfield->col->mtype, unsigned_type);
|
2007-08-01 11:18:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
btr_pcur_close(&pcur);
|
|
|
|
|
|
|
|
mtr_commit(&mtr);
|
|
|
|
} else {
|
|
|
|
error = DB_RECORD_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
return(error);
|
|
|
|
}
|