1. 17 Dec, 2008 2 commits
  2. 16 Dec, 2008 4 commits
  3. 12 Dec, 2008 3 commits
    • marko's avatar
      branches/zip: Clean up the insert buffer subsystem. · d32ffdd1
      marko authored
      Originally, there were provisions in InnoDB for multiple insert buffer
      B-trees, apparently one for each tablespace.
      
      When Heikki implemented innodb_file_per_table (multiple InnoDB
      tablespaces) in MySQL 4.1, he made the insert buffer live only in the
      system tablespace (space 0) but left the provisions in the code.
      
      When Osku Salerma implemented delete buffering, he also cleaned up the
      insert buffer subsystem so that only one insert buffer B-tree exists.
      This patch applies the clean-up to the InnoDB Plugin.
      
      Having a separate patch of the insert buffer clean-up should help us
      better compare the essential changes of the InnoDB Plugin and InnoDB+
      and to track down bugs that are specific to InnoDB+.
      
      IBUF_SPACE_ID: New constant, defined as 0.
      
      ibuf_data_t: Remove.
      
      ibuf_t: Add the applicable fields from ibuf_data_t.  There is only one
      insert buffer tree from now on.
      
      ibuf_page_low(), ibuf_page(): Merge to a single function ibuf_page().
      
      fil_space_t: Remove ibuf_data.
      
      fil_space_get_ibuf_data(): Remove.  There is only one ibuf_data, for
      space IBUF_SPACE_ID.
      
      fil_ibuf_init_at_db_start(): Remove.
      
      ibuf_init_at_db_start(): Fuse with ibuf_data_init_for_space().
      
      ibuf_validate_low(): Remove.  There is only one ibuf tree.
      
      ibuf_free_excess_pages(), ibuf_header_page_get(),
      ibuf_free_excess_pages(): Remove the parameter space, which was always
      0.
      
      ibuf_tree_root_get(): Remove the parameters space and data.  There is
      only one ibuf tree, for space IBUF_SPACE_ID.
      
      ibuf_data_sizes_update(): Rename to ibuf_size_update(), and remove the
      parameter data.  There is only one ibuf data struct.
      
      ibuf_build_entry_pre_4_1_x(): New function, refactored from
      ibuf_build_entry_from_ibuf_rec().
      
      ibuf_data_enough_free_for_insert(), ibuf_data_too_much_free(): Remove
      the parameter data.  There is only one insert buffer tree.
      
      ibuf_add_free_page(), ibuf_remove_free_page(): Remove the parameters
      space and data.  There is only one insert buffer tree.
      
      ibuf_get_merge_page_nos(): Add parenthesis, to reduce diffs to
      branches/innodb+.
      
      ibuf_contract_ext(): Do not pick an insert buffer tree at random.
      There is only one.
      
      ibuf_print(): Print the single insert buffer tree.
      
      rb://19 approved by Heikki on IM
      d32ffdd1
    • marko's avatar
      branches/zip: Improve code locality in btr_cur_search_to_nth_level(). · 565b4b8e
      marko authored
      Make the variables rw_latch and buf_mode local in the for loop.
      Initialize them at the beginning of each for loop round to reduce
      register spilling on register-starved platforms such as the x86.  Move
      the assignment of rw_latch and buf_mode from the end of the loop to
      the beginning of the loop.  These parameters will only be needed in
      the buf_page_get_gen() call at the start of the loop.
      
      Remove the second (redundant) call to ibuf_should_try().
      
      ibuf_should_try(): Now that the successful calls to this function will
      be halved, halve the magic constant that ibuf_flush_count will be
      compared to, accordingly.
      
      rb://61 approved by Heikki over IM.
      565b4b8e
    • marko's avatar
      branches/zip: btr_cur_search_to_nth_level(): Remove a duplicate check · f37e8725
      marko authored
      for (rw_latch != RW_NO_LATCH) around debug code.
      f37e8725
  4. 11 Dec, 2008 1 commit
  5. 10 Dec, 2008 3 commits
    • calvin's avatar
      branches/zip: fix Mantis issue #138 InnoDB fails if · cb876f88
      calvin authored
      innodb_buffer_pool_size >= 4096M on x64 Windows
      
      All three srv_buf_pool related variables are defined as ulong, which is
      32-bit on 64-bit Windows. They are changed to 64-bit ulint. Also
      system_info.dwPageSize appears to be 32-bit only. Casting to 64-bit
      is required.
      
      Approved by:	Marko (on IM)
      cb876f88
    • calvin's avatar
      branches/zip: change diff and result files eol-style to LF · 68624f24
      calvin authored
      The patch utility takes LF style diff, and mysql-test-run 
      also only takes LF style, even on Windows.
      68624f24
    • calvin's avatar
      branches/zip: Merge r3458:3479 from branches/5.1: · 02d8e95b
      calvin authored
        ------------------------------------------------------------------------
        r3479 | calvin | 2008-12-10 15:30:05 -0600 (Wed, 10 Dec 2008) | 4 lines
        
        branches/5.1: change .result file eol-style to LF
        
        mysql-test-run only takes LF style even on Windows.
        
        ------------------------------------------------------------------------
      02d8e95b
  6. 09 Dec, 2008 2 commits
    • vasil's avatar
      branches/zip: · 7ed448ce
      vasil authored
      Merge 2929:3458 from branches/5.1 (resolving conflict in c3257,
      note also that r3363 reverted r2933 so there are not changes in
      mysql-test/innodb-autoinc.result with the current merge):
      
        ------------------------------------------------------------------------
        r2933 | calvin | 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) | 10 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
        
        branches/5.1: correct the result file innodb-autoinc.result
        
        Change the followings:
          auto_increment_increment
          auto_increment_offset
        
        to
          auto-increment-increment
          auto-increment-offset
        
        ------------------------------------------------------------------------
        r2981 | marko | 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) | 5 lines
        Changed paths:
           M /branches/5.1/row/row0mysql.c
        
        branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading
        comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while
        the "latin1" character set (normally ISO-8859-1, but in MySQL it actually
        refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1)
        takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset).
        ------------------------------------------------------------------------
        r3114 | calvin | 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) | 8 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
        
        branches/5.1: fix bug#40386: Not flushing query cache after truncate
        
        ha_statistics.records can not be 0 unless the table is empty, set to
        1 instead. The original problem of bug#29507 is fixed in the server.
        
        Additional test was done with the fix of bug#29507 in the server.
        
        Approved by: Heikki (on IM)
        ------------------------------------------------------------------------
        r3257 | inaam | 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) | 13 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/srv/srv0srv.c
           M /branches/5.1/trx/trx0trx.c
        
        branches/5.1 bug#40760
        
        The config param innodb_thread_concurrency is dynamically set and is
        read when a thread enters/exits innodb. If the value is changed between
        the enter and exit time the behaviour becomes erratic.
        The fix is not to use srv_thread_concurrency when exiting, instead use
        the flag trx->declared_to_be_inside_innodb.
        
        rb://57
        
        Approved by: Marko
        
        
        ------------------------------------------------------------------------
        r3363 | calvin | 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) | 13 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
        
        branches/5.1: revert the changes in r2933
        
        The changes in r2933 causes test failure on Linux.
        More investigation is needed for Windows.
        
        Change the followings in innodb-autoinc.result:
          auto-increment-increment
          auto-increment-offset
        
        back to:
          auto_increment_increment
          auto_increment_offset
        
        ------------------------------------------------------------------------
        r3412 | vasil | 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) | 7 lines
        Changed paths:
           M /branches/5.1/trx/trx0undo.c
        
        branches/5.1:
        
        Add the traditional 2 spaces after the timestamp so the message does
        not look like:
        
        070223 13:26:01InnoDB: Warning: canno....
        
        ------------------------------------------------------------------------
        r3458 | vasil | 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) | 51 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug34300.test
        
        branches/5.1:
        
        Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test:
        
          main.innodb_bug34300           [ fail ]
          
          mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
          
          Aborting: main.innodb_bug34300 failed in default mode. 
        
        The changeset is this:
        
          ------------------------------------------------------------
          revno: 2709.1.10
          committer: Staale Smedseng <staale.smedseng@sun.com>
          branch nick: b22891-51-bugteam
          timestamp: Thu 2008-11-20 08:51:48 +0100
          message:
            A fix for Bug#22891 "session level max_allowed_packet can be
            set but is ignored".
          
            This patch makes @@session.max_allowed_packed and
            @@session.net_buffer_length read-only as suggested in the bug
            report. The user will have to use SET GLOBAL (and reconnect)
            to alter the session values of these variables.
          
            The error string ER_VARIABLE_IS_READONLY is introduced.
          
            Tests are modified accordingly.
          modified:
            mysql-test/r/func_compress.result
            mysql-test/r/max_allowed_packet_basic.result
            mysql-test/r/max_allowed_packet_func.result
            mysql-test/r/net_buffer_length_basic.result
            mysql-test/r/packet.result
            mysql-test/r/union.result
            mysql-test/r/variables.result
            mysql-test/t/func_compress.test
            mysql-test/t/innodb_bug34300.test
            mysql-test/t/max_allowed_packet_basic.test
            mysql-test/t/max_allowed_packet_func.test
            mysql-test/t/net_buffer_length_basic.test
            mysql-test/t/packet.test
            mysql-test/t/union.test
            mysql-test/t/variables.test
            sql/set_var.cc
            sql/set_var.h
            sql/share/errmsg.txt
          ------------------------------------------------------------
        
        
        ------------------------------------------------------------------------
      7ed448ce
    • marko's avatar
      branches/zip: row_purge_remove_sec_if_poss_low(): Allocate mtr_vers · 0b04505e
      marko authored
      from the stack, not with mem_alloc().
      0b04505e
  7. 08 Dec, 2008 1 commit
  8. 05 Dec, 2008 1 commit
  9. 04 Dec, 2008 2 commits
    • vasil's avatar
      branches/zip: · 23a75236
      vasil authored
      Revert our temporary fix for Bug#40360 Binlog related errors with binlog off
      
      This bug was fixed in MySQL code.
      
      Our fix went into r2944 and r2947, but this patch does not entirely revert
      those revisions because we want to leave the test case that was introduced
      and also r2944 itself reverted r2935 and r2936. So if we completely revert
      r2944 and r2947 then we would loose the test and will restore r2935 and
      r2936.
      
      This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql
      add an equivallent, see Bug#40360
      23a75236
    • vasil's avatar
      branches/zip: · 13c01e48
      vasil authored
      Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it
      
      Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
      since MySQL implemented the former, see http://bugs.mysql.com/30930.
      
      Approved by:	Marko (https://svn.innodb.com/rb/r/40, rb://40)
      13c01e48
  10. 02 Dec, 2008 5 commits
    • vasil's avatar
      branches/zip: · 0e645ded
      vasil authored
      Resurrect a ChangeLog entry that I removed in c3331 with a fake date
      so it does not appear that it has been included in 1.0.2.
      0e645ded
    • vasil's avatar
      branches/zip: · 931fc75c
      vasil authored
      Now that 1.0.2 is out, the current tree is version 1.0.3.
      931fc75c
    • vasil's avatar
      branches/zip: · 565c0fe0
      vasil authored
      Remove an entry from the ChnageLog for a change that was made before
      the release of 1.0.2 but was not included in that release.
      565c0fe0
    • vasil's avatar
      branches/zip: · b35f6645
      vasil authored
      Add entry in the ChangeLog for the release of 1.0.2.
      b35f6645
    • marko's avatar
      branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf · de011c21
      marko authored
      from the free list, zero out the DB_TRX_ID and DB_ROLL_PTR of the
      deleted record if the new record would not overwrite these
      fields. This fixes a harmless content mismatch reported by
      page_zip_validate() that was reported as Issue #111.
      rb://55 approved by Sunny Bains.
      de011c21
  11. 28 Nov, 2008 1 commit
  12. 27 Nov, 2008 3 commits
    • vasil's avatar
      branches/zip: · f5abca16
      vasil authored
      Non-functional change in win-plugin/win-plugin.diff: fix the file name
      before the diff, this is irrelevant but it is nice to be the same as
      the file name on the following line.
      f5abca16
    • vasil's avatar
      branches/zip: · 2a028069
      vasil authored
      * Remove a change from win-plugin/win-plugin.diff about time_t because
        MySQL has used VS2005 for building 5.1.30.
      
      * Adjust the line numbers so the patch applies cleanly without fuzz and
        offset messages.
      
      Submitted by:	Calvin
      2a028069
    • vasil's avatar
      branches/zip: · 5bd71ba1
      vasil authored
      Fix Mantis issue#130 wdl: does not handle 64-bit address
      
      - Change the call from strtoul() to strtoull()
      - Change "%16X" to "%16llx" when scanning preferred load address
      
      rb://58
      
      Submitted by:	Calvin
      Approved by:	Marko
      5bd71ba1
  13. 26 Nov, 2008 1 commit
    • marko's avatar
      branches/zip: row_merge_drop_temp_indexes(): Replace the WHILE 1 with · afe9ee1f
      marko authored
      WHILE 1=1 in the SQL procedure, so that the loop will actually be
      entered and temporary indexes be dropped during crash recovery.
      Thanks to Sunny Bains for pointing this out.
      
      Tested as follows:
      
      Set a breakpoint in row_merge_rename_indexes.
      
      CREATE TABLE t(a INT)ENGINE=InnoDB;
      CREATE INDEX a ON t(a);
      
      -- The breakpoint will be reached.  Kill and restart mysqld.
      SHOW CREATE TABLE t;
      -- This shows the MySQL .frm file, without and index.
      CREATE TABLE innodb_table_monitor(a INT)ENGINE=InnoDB;
      -- This will dump the InnoDB dictionary to the error log, without the index.
      afe9ee1f
  14. 24 Nov, 2008 1 commit
  15. 21 Nov, 2008 3 commits
  16. 20 Nov, 2008 3 commits
  17. 19 Nov, 2008 1 commit
  18. 17 Nov, 2008 2 commits
    • michael's avatar
      branches/zip: rb://53 · 337c4d95
      michael authored
      Final version of rb://53, fixes the styling of a comment, makes
      the definition and the declaration of thd_supports_xa() identical commentwise.
      337c4d95
    • michael's avatar
      branches/zip: · c6227f37
      michael authored
      rb://53
      
      Improve innodb_supports_xa system variable handling and 
      reduces the number of retrievals of the value from MySQL.
      
      Approved by: Marko, over IM
      c6227f37
  19. 12 Nov, 2008 1 commit