• marko's avatar
    branches/innodb+: Merge revisions 4150:4528 from branches/zip: · 4f1d0440
    marko authored
      ------------------------------------------------------------------------
      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.
      ------------------------------------------------------------------------
    4f1d0440
rem0cmp.h 7.88 KB