• marko's avatar
    branches/zip: Merge a change from MySQL: · a3bf31d8
    marko authored
    ------------------------------------------------------------
    revno: 3236
    committer: Satya B <satya.bn@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Tue 2009-12-01 17:48:57 +0530
    message:
      merge to mysql-5.1-bugteam
        ------------------------------------------------------------
        revno: 3234.1.1
        committer: Gleb Shchepa <gshchepa@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Tue 2009-12-01 14:38:40 +0400
        message:
          Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
    
          manual merge 5.0-->5.1, updating InnoDB plugin.
        ------------------------------------------------------------
        revno: 1810.3968.13
        committer: Gleb Shchepa <gshchepa@mysql.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Tue 2009-12-01 14:24:44 +0400
        message:
          Bug #38883 (reopened): thd_security_context is not thread safe, crashes?
    
          The bug 38816 changed the lock that protects THD::query from
          LOCK_thread_count to LOCK_thd_data, but didn't update the associated
          InnoDB functions.
    
          1. The innobase_mysql_prepare_print_arbitrary_thd and the
          innobase_mysql_end_print_arbitrary_thd InnoDB functions have been
          removed, since now we have a per-thread mutex: now we don't need to wrap
          several inter-thread access tries to THD::query with a single global
          LOCK_thread_count lock, so we can simplify the code.
    
          2. The innobase_mysql_print_thd function has been modified to lock
          LOCK_thd_data in direct way.
    a3bf31d8
ha_innodb.cc 296 KB