------------------------------------------------------------
revno: 2882
author: timothy.smith@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.4.3-beta-release
timestamp: Tue 2009-09-29 09:26:33 +0200
message:
  auto-merge from mysql-trunk -rtag:clone-5.4.3-build
    ------------------------------------------------------------
    revno: 2878.1.2
    committer: Alexander Nozdrin <alik@sun.com>
    branch nick: mysql-trunk-bugfixing
    timestamp: Fri 2009-09-18 19:23:44 +0400
    message:
      Merge trunk -> trunk-bugfixing.
        ------------------------------------------------------------
        revno: 2879.1.4
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: mysql-trunk-alik
        timestamp: Fri 2009-09-18 17:24:49 +0400
        message:
          Revert InnoDB default values as of the InnoDB plugin 1.0.4.
        ------------------------------------------------------------
        revno: 2879.1.3
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: mysql-trunk-alik
        timestamp: Fri 2009-09-18 10:55:20 +0400
        message:
          Merge 5.1-bugteam -> trunk-alik (up to revno:3111).
            ------------------------------------------------------------
            revno: 2661.372.4
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-09-17 16:33:23 +0500
            message:
              Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table
              additional backport of of bug43138 fix
        ------------------------------------------------------------
        revno: 2879.1.2
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: mysql-trunk-alik
        timestamp: Fri 2009-09-18 10:52:18 +0400
        message:
          Null-merge 5.1-bugteam revno:3110 (fix for Bug#44030).
          After discussion with Satya this bug does not exist
          in trunk.
            ------------------------------------------------------------
            revno: 2661.372.3
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-09-17 11:59:43 +0530
            message:
              Applying InnoDB snapshot 5.1-ss5282, Fixes BUG#44030
              
              1. Fixes BUG#44030 - Error: (1500) Couldn't read the MAX(ID) autoinc value 
                                   from the index (PRIMARY)
              
              2. Disables the innodb-autoinc test for innodb plugin temporarily.
                 The testcase for this bug has different result file for InnoDB plugin.
                 Should add the testcase to Innodb suite with a different result file.
              
              Detailed revision comments:
              
              r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines
              branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before
              the bug fix we would assert on missing autoinc columns. With this fix we allow
              MySQL to open the table but set the next autoinc value for the column to the
              MAX value. This effectively disables the next value generation. INSERTs will
              fail with a generic AUTOINC failure. However, the user should be able to
              read/dump the table, set the column values explicitly, use ALTER TABLE to
              set the next autoinc value and/or sync the two data dictionaries to resume
              normal operations.
              
              Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the
              index (PRIMARY)
              
              rb://118
              
              r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines
              branches/5.1: The version of the result file checked in was broken in r5243.
              
              r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines
              branches/5.1:
              
              Remove the word "Error" from the printout because the mysqltest suite
              interprets it as an error and thus the innodb-autoinc test fails.
              
              Approved by:	Sunny (via IM)
              r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines
              branches/5.1:
              
              Adjust the failing innodb-autoinc test to conform to the latest behavior
              of the MySQL code. The idea and the comment in innodb-autoinc.test come
              from Sunny.
        ------------------------------------------------------------
        revno: 2879.1.1
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: mysql-trunk-alik
        timestamp: Thu 2009-09-17 22:00:49 +0400
        message:
          Merge 5.1-bugteam -> trunk-alik.
        ------------------------------------------------------------
        revno: 2661.372.2
        committer: Ingo Struewing <ingo.struewing@sun.com>
        branch nick: mysql-5.1-bug17332-7
        timestamp: Wed 2009-09-16 09:01:28 +0200
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 2661.372.1
        committer: Ingo Struewing <ingo.struewing@sun.com>
        branch nick: mysql-5.1-bug17332-7
        timestamp: Wed 2009-09-09 17:13:13 +0200
        message:
          Bug#17332 - changing key_buffer_size on a running server
                      can crash under load
          
          Merge from 5.0, after backport from 5.1/5.4 to 5.0.
          This makes the fixes for
          Bug 44068 (RESTORE can disable the MyISAM Key Cache)
          Bug 40944 (Backup: crash after myisampack)
          available to 5.1.
        ------------------------------------------------------------
        revno: 1810.3949.1
        committer: Ingo Struewing <ingo.struewing@sun.com>
        branch nick: mysql-5.0-bug17332-7
        timestamp: Mon 2009-09-07 18:35:37 +0200
        message:
          Bug#17332 - changing key_buffer_size on a running server
                      can crash under load
          
          Backport from 5.1.
          Does also include key cache fixes from:
          Bug 44068 (RESTORE can disable the MyISAM Key Cache)
          Bug 40944 (Backup: crash after myisampack)
    ------------------------------------------------------------
    revno: 2878.1.1
    committer: Alexander Nozdrin <alik@sun.com>
    branch nick: mysql-trunk-bugfixing
    timestamp: Wed 2009-09-16 14:08:43 +0400
    message:
      Fix default.conf
------------------------------------------------------------
revno: 2881
author: timothy.smith@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.4.3-tsmith
timestamp: Tue 2009-09-29 08:58:32 +0200
message:
  make_binary_distribution and mysql.spec: add options to copy a shared library, for use by mysqld_safe, into pkglibdir during package creation
------------------------------------------------------------
revno: 2880
author: timothy.smith@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.4.3-tsmith
timestamp: Wed 2009-09-23 01:26:08 +0200
message:
  Add --malloc-lib=LIB option to mysqld_safe to LD_PRELOAD a shared library for mysqld
------------------------------------------------------------
revno: 2879
committer: Joerg Bruehe <joerg@mysql.com>
branch nick: work-5.4
timestamp: Thu 2009-09-17 15:29:31 +0200
message:
  Merge "trunk-build" (including 5.4.2-beta) and "trunk".
    ------------------------------------------------------------
    revno: 2875.1.2
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.4
    timestamp: Wed 2009-09-09 15:21:27 +0200
    message:
      Merge the changes done for 5.4.2-beta into "trunk".
    ------------------------------------------------------------
    revno: 2871.4.4
    tags: mysql-5.4.2
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: clone-5.4
    timestamp: Tue 2009-09-08 16:10:06 +0200
    message:
      Make sure that variables which are (or may be) used
      in an ".opt" file are defined to some value (even
      if it is empty). Without this, a test suite run
      aborted on Windows for "embedded".
      
      This fix was applied dusing the build of 5.4.2-beta.
