• marko's avatar
    branches/innodb+: Merge revisions 3312:3459 from branches/zip: · 4c7f7c42
    marko authored
      ------------------------------------------------------------------------
      r3328 | marko | 2008-12-02 10:16:05 +0200 (Tue, 02 Dec 2008) | 7 lines
    
      branches/zip: page_cur_insert_rec_zip(): When allocating insert_buf
      from the free list, zero out the DB_TRX_ID and DB_ROLL_PTR of the
      deleted record if the new record would not overwrite these
      fields. This fixes a harmless content mismatch reported by
      page_zip_validate() that was reported as Issue #111.
      rb://55 approved by Sunny Bains.
      ------------------------------------------------------------------------
      r3329 | vasil | 2008-12-02 12:03:17 +0200 (Tue, 02 Dec 2008) | 4 lines
    
      branches/zip:
    
      Add entry in the ChangeLog for the release of 1.0.2.
      ------------------------------------------------------------------------
      r3331 | vasil | 2008-12-02 12:09:20 +0200 (Tue, 02 Dec 2008) | 5 lines
    
      branches/zip:
    
      Remove an entry from the ChnageLog for a change that was made before
      the release of 1.0.2 but was not included in that release.
      ------------------------------------------------------------------------
      r3333 | vasil | 2008-12-02 12:11:54 +0200 (Tue, 02 Dec 2008) | 4 lines
    
      branches/zip:
    
      Now that 1.0.2 is out, the current tree is version 1.0.3.
      ------------------------------------------------------------------------
      r3336 | vasil | 2008-12-02 13:34:36 +0200 (Tue, 02 Dec 2008) | 5 lines
    
      branches/zip:
    
      Resurrect a ChangeLog entry that I removed in c3331 with a fake date
      so it does not appear that it has been included in 1.0.2.
      ------------------------------------------------------------------------
      r3361 | vasil | 2008-12-04 18:10:08 +0200 (Thu, 04 Dec 2008) | 9 lines
    
      branches/zip:
    
      Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it
    
      Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
      since MySQL implemented the former, see http://bugs.mysql.com/30930.
    
      Approved by:    Marko (https://svn.innodb.com/rb/r/40, rb://40)
      ------------------------------------------------------------------------
      r3362 | vasil | 2008-12-04 18:49:24 +0200 (Thu, 04 Dec 2008) | 15 lines
    
      branches/zip:
    
      Revert our temporary fix for Bug#40360 Binlog related errors with binlog off
    
      This bug was fixed in MySQL code.
    
      Our fix went into r2944 and r2947, but this patch does not entirely revert
      those revisions because we want to leave the test case that was introduced
      and also r2944 itself reverted r2935 and r2936. So if we completely revert
      r2944 and r2947 then we would loose the test and will restore r2935 and
      r2936.
    
      This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql
      add an equivallent, see Bug#40360
      ------------------------------------------------------------------------
      r3404 | marko | 2008-12-05 10:02:54 +0200 (Fri, 05 Dec 2008) | 5 lines
    
      branches/zip: row_undo_mod_del_mark_or_remove_sec_low(): Do not
      complain if the record is not found.  Explain that this is possible
      when a deadlock occurs during an update.  Heikki investigated this
      in Issue #134.
      ------------------------------------------------------------------------
      r3432 | marko | 2008-12-08 14:14:01 +0200 (Mon, 08 Dec 2008) | 4 lines
    
      branches/zip: ibuf_merge_or_delete_for_page(): Remove the redundant
      checks for ibuf_fixed_addr_page() || fsp_descr_page().  The one at
      the beginning of the function is enough.
      ------------------------------------------------------------------------
      r3456 | marko | 2008-12-09 10:31:26 +0200 (Tue, 09 Dec 2008) | 3 lines
    
      branches/zip: row_purge_remove_sec_if_poss_low(): Allocate mtr_vers
      from the stack, not with mem_alloc().
      ------------------------------------------------------------------------
      r3459 | vasil | 2008-12-09 11:49:03 +0200 (Tue, 09 Dec 2008) | 152 lines
    
      branches/zip:
    
      Merge 2929:3458 from branches/5.1 (resolving conflict in c3257,
      note also that r3363 reverted r2933 so there are not changes in
      mysql-test/innodb-autoinc.result with the current merge):
    
        ------------------------------------------------------------------------
        r2933 | calvin | 2008-10-30 02:57:31 +0200 (Thu, 30 Oct 2008) | 10 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
    
        branches/5.1: correct the result file innodb-autoinc.result
    
        Change the followings:
          auto_increment_increment
          auto_increment_offset
    
        to
          auto-increment-increment
          auto-increment-offset
    
        ------------------------------------------------------------------------
        r2981 | marko | 2008-11-07 14:54:10 +0200 (Fri, 07 Nov 2008) | 5 lines
        Changed paths:
           M /branches/5.1/row/row0mysql.c
    
        branches/5.0: row_mysql_store_col_in_innobase_format(): Correct a misleading
        comment. In the UTF-8 encoding, ASCII takes 1 byte per character, while
        the "latin1" character set (normally ISO-8859-1, but in MySQL it actually
        refers to the Windows Code Page 1252 a.k.a. CP1252, WinLatin1)
        takes 1 to 3 bytes (1 to 2 bytes for the ISO-8859-1 subset).
        ------------------------------------------------------------------------
        r3114 | calvin | 2008-11-14 20:31:48 +0200 (Fri, 14 Nov 2008) | 8 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
    
        branches/5.1: fix bug#40386: Not flushing query cache after truncate
    
        ha_statistics.records can not be 0 unless the table is empty, set to
        1 instead. The original problem of bug#29507 is fixed in the server.
    
        Additional test was done with the fix of bug#29507 in the server.
    
        Approved by: Heikki (on IM)
        ------------------------------------------------------------------------
        r3257 | inaam | 2008-11-24 22:06:50 +0200 (Mon, 24 Nov 2008) | 13 lines
        Changed paths:
           M /branches/5.1/handler/ha_innodb.cc
           M /branches/5.1/srv/srv0srv.c
           M /branches/5.1/trx/trx0trx.c
    
        branches/5.1 bug#40760
    
        The config param innodb_thread_concurrency is dynamically set and is
        read when a thread enters/exits innodb. If the value is changed between
        the enter and exit time the behaviour becomes erratic.
        The fix is not to use srv_thread_concurrency when exiting, instead use
        the flag trx->declared_to_be_inside_innodb.
    
        rb://57
    
        Approved by: Marko
    
    
        ------------------------------------------------------------------------
        r3363 | calvin | 2008-12-04 19:00:20 +0200 (Thu, 04 Dec 2008) | 13 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb-autoinc.result
    
        branches/5.1: revert the changes in r2933
    
        The changes in r2933 causes test failure on Linux.
        More investigation is needed for Windows.
    
        Change the followings in innodb-autoinc.result:
          auto-increment-increment
          auto-increment-offset
    
        back to:
          auto_increment_increment
          auto_increment_offset
    
        ------------------------------------------------------------------------
        r3412 | vasil | 2008-12-05 10:46:18 +0200 (Fri, 05 Dec 2008) | 7 lines
        Changed paths:
           M /branches/5.1/trx/trx0undo.c
    
        branches/5.1:
    
        Add the traditional 2 spaces after the timestamp so the message does
        not look like:
    
        070223 13:26:01InnoDB: Warning: canno....
    
        ------------------------------------------------------------------------
        r3458 | vasil | 2008-12-09 11:21:08 +0200 (Tue, 09 Dec 2008) | 51 lines
        Changed paths:
           M /branches/5.1/mysql-test/innodb_bug34300.test
    
        branches/5.1:
    
        Merge a change from MySQL to fix the failing innodb_bug34300 mysql-test:
    
          main.innodb_bug34300           [ fail ]
    
          mysqltest: At line 11: query 'SET @@max_allowed_packet=16777216' failed: 1621: SESSION variable 'max_allowed_packet' is read-only. Use SET GLOBAL to assign the value
    
          Aborting: main.innodb_bug34300 failed in default mode.
    
        The changeset is this:
    
          ------------------------------------------------------------
          revno: 2709.1.10
          committer: Staale Smedseng <staale.smedseng@sun.com>
          branch nick: b22891-51-bugteam
          timestamp: Thu 2008-11-20 08:51:48 +0100
          message:
            A fix for Bug#22891 "session level max_allowed_packet can be
            set but is ignored".
    
            This patch makes @@session.max_allowed_packed and
            @@session.net_buffer_length read-only as suggested in the bug
            report. The user will have to use SET GLOBAL (and reconnect)
            to alter the session values of these variables.
    
            The error string ER_VARIABLE_IS_READONLY is introduced.
    
            Tests are modified accordingly.
          modified:
            mysql-test/r/func_compress.result
            mysql-test/r/max_allowed_packet_basic.result
            mysql-test/r/max_allowed_packet_func.result
            mysql-test/r/net_buffer_length_basic.result
            mysql-test/r/packet.result
            mysql-test/r/union.result
            mysql-test/r/variables.result
            mysql-test/t/func_compress.test
            mysql-test/t/innodb_bug34300.test
            mysql-test/t/max_allowed_packet_basic.test
            mysql-test/t/max_allowed_packet_func.test
            mysql-test/t/net_buffer_length_basic.test
            mysql-test/t/packet.test
            mysql-test/t/union.test
            mysql-test/t/variables.test
            sql/set_var.cc
            sql/set_var.h
            sql/share/errmsg.txt
          ------------------------------------------------------------
        ------------------------------------------------------------------------
      ------------------------------------------------------------------------
    4c7f7c42
ha_innodb.cc 279 KB