• marko's avatar
    branches/innodb+: Merge revisions 4072:4150 from branches/zip: · 6e8805e0
    marko authored
      ------------------------------------------------------------------------
      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.
      ------------------------------------------------------------------------
    6e8805e0
srv0srv.h 20.5 KB