1. 04 May, 2010 16 commits
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 3ba71f73
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3438
        revision-id: marko.makela@oracle.com-20100504105546-4ew7a77e9uhxmhho
        parent: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 13:55:46 +0300
        message:
          Remove UNIV_BTR_AVOID_COPY. It was broken because btr_attach_half_pages()
          would get the block, new_block in the wrong order.
          Fixing that would have complicated the function even further
          for this marginal case.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
          storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
        ------------------------------------------------------------
      3ba71f73
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 8e27737f
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3437
        revision-id: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug
        parent: marko.makela@oracle.com-20100503122859-k73bl51re93o0mt4
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-04 12:31:28 +0300
        message:
          btr_page_split_and_insert(): Correct the fix of Bug #52964.
          When split_rec==NULL, choose the correct node pointer key (first_rec).
        modified:
          storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
        ------------------------------------------------------------
      8e27737f
    • Vasil Dimov's avatar
      Followup to vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he : · 0f5326b4
      Vasil Dimov authored
      Add the missing parameter to mutex_create().
      0f5326b4
    • Vasil Dimov's avatar
      Followup to vasil.dimov@oracle.com-20100504104629-0ovtc5lae2ghn7he : · 8d07cec0
      Vasil Dimov authored
      Remove analyze_mutex_key now that this mutex does not exist.
      8d07cec0
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · b0d1eaab
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3436
        revision-id: marko.makela@oracle.com-20100503122859-k73bl51re93o0mt4
        parent: vasil.dimov@oracle.com-20100430100236-9ncldjxpi14ec7el
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-05-03 15:28:59 +0300
        message:
          buf_zip_decompress(): Allow BUF_NO_CHECKSUM_MAGIC as the stamped checksum.
          buf_page_get_gen(): Assert that buf_zip_decompress() succeeds.
          Callers are not prepared for a NULL return value. (Bug #53248)
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/buf/buf0buf.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbuf%2Fbuf0buf.c
        ------------------------------------------------------------
      b0d1eaab
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · bc3dc7df
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3433
        revision-id: mmakela@bk-internal.mysql.com-20100429133750-7ggyepb4erfg8eqe
        parent: mmakela@bk-internal.mysql.com-20100429132945-l4gm15tsmkjm24kv
        committer: Marko Makela <mmakela@bk-internal.mysql.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-04-29 15:37:50 +0200
        message:
          recv_sys_init(), recv_sys_empty_hash(): Shrink recv_sys->addr_hash.
          recv_addr_t: Turn space,page_no into bitfields to save space on 64-bit.
          This addresses Bug #53122 in the InnoDB Plugin.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/include/log0recv.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Flog0recv.h
          storage/innodb_plugin/log/log0recv.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flog%2Flog0recv.c
        ------------------------------------------------------------
      bc3dc7df
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 4b2c8e26
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3431
        revision-id: mmakela@bk-internal.mysql.com-20100429132743-8rjjgoqbvddr2i5x
        parent: vasil.dimov@oracle.com-20100428103452-6btsq4xv6v1etb5b
        committer: Marko Makela <mmakela@bk-internal.mysql.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-04-29 15:27:43 +0200
        message:
          Reduce the next-key locking of READ UNCOMMITTED to match that of
          READ COMMITTED in the InnoDB Plugin. (Bug #48607)
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
          storage/innodb_plugin/lock/lock0lock.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flock%2Flock0lock.c
          storage/innodb_plugin/row/row0mysql.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0mysql.c
          storage/innodb_plugin/row/row0sel.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0sel.c
        ------------------------------------------------------------
      4b2c8e26
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 32aef81e
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3430
        revision-id: vasil.dimov@oracle.com-20100428103452-6btsq4xv6v1etb5b
        parent: vasil.dimov@oracle.com-20100428103200-vs5nzx245sv2qy7n
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-04-28 13:34:52 +0300
        message:
          Bug#53046 dict_update_statistics_low can still be run concurrently
          on same table
          
          Followup to vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr :
          
          Add more asserions, which I forgot.
        modified:
          storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
        ------------------------------------------------------------
        revno: 3429
        revision-id: vasil.dimov@oracle.com-20100428103200-vs5nzx245sv2qy7n
        parent: vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-04-28 13:32:00 +0300
        message:
          Revert the fix of Bug#38996 Race condition in ANALYZE TABLE
          
          This is branches/zip@r6032 in SVN and _is part_ of
          revid:svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:6113
          in BZR.
          
          This is being reverted because now the code is serialized directly on
          index->stat_n_diff_key_vals[] as the fix for
          Bug#53046 dict_update_statistics_low can still be run concurrently on same table
          goes.
        modified:
          storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
        ------------------------------------------------------------
        revno: 3428
        revision-id: vasil.dimov@oracle.com-20100428102033-dt3caf531rs3lidr
        parent: vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-04-28 13:20:33 +0300
        message:
          Followup to vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7:
          
          Address Marko's suggestions wrt the fix of
          Bug#53046 dict_update_statistics_low can still be run concurrently
          on same table
        modified:
          storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
        ------------------------------------------------------------
        revno: 3427
        revision-id: vasil.dimov@oracle.com-20100428084627-wtrmc66wqvjsdgj7
        parent: mmakela@bk-internal.mysql.com-20100428063325-irts4ze9et5bsqdq
        committer: Vasil Dimov <vasil.dimov@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Wed 2010-04-28 11:46:27 +0300
        message:
          Fix Bug#53046 dict_update_statistics_low can still be run concurrently
          on same table
          
          Protect dict_index_t::stat_n_diff_key_vals[] with an array of
          mutexes.
          
          Testing: tested all code paths under UNIV_SYNC_DEBUG
          for the one in dict_print() one has to enable the InnoDB table monitor:
          CREATE TABLE innodb_table_monitor (a int) ENGINE=INNODB;
        modified:
          storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
          storage/innodb_plugin/dict/dict0dict.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0dict.c
          storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
          storage/innodb_plugin/include/dict0dict.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0dict.h
        ------------------------------------------------------------
      32aef81e
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · c3ea5056
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3422
        revision-id: marko.makela@oracle.com-20100427134738-1poi5n4hn29ndne5
        parent: marko.makela@oracle.com-20100426131029-1ffja69h6n88q6bo
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-04-27 16:47:38 +0300
        message:
          row_merge_drop_temp_indexes(): Remove a bogus char-to-ulint cast.
        modified:
          storage/innodb_plugin/row/row0merge.c 1414@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Frow%2Frow0merge.c
        ------------------------------------------------------------
      c3ea5056
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 6cd860af
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3421
        revision-id: marko.makela@oracle.com-20100426131029-1ffja69h6n88q6bo
        parent: marko.makela@oracle.com-20100426112609-f7lgl8crw4x4sfkk
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-26 16:10:29 +0300
        message:
          lock_rec_queue_validate(): Disable a bogus check that
          a transaction that holds a lock on a clustered index record
          also holds a lock on the secondary index record.
        modified:
          storage/innobase/lock/lock0lock.c 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Flock%2Flock0lock.c
          storage/innodb_plugin/lock/lock0lock.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flock%2Flock0lock.c
        ------------------------------------------------------------
      6cd860af
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 126f3530
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3420
        revision-id: marko.makela@oracle.com-20100426112609-f7lgl8crw4x4sfkk
        parent: marko.makela@oracle.com-20100426110856-14tc8re1f5kp5j3g
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-26 14:26:09 +0300
        message:
          recv_sys_init(): Skip the red-black tree in Hot Backup.
        modified:
          storage/innodb_plugin/log/log0recv.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Flog%2Flog0recv.c
        ------------------------------------------------------------
      126f3530
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · a5db3eff
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3419
        revision-id: marko.makela@oracle.com-20100426110856-14tc8re1f5kp5j3g
        parent: marko.makela@oracle.com-20100426105215-2e9nzq8z0nfwxjky
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-26 14:08:56 +0300
        message:
          Add a test case for Bug #52745.
        added:
          mysql-test/suite/innodb_plugin/r/innodb_bug52745.result innodb_bug52745.resu-20100426110444-2211220xcgz0el4v-1
          mysql-test/suite/innodb_plugin/t/innodb_bug52745.test innodb_bug52745.test-20100426110444-2211220xcgz0el4v-2
        ------------------------------------------------------------
      a5db3eff
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · f18d97ac
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3417
        revision-id: marko.makela@oracle.com-20100426102725-as2vc44ddykg1786
        parent: marko.makela@oracle.com-20100426073949-txnbqldrl9fdlapx
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-26 13:27:25 +0300
        message:
          row_search_for_mysql(): Never try semi-consistent read in unique searches.
          They are only useful in table scans. (Bug #52663)
        added:
          mysql-test/suite/innodb/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-1
          mysql-test/suite/innodb/t/innodb_bug52663-master.opt innodb_bug52663maste-20100426102328-fymyevkummgyc3gm-2
          mysql-test/suite/innodb/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-3
          mysql-test/suite/innodb_plugin/r/innodb_bug52663.result innodb_bug52663.resu-20100426102328-fymyevkummgyc3gm-4
          mysql-test/suite/innodb_plugin/t/innodb_bug52663.test innodb_bug52663.test-20100426102328-fymyevkummgyc3gm-5
        modified:
          storage/innobase/row/row0sel.c 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Frow%2Frow0sel.c
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/row/row0sel.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frow%2Frow0sel.c
        ------------------------------------------------------------
      f18d97ac
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · edb67bf4
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3416
        revision-id: marko.makela@oracle.com-20100426073949-txnbqldrl9fdlapx
        parent: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-26 10:39:49 +0300
        message:
          btr_page_split_and_insert(): Silence a compiler warning
          about possibly uninitialized variable insert_left.
        modified:
          storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
        ------------------------------------------------------------
      edb67bf4
    • Vasil Dimov's avatar
      Merge from mysql-5.1-innodb: · 08c84074
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3415
        revision-id: calvin.sun@oracle.com-20100422191614-2atswbilyyxep6rm
        parent: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
        committer: Calvin Sun <calvin.sun@oracle.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-04-22 14:16:14 -0500
        message:
          mysql-5.1-innodb: add error codes to innodb_bug51920.test
          kill of active connection yields different error code
          depending on platform.
        modified:
          mysql-test/suite/innodb/r/innodb_bug51920.result 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.result
          mysql-test/suite/innodb/t/innodb_bug51920.test 6918@cee13dc7-1704-0410-992b-c9b4543f1246:branches%2F5.1%2Fmysql-test%2Finnodb_bug51920.test
          mysql-test/suite/innodb_plugin/r/innodb_bug51920.result 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.result
          mysql-test/suite/innodb_plugin/t/innodb_bug51920.test 6919@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug51920.test
        ------------------------------------------------------------
      08c84074
    • Sunny Bains's avatar
      29683441
  2. 03 May, 2010 1 commit
  3. 30 Apr, 2010 5 commits
  4. 29 Apr, 2010 1 commit
  5. 27 Apr, 2010 2 commits
    • Sunny Bains's avatar
      Fix bug introduced by r3038. When a transaction is rolled back by the · 248dd65f
      Sunny Bains authored
      lock monitor thread, it may have locks that are granted to waited to
      waiting transactions. These waiting transactions will need to be woken
      up but their trx->lock_wait_timeout flag will be FALSE causing the old
      code to break. What we need is a flag that covers the entire lock
      release process not individual transactions. The fix is to move the
      flag out of trx_t and into srv_sys_t.
      248dd65f
    • Inaam Rana's avatar
      buf_flush_list() should return failure if one of the buffer pool · e2a3bb5a
      Inaam Rana authored
      was skipped because another flush batch was active. This is to
      ensure that the when we return success then it is guaranteed that
      all pages up to the lsn_limit have been flushed to the disk.
      e2a3bb5a
  6. 23 Apr, 2010 3 commits
  7. 22 Apr, 2010 10 commits
    • jyang's avatar
      Merge from mysql-trunk-innodb to local repository · 83f422fe
      jyang authored
      83f422fe
    • jyang's avatar
      Register newly added purge thread to performance schema tracking. · 477b7115
      jyang authored
      rb://289, approved by Marko
      477b7115
    • Vasil Dimov's avatar
      Merge r3403..3414 from mysql-5.1-innodb: · 66b4a1e6
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3414
        revision-id: marko.makela@oracle.com-20100422093342-jf9ojlzdqsdebohn
        parent: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Thu 2010-04-22 12:33:42 +0300
        message:
          Correct the definition of DICT_SYS_INDEXES_NAME_FIELD.
          When row_merge_drop_temp_indexes() was reworked to drop the indexes
          via the data dictionary cache, the code was broken because it would
          read the index name from the wrong field.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/dict/dict0boot.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0boot.c
          storage/innodb_plugin/include/dict0boot.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fdict0boot.h
        ------------------------------------------------------------
        revno: 3413
        revision-id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
        parent: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 21:53:59 +0300
        message:
          btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964)
          
          btr_page_tuple_smaller(): New function, refactored from
          btr_page_split_and_insert().
          
          btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec().
          Note that a NULL return may mean that the tuple is to be inserted into
          either the lower or upper page, to be determined by btr_page_tuple_smaller().
          
          btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL,
          invoke btr_page_tuple_smaller() to determine which half-page the tuple
          belongs to.
          
          Reviewed by Sunny Bains
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
        ------------------------------------------------------------
        revno: 3412
        revision-id: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
        parent: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 13:27:23 +0300
        message:
          dict_create_index_step(): Be strict about DYNAMIC and COMPRESSED tables.
          Bug #50495 is about REDUNDANT and COMPACT tables, after all.
        modified:
          mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
          mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
        ------------------------------------------------------------
        revno: 3411
        revision-id: marko.makela@oracle.com-20100421100029-mji6lmdgvuqh96qq
        parent: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 13:00:29 +0300
        message:
          ha_innobase::add_index(): Only check for duplicate indexes
          when the data dictionary is locked.
          This fixes a UNIV_DEBUG assertion failure in innodb-index.test.
        modified:
          storage/innodb_plugin/handler/handler0alter.cc 1845@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fhandler%2Fhandler0alter.cc
        ------------------------------------------------------------
        revno: 3410
        revision-id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
        parent: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 12:50:33 +0300
        message:
          dtuple_convert_big_rec(): Store locally any fields whose maximum length
          is less than 256 bytes. (Bug #52745)
          Add related comments and debug assertions to the "offsets"
          functions in rem0rec.c.
          Approved by Sunny Bains
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/data/data0data.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdata%2Fdata0data.c
          storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
        ------------------------------------------------------------
        revno: 3409
        revision-id: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
        parent: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 12:40:32 +0300
        message:
          Adjust tests for the Bug #50495 fix.
        modified:
          mysql-test/suite/innodb_plugin/r/innodb-zip.result 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.result
          mysql-test/suite/innodb_plugin/t/innodb-zip.test 2252@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb-zip.test
          mysql-test/suite/innodb_plugin/t/innodb_bug36169.test 2418@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fmysql-test%2Finnodb_bug36169.test
        ------------------------------------------------------------
        revno: 3408
        revision-id: marko.makela@oracle.com-20100421091611-uu46iygmv5sizjru
        parent: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 12:16:11 +0300
        message:
          rec_convert_dtuple_to_rec(): Correct the debug check.
          The "extern" accessor functions return zero or nonzero, not 0 or 1.
        modified:
          storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
        ------------------------------------------------------------
        revno: 3407
        revision-id: marko.makela@oracle.com-20100421063916-h3gwjea7jzjilyww
        parent: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Wed 2010-04-21 09:39:16 +0300
        message:
          rec_convert_dtuple_to_rec(): Add a debug check.
        modified:
          storage/innodb_plugin/rem/rem0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Frem%2Frem0rec.c
        ------------------------------------------------------------
        revno: 3406
        revision-id: marko.makela@oracle.com-20100420201550-cax1xywvlcdshgfg
        parent: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
        committer: Marko Makela <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-04-20 23:15:50 +0300
        message:
          btr_cur_optimistic_insert(): Remove unused variable "heap".
        modified:
          storage/innodb_plugin/btr/btr0cur.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0cur.c
        ------------------------------------------------------------
        revno: 3405
        revision-id: marko.makela@oracle.com-20100420114222-diq7h2hiom9ww6me
        parent: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
        committer: Marko Makela <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-04-20 14:42:22 +0300
        message:
          dict_create_index_step(): Invoke dict_index_add_to_cache()
          in strict mode only if innodb_strict_mode is set. (Bug #50495)
          
          trx_is_strict(): New function, for checking innodb_strict_mode.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/dict/dict0crea.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fdict%2Fdict0crea.c
          storage/innodb_plugin/handler/ha_innodb.cc 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fhandler%2Fha_innodb.cc
          storage/innodb_plugin/include/trx0trx.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Ftrx0trx.h
        ------------------------------------------------------------
        revno: 3404
        revision-id: marko.makela@oracle.com-20100420082908-tpako8jd4imkh1xb
        parent: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
        committer: Marko M?kel? <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-04-20 11:29:08 +0300
        message:
          Implement UNIV_BTR_AVOID_COPY, an optimization of page splits.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/btr/btr0btr.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fbtr%2Fbtr0btr.c
          storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
        ------------------------------------------------------------
        revno: 3403
        revision-id: marko.makela@oracle.com-20100419103603-u5pz4qc6hfhx4nua
        parent: marko.makela@oracle.com-20100419094405-fd3xwadullishv07
        committer: Marko =?ISO-8859-1?Q?M=E4kel=E4?= <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Mon 2010-04-19 13:36:03 +0300
        message:
          Enable UNIV_DEBUG_VALGRIND when HAVE_purify is set.
        modified:
          storage/innobase/include/univ.i 2@cee13dc7-1704-0410-992b-c9b4543f1246:trunk%2Finclude%2Funiv.i
          storage/innodb_plugin/include/univ.i 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Funiv.i
      66b4a1e6
    • Vasil Dimov's avatar
      Merge c3400 from mysql-5.1-innodb: · d7ffd1a0
      Vasil Dimov authored
        ------------------------------------------------------------
        revno: 3400
        revision-id: mmakela@bk-internal.mysql.com-20100415070122-1nxji8ym4mao13ao
        parent: vasil.dimov@oracle.com-20100414200413-ktulgshvdp0smxk0
        committer: Marko Makela <mmakela@bk-internal.mysql.com>
        branch nick: mysql-5.1-innodb
        timestamp: Thu 2010-04-15 09:01:22 +0200
        message:
          storage/innodb_plugin: Relax too strict assertions about prefix
          indexed BLOBs for ROW_FORMAT=DYNAMIC and ROW_FORMAT_COMPRESSED tables
          (Bug #52746). In these tables, the locally stored prefix of a BLOB can
          be as small as 20 bytes (BTR_EXTERN_FIELD_REF_SIZE). ROW_FORMAT=REDUNDANT
          and ROW_FORMAT=COMPACT store a prefix of 768 bytes (REC_MAX_INDEX_COL_LEN).
          
          trx_undo_rec_get_col_val(): Relax the ut_ad() assertion and add a
          reference to dtuple_convert_big_rec().
          
          trx_undo_rec_get_partial_row(): Relax the ut_a() assertion that
          prompted Bug #52746.
        modified:
          storage/innodb_plugin/ChangeLog 2425@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2FChangeLog
          storage/innodb_plugin/trx/trx0rec.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Ftrx%2Ftrx0rec.c
      d7ffd1a0
    • Vasil Dimov's avatar
      Merge from innodb-branches-innodb+ · a8afa783
      Vasil Dimov authored
      a8afa783
    • Vasil Dimov's avatar
      Merge branches/innodb+ from SVN · d655e2ae
      Vasil Dimov authored
      d655e2ae
    • mmakela's avatar
      branches/innodb+: Merge revisions 6949:6970 from branches/zip, · 80f27ff3
      mmakela authored
      skipping the revisions that do not make sense in branches/innodb+:
        ------------------------------------------------------------------------
        r6957 | vdimov | 2010-04-06 22:05:54 +0300 (Tue, 06 Apr 2010) | 2 lines
        Changed paths:
           M /branches/zip/trx/trx0trx.c
      
        branches/zip: Whitespace fixup
        ------------------------------------------------------------------------
        r6962 | mmakela | 2010-04-07 15:03:54 +0300 (Wed, 07 Apr 2010) | 2 lines
        Changed paths:
           M /branches/zip/handler/ha_innodb.cc
      
        branches/zip: innobase_init(): Correct the error message
        about wrong innodb_change_buffering value.  Reported by Ranger.
        ------------------------------------------------------------------------
        r6967 | vdimov | 2010-04-07 22:40:38 +0300 (Wed, 07 Apr 2010) | 2 lines
        Changed paths:
           M /branches/zip/include/univ.i
      
        branches/zip: Whitespace fixup in univ.i
        ------------------------------------------------------------------------
      80f27ff3
    • Vasil Dimov's avatar
      Merge from innodb-branches-innodb+ · f875041f
      Vasil Dimov authored
      f875041f
    • Vasil Dimov's avatar
      Merge branches/innodb+ from SVN. · 4b0bd332
      Vasil Dimov authored
      4b0bd332
    • sbains's avatar
      branches/innodb+: Add a check for thread suspended time to the list of checks · bd77a36e
      sbains authored
      for slot recycle. Udpate the comments.
      bd77a36e
  8. 21 Apr, 2010 2 commits