1. 15 Dec, 2009 6 commits
    • Mattias Jonsson's avatar
      merge · 9d25d47c
      Mattias Jonsson authored
      9d25d47c
    • Mattias Jonsson's avatar
    • Alexander Nozdrin's avatar
    • Alexander Nozdrin's avatar
      Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin) · dce89c76
      Alexander Nozdrin authored
      from mysql-next-mr-bugfixing to mysql-trunk-bugfixing.
      
      Original revision:
      ------------------------------------------------------------
      revision-id: zhenxing.he@sun.com-20091127084945-wng7gakygduv3q8k
      committer: He Zhenxing <zhenxing.he@sun.com>
      branch nick: 5.1-rep-semisync
      timestamp: Fri 2009-11-27 16:49:45 +0800
      message:
        Bug#48351 Inconsistent library names for semisync plugin
        
        The semisync plugin library names on Unix like systems were prefixed with
        'lib', which did not follow the conventions.
        
        Fix the problem by removing the 'lib' prefix on Unix systems.
      ------------------------------------------------------------
      dce89c76
    • Alexander Nozdrin's avatar
      Backporting a patch for Bug#49170 (Inconsistent placement of semisync · e300a2ed
      Alexander Nozdrin authored
      plugin prevents it from getting tested) from mysql-next-mr-bugfixing
      to mysql-trunk-bugfixing.
      
      Original revision:
      ------------------------------------------------------------
      revision-id: zhenxing.he@sun.com-20091204014339-2m06r42vajhm9vke
      committer: He Zhenxing <zhenxing.he@sun.com>
      branch nick: 5.1-rep-semisync
      timestamp: Fri 2009-12-04 09:43:39 +0800
      message:
        Bug#49170 Inconsistent placement of semisync plugin prevents it from getting tested
        
        Add $basedir/lib/plugin to the search paths for semisync plugins.
      ------------------------------------------------------------
      e300a2ed
    • Alexander Nozdrin's avatar
      Backporting patch for Bug#47756 · 97bb914b
      Alexander Nozdrin authored
      from mysql-next-mr-bugfixing into mysql-trunk-bugfixing.
      
      NOTE: the "utf8_phone_ci" collation does not exist in mysql-trunk yet,
      so another collation with 2-byte collation ID is used: "utf8_test_ci".
      
      This patch will be null-merged to mysql-next-mr-bugfixing.
      
      Original revision:
      ------------------------------------------------------------
      revision-id: bar@mysql.com-20091207121153-hs3bqbmr0719ws21
      committer: Alexander Barkov <bar@mysql.com>
      branch nick: mysql-next-mr.b47756
      timestamp: Mon 2009-12-07 16:11:53 +0400
      message:
        Bug#47756 Setting 2byte collation ID with 'set names' crashes the server
        
        The problem is not actually related to 2byte collation IDs.
        The same crash happens if you change the collation ID in
        mysql-test/str_data/Index.xml to a value smaller than 256.
        
        Crash happened in SQL parser, because the "ident_map" and "state_map"
        arrays were not initialized in loadable utf8 collations.
        
        Fix: adding proper initialization of the "ident_map" and "state_map"
        members for loadable utf8 collations.
      ------------------------------------------------------------
      97bb914b
  2. 11 Dec, 2009 13 commits
  3. 10 Dec, 2009 5 commits
  4. 09 Dec, 2009 2 commits
  5. 08 Dec, 2009 4 commits
    • Magne Mahre's avatar
      Bug#35589 SET PASSWORD caused a crash · 4ad324db
      Magne Mahre authored
      Bug#35591 FLUSH PRIVILEGES caused a crash
      
      A race condition on the privilege hash tables (proc_priv_hash
      and func_priv_hash) caused one thread to try to delete elements
      that had already been deleted by another thread.
      
      The bug was caused by reading and saving the pointers to 
      the hash tables outside mutex protection.  This led to an
      inconsistency where a thread copied a pointer to a hash,
      another thread did the same, the first thread then deleted
      the hash, and the second then crashed when it in turn tried to
      delete the deleted hash.
      
      The fix is to ensure that operations on the shared hash structures
      happens under mutex protection (moving the locking up a little)
      
      
      4ad324db
    • V Narayanan's avatar
      merging with mysql-next-mr-svoj · 92334e30
      V Narayanan authored
      92334e30
    • V Narayanan's avatar
      merging with mysql-next-mr-svoj · 88611904
      V Narayanan authored
      88611904
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 02acbc2c
      Alexander Nozdrin authored
      02acbc2c
  6. 07 Dec, 2009 4 commits
    • He Zhenxing's avatar
      Auto merge · 8ec8b076
      He Zhenxing authored
      8ec8b076
    • Sergey Vojtovich's avatar
      WL#2511 - Add a new table to the Information Schema for TABLESPACE's · 31efab3f
      Sergey Vojtovich authored
      Implemented a new INFORMATION_SCHEMA table, which is intended to
      provide information about tablespaces.
      
      mysql-test/r/information_schema.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/r/information_schema_db.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/r/mysqlshow.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/suite/funcs_1/r/is_columns_is.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      mysql-test/suite/funcs_1/r/is_tables_is.result:
        Updated test result according to WL#2511. With this WL
        I_S has new TABLESPACES schema.
      sql/handler.h:
        Added SCH_TABLESPACES to enum_schema_tables.
      sql/mysql_priv.h:
        Added human readable definitions for I_S.TABLESPACES field
        identifiers.
      sql/sql_show.cc:
        Added I_S.TABLESPACES schema. The code which handles I_S.FILES
        is capable to handle I_S.TABLESPACES as well. Thus we reuse
        this code and let functions/variables have more generic names.
      31efab3f
    • Alexander Barkov's avatar
      Bug#47756 Setting 2byte collation ID with 'set names' crashes the server · 6e7cffac
      Alexander Barkov authored
      The problem is not actually related to 2byte collation IDs.
      The same crash happens if you change the collation ID in
      mysql-test/str_data/Index.xml to a value smaller than 256.
      
      Crash happened in SQL parser, because the "ident_map" and "state_map"
      arrays were not initialized in loadable utf8 collations.
      
      Fix: adding proper initialization of the "ident_map" and "state_map"
      members for loadable utf8 collations.
      6e7cffac
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-next-mr. · 3a2c3044
      Alexander Nozdrin authored
      3a2c3044
  7. 05 Dec, 2009 3 commits
  8. 04 Dec, 2009 3 commits