1. 18 Dec, 2009 2 commits
  2. 17 Dec, 2009 2 commits
  3. 16 Dec, 2009 10 commits
  4. 15 Dec, 2009 8 commits
    • Mattias Jonsson's avatar
      merge · 3e4afe7d
      Mattias Jonsson authored
      3e4afe7d
    • Mattias Jonsson's avatar
    • Alexander Nozdrin's avatar
    • Alexander Nozdrin's avatar
      Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin) · 0b1a15e9
      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.
      ------------------------------------------------------------
      0b1a15e9
    • Alexander Nozdrin's avatar
      Backporting a patch for Bug#49170 (Inconsistent placement of semisync · 7688c736
      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.
      ------------------------------------------------------------
      7688c736
    • Alexander Nozdrin's avatar
      Backporting patch for Bug#47756 · 25f365f6
      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.
      ------------------------------------------------------------
      25f365f6
    • Alexander Nozdrin's avatar
      Post-merge fix. · efaa28ab
      Alexander Nozdrin authored
      efaa28ab
    • Alexander Nozdrin's avatar
      Post-merge fix (binlog_unsafe). · 83aa3cf4
      Alexander Nozdrin authored
      83aa3cf4
  5. 14 Dec, 2009 1 commit
  6. 12 Dec, 2009 1 commit
    • Alexander Nozdrin's avatar
      Manual merge from mysql-trunk-merge. · bc2d4e62
      Alexander Nozdrin authored
      Conflicts:
        - extra/comp_err.c
        - mysql-test/collections/default.experimental
        - mysql-test/r/archive.result
        - mysql-test/r/select.result
        - mysql-test/suite/binlog/r/binlog_unsafe.result
        - mysql-test/suite/binlog/t/binlog_unsafe.test
        - mysql-test/suite/rpl/t/disabled.def
        - mysql-test/t/archive.test
        - mysql-test/t/select.test
        - sql/item.cc
        - sql/item.h
        - sql/item_timefunc.cc
        - sql/sql_base.cc
        - sql/sql_delete.cc
        - sql/sql_load.cc
        - sql/sql_partition.cc
        - sql/sql_table.cc
        - storage/innobase/handler/ha_innodb.cc
        - vio/vio.c
      bc2d4e62
  7. 11 Dec, 2009 15 commits
  8. 10 Dec, 2009 1 commit