1. 02 Jun, 2010 4 commits
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 823439c4
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3495
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Wed 2010-06-02 13:37:14 +0300
      message:
        Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the record
      
        In semi-consistent read, only unlock freshly locked non-matching records.
      
        lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
        LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
      
        enum db_err: Add DB_SUCCESS_LOCKED_REC for indicating a successful
        operation where a record lock was created.
      
        lock_sec_rec_read_check_and_lock(),
        lock_clust_rec_read_check_and_lock(), lock_rec_enqueue_waiting(),
        lock_rec_lock_slow(), lock_rec_lock(), row_ins_set_shared_rec_lock(),
        row_ins_set_exclusive_rec_lock(), sel_set_rec_lock(),
        row_sel_get_clust_rec_for_mysql(): Return DB_SUCCESS_LOCKED_REC if a
        new record lock was created. Adjust callers.
      
        row_unlock_for_mysql(): Correct the function documentation.
      
        row_prebuilt_t::new_rec_locks: Correct the documentation.
      823439c4
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 765c195e
      Marko Mäkelä authored
      ------------------------------------------------------------
      revno: 3493
      revision-id: marko.makela@oracle.com-20100602101940-60x32xiivtqj9va1
      parent: marko.makela@oracle.com-20100601135802-hgplcpr8089ura8g
      committer: Marko Mäkelä <marko.makela@oracle.com>
      branch nick: 5.1-innodb
      timestamp: Wed 2010-06-02 13:19:40 +0300
      message:
        fil_print_orphaned_tablespaces(): Unused function, remove.
      765c195e
    • Jimmy Yang's avatar
    • Jimmy Yang's avatar
      Fix bug #54159 InnoDB: New warnings on Windows. Provide "signed/unsigned" · 987a04b4
      Jimmy Yang authored
      parameter to virtual function store() for longlong data type.
      
      rb://371 approved by Sunny.
      987a04b4
  2. 01 Jun, 2010 12 commits
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · 1eae95b4
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3491
        revision-id: marko.makela@oracle.com-20100601134335-ccthwwru23kn09qw
        parent: marko.makela@oracle.com-20100601120751-1uq7bbta5n7ts0qr
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-06-01 16:43:35 +0300
        message:
          Bug#48197: Concurrent rw_lock_free may cause assertion failure
      
          rw_lock_t: Remove magic_n unless UNIV_DEBUG is defined.
          rw_lock_free(): Invalidate magic_n only after removing from rw_lock_list.
      1eae95b4
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · 522d9ac3
      Alexander Nozdrin authored
      Due to a BZR bug, that merge was done by the following command:
      bzr merge -r 'revid:tor.didriksen@sun.com-20100527074248-6qtv0p1ugy6o1hjo..' <mysql-trunk-bugfixing path>
      522d9ac3
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · ce461570
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3490
        revision-id: marko.makela@oracle.com-20100601120751-1uq7bbta5n7ts0qr
        parent: marko.makela@oracle.com-20100601120521-q48hk05ne4j1s2o0
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-06-01 15:07:51 +0300
        message:
          Minor cleanup.
      
          lock_rec_unlock(): Cache first_lock and rewrite while() loops as for().
      
          btr_cur_optimistic_update(): Use common error handling return.
      
          row_create_prebuilt(): Add Valgrind instrumentation.
      ce461570
    • Marko Mäkelä's avatar
      Merge a change from mysql-5.1-innodb: · 51414427
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3488
        revision-id: marko.makela@oracle.com-20100601103738-upm8awahesmeh9dr
        parent: vasil.dimov@oracle.com-20100531163540-9fu3prbn2asqwdi5
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-06-01 13:37:38 +0300
        message:
          Bug#53812: assert row/row0umod.c line 660 in txn rollback after crash recovery
          row_undo_mod_upd_exist_sec(): Tolerate a failure to build the index entry
          for a DYNAMIC or COMPRESSED table during crash recovery.
      51414427
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · ea53f9af
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3478.1.3
        revision-id: marko.makela@oracle.com-20100525123748-pmpehbg29oyhc1ns
        parent: marko.makela@oracle.com-20100524114349-5kaw52sz0yh4szkb
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-25 15:37:48 +0300
        message:
          Suppress bogus Valgrind warnings about buf_buddy_relocate()
          accessing uninitialized memory in Valgrind-instrumented builds.
      ea53f9af
    • Marko Mäkelä's avatar
      Merge from mysql-5.1-innodb: · 2b47efb6
      Marko Mäkelä authored
        ------------------------------------------------------------
        revno: 3478.1.4
        revision-id: marko.makela@oracle.com-20100525125352-hgafpmqhrrj7pv5i
        parent: marko.makela@oracle.com-20100525123748-pmpehbg29oyhc1ns
        committer: Marko Mäkelä <marko.makela@oracle.com>
        branch nick: 5.1-innodb
        timestamp: Tue 2010-05-25 15:53:52 +0300
        message:
          row_search_for_mysql(): Add assertions to track down Bug #53627.
      2b47efb6
    • Jonathan Perkin's avatar
      Merge · 6962ef4d
      Jonathan Perkin authored
      6962ef4d
    • Jonathan Perkin's avatar
      Add SELinux checks from distribution-specific spec file, missed in · 4eb6de1c
      Jonathan Perkin authored
      previous.
      
      Convert some shell bits to standard 2-space indent, 80 columns, etc.
      4eb6de1c
    • He Zhenxing's avatar
      Auto merge from trunk · bf8b7a23
      He Zhenxing authored
      bf8b7a23
    • He Zhenxing's avatar
      BUG#52748 Semi-Sync ACK packet isn't check for length · 1bcba618
      He Zhenxing authored
      Check the length and use strncpy to make the code safer.
      1bcba618
    • He Zhenxing's avatar
      BUG#52748 Semi-Sync ACK packet isn't check for length · 5725d230
      He Zhenxing authored
      Check the length and use strncpy to make the code safer.
      5725d230
    • Alexander Nozdrin's avatar
      eb51ac8b
  3. 31 May, 2010 7 commits
    • Vasil Dimov's avatar
      Fix Bug #53947 InnoDB: Assertion failure in thread 4224 in file .\sync\sync0sync.c line 324 · 04dfc8c8
      Vasil Dimov authored
      Destroy the rw-lock object before freeing the memory it is occupying.
      If we do not do this, then the mutex that is contained in the rw-lock
      object btr_search_latch_temp->mutex gets "freed" and subsequently
      mutex_free() from sync_close() hits a mutex whose memory has been
      freed and crashes.
      
      Approved by:	Heikki (via IRC)
      Discussed with:	Calvin
      04dfc8c8
    • Alexander Nozdrin's avatar
      Backport of · 893dced4
      Alexander Nozdrin authored
        - revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
        - revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
      
        BUG#35274 - merge table doesn't need any base tables, gives
                    error 124 when key accessed
      
        SELECT queries that use index against a merge table with empty
        underlying tables list may return with error "Got error 124 from
        storage engine".
      
        The problem was that wrong error being returned.
      893dced4
    • Gleb Shchepa's avatar
      Bug #38745: MySQL 5.1 optimizer uses filesort for ORDER BY · 3ca98f76
      Gleb Shchepa authored
                  when it should use index
      
      Sometimes the LEFT/RIGHT JOIN with an empty table caused an
      unnecessary filesort.
      
      Sample query, where t1.i1 is indexed and t3 is empty:
      
        SELECT t1.*, t2.* FROM t1 JOIN t2 ON t1.i1 = t2.i2
                             LEFT JOIN t3 ON t2.i2 = t3.i3
          ORDER BY t1.i1 LIMIT 5;
      
      The server erroneously used an item of empty outer-joined
      table as a common constant of a Item_equal (multi-equivalence
      expression).
      By the fix for the bug 16590 the constant status of such
      an item has been propagated to st_table::const_key_parts
      map bits related to other Item_equal argument-related
      key parts (those are obviously not constant in our case).
      As far as test_if_skip_sort_order function skips constant
      prefixes of testing keys, this caused an ignorance of
      available indices, since some prefixes were marked as
      constant by mistake.
      3ca98f76
    • Davi Arnaut's avatar
      5c72bee9
    • Tor Didriksen's avatar
      Bug #49829 Many "hides virtual function" warnings with SunStudio · a6129814
      Tor Didriksen authored
      Backport from mysql-pe (of those parts which have not been upmerged from 5.1)
      a6129814
    • Vasil Dimov's avatar
      Fix coding style · ae3c6a75
      Vasil Dimov authored
      ae3c6a75
    • Sergey Glukhov's avatar
      test case fix · f75f5800
      Sergey Glukhov authored
      f75f5800
  4. 28 May, 2010 11 commits
  5. 27 May, 2010 6 commits