------------------------------------------------------------
revno: 3946
committer: MySQL Build Team<build@mysql.com>
branch nick: mysql-7.1.9a-release
timestamp: Thu 2010-11-18 12:47:43 +0100
message:
  Bug#58256 Rolling upgrade to 7.1.9 fails when ALL DUMP is used:
            cluster failure
  
  - A new SYNC_REQ signal was added in 7.0.20 and 7.1.9 which is 
    used to make sure all blocks in a node has been scheduled 
    and thus processed the asynch commands it was sent. 
    The false assumption was that this is used for test/debug only 
    and thus no version code was needed.
  - To fix this, check the version of connected node and don't send
    SYNC_REQ if the node does not support it.
  
  (Patch done by Magnus Blaudd on 2010-11-17 in the telco-7.0 tree
  and sent via mail.)
  
  
  This is a rebuild of 7.1.9, the resulting version is 7.1.9a
------------------------------------------------------------
revno: 3945 [merge]
tags: clone-mysql-5.1.51-ndb-7.1.9-p1-src-build
committer: Jonas Oreland <jonas@mysql.com>
branch nick: 7.1.9
timestamp: Wed 2010-11-03 14:55:51 +0100
message:
  ndb - fix windows compile error for 7.1.9
    ------------------------------------------------------------
    revno: 3362.76.132
    tags: clone-mysql-5.1.51-ndb-7.0.20-p1-src-build
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: 7.0.20
    timestamp: Wed 2010-11-03 14:49:21 +0100
    message:
      ndb - fix windows compile error for 7.0.20
------------------------------------------------------------
revno: 3944 [merge]
tags: clone-mysql-5.1.51-ndb-7.1.9-src-build
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Wed 2010-11-03 12:36:10 +0100
message:
  Merge 7.0-bug53456 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.131 [merge]
    tags: clone-mysql-5.1.51-ndb-7.0.20-src-build
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0-bug53456
    timestamp: Wed 2010-11-03 12:34:45 +0100
    message:
      Bug#53456 ndbd angel does not check for fork() errors
       - updated for 7.0+
        ------------------------------------------------------------
        revno: 2585.162.46 [merge]
        tags: clone-mysql-5.1.51-ndb-6.3.39-src-build
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3-bug53456
        timestamp: Wed 2010-11-03 12:00:50 +0100
        message:
          Merge in patch for bug53456
            ------------------------------------------------------------
            revno: 2585.171.1
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 6.3-bug53456
            timestamp: Tue 2010-05-11 08:42:27 +0200
            message:
              Bug#53456  ndbd angel does not check for fork() errors
               - retry failed fork after sleep until fork suceeds or max
                 number of retries occurs
    ------------------------------------------------------------
    revno: 3362.76.130
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0-bug53456
    timestamp: Wed 2010-11-03 12:09:03 +0100
    message:
      Merge
------------------------------------------------------------
revno: 3943 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-11-03 10:49:39 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.129
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-11-03 10:48:25 +0100
    message:
      ndb - wl#5567 add minimal mtr test
    ------------------------------------------------------------
    revno: 3362.76.128
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-11-03 10:40:26 +0100
    message:
      ndb - wl#5567 remove extra view that "It is decided that no extra summary view"
------------------------------------------------------------
revno: 3942 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-11-03 10:37:44 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.127
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-11-03 10:36:14 +0100
    message:
      ndb - add wl#5567 to 70 instead
------------------------------------------------------------
revno: 3941
committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
branch nick: mysql-5.1-telco-7.1-ndbinfo
timestamp: Wed 2010-11-03 10:12:49 +0100
message:
  WORKLOG5567 ndbinfo: disk page buffer
------------------------------------------------------------
revno: 3940 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-11-03 09:39:42 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.126
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-11-03 09:34:16 +0100
    message:
      ndb - bug#57946 - fix weird race-condition with CLOSE_COMREQ/API_REQREQ
------------------------------------------------------------
revno: 3939 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-11-02 16:01:25 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.125
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-11-02 15:53:26 +0100
    message:
      ndb - bug#57650 - add retries on transient errors of backup/lcp
------------------------------------------------------------
revno: 3938 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-11-02 15:31:00 +0100
message:
  Merge 7.0-bug57766 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.124
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0-bug57766
    timestamp: Tue 2010-11-02 15:17:14 +0100
    message:
      Bug#57766 Windows build issue on windows with syslog.h
       - Don't include syslog.h in interface only implementation
       - Add printout if WITH_NDB_TEST is set
------------------------------------------------------------
revno: 3937 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-11-02 13:52:40 +0100
message:
  Merge 7.0-bug56438 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.123
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0-bug56438
    timestamp: Tue 2010-11-02 13:50:55 +0100
    message:
      ndb
       - mark up patch for bug56438 with MCP ifdefs
    ------------------------------------------------------------
    revno: 3362.76.122 [merge]
    committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
    branch nick: mysql-5.1-telco-7.0-bug
    timestamp: Tue 2010-11-02 08:58:43 +0100
    message:
      Merge
------------------------------------------------------------
revno: 3936 [merge]
committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
branch nick: mysql-5.1-telco-7.1-bug
timestamp: Tue 2010-11-02 09:03:26 +0100
message:
  Merge 7.0 to 7.1
    ------------------------------------------------------------
    revno: 3362.86.1
    committer: Maitrayi Sabaratnam <maitrayi.sabaratnam@oracle.com>
    branch nick: mysql-5.1-telco-7.0-bug53354
    timestamp: Mon 2010-11-01 10:13:06 +0100
    message:
      Bug#53354 crash when creating partitioned table with multiple columns in the partition key
------------------------------------------------------------
revno: 3935 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-11-01 17:21:32 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.121 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 17:11:10 +0100
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.45
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-11-01 16:44:50 +0100
        message:
          ndb - bug#57896 - LQHKEYREQ only contains 16-bit schema version
    ------------------------------------------------------------
    revno: 3362.76.120
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 16:43:44 +0100
    message:
      ndb - bug#57897 - don't randomize version in schema-trans-entry
------------------------------------------------------------
revno: 3934 [merge]
committer: Frazer Clement <frazer@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2010-11-01 15:05:38 +0000
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.119
    committer: Frazer Clement <frazer@mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Mon 2010-11-01 14:48:53 +0000
    message:
      Bug#57848 Ndb : Table reorg scan should probably use TUP order
      
      Modify table reorg code to use TUP order scan when table contains disk columns.
      
      This should tend towards a more sequential access pattern to data on disk.
------------------------------------------------------------
revno: 3933 [merge]
committer: Frazer Clement <frazer@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Mon 2010-11-01 14:28:46 +0000
message:
  Merge 7.0->7.1
    ------------------------------------------------------------
    revno: 3362.76.118 [merge]
    committer: Frazer Clement <frazer@mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Mon 2010-11-01 14:16:07 +0000
    message:
      Merge 6.3->7.0
        ------------------------------------------------------------
        revno: 2585.162.44
        committer: Frazer Clement <frazer@mysql.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Mon 2010-11-01 13:15:22 +0000
        message:
          Bug#57827 Adding UNIQUE index to disk data table is very slow with moderate amount of data
          
          Modify unique index build not to read disk based columns.
------------------------------------------------------------
revno: 3932 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-11-01 13:16:14 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.117
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 12:45:26 +0100
    message:
      ndb - fix numa for libnuma.so v2
------------------------------------------------------------
revno: 3931 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-11-01 11:36:22 +0100
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.116 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 11:25:45 +0100
    message:
      ndb - merge 63 70 70
        ------------------------------------------------------------
        revno: 2585.162.43
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-11-01 11:23:18 +0100
        message:
          ndb - fix VM_TRACE usage...
    ------------------------------------------------------------
    revno: 3362.76.115
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 11:14:05 +0100
    message:
      ndb - bug#57886 (7.0 only) - Fix problem with drop table vs. GET_TABINFOREQ (for suma) in DICT
    ------------------------------------------------------------
    revno: 3362.76.114 [merge]
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-11-01 11:11:47 +0100
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.42
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-11-01 11:06:12 +0100
        message:
          ndb - bug#57886 - Fix a series of race-conditions with drop table vs. create/subscribe event
        ------------------------------------------------------------
        revno: 2585.162.41
        committer: jonas oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-11-01 10:44:05 +0100
        message:
          ndb - add in_use checking to DLList for fast detection of incorrect usage (VM_TRACE)
------------------------------------------------------------
revno: 3930 [merge]
committer: jonas <jonas@perch>
branch nick: telco-7.1
timestamp: Fri 2010-10-29 14:26:37 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.113 [merge]
    committer: jonas <jonas@perch>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-29 14:24:08 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.40
        committer: jonas <jonas@perch>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-29 14:21:45 +0200
        message:
          ndb atrt - fix ssh-login.sh file (only used by atrt X)
------------------------------------------------------------
revno: 3929 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-28 15:50:20 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.112
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-28 15:45:30 +0200
    message:
      ndb - bug#57807 - don't link NdbNuma.cpp into portlib, as then everythings needs to link -ldl...only do with ndb(mt)d
    ------------------------------------------------------------
    revno: 3362.76.111
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-28 15:24:21 +0200
    message:
      ndb - bug#57807 - enable numa-interleaving per default
------------------------------------------------------------
revno: 3928 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-28 15:01:30 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.110 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-28 14:59:31 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.39
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2010-10-28 14:40:39 +0200
        message:
          ndb - bug#57767 - Handle out of tupkey buffer "gracefully" (kill starting node instead of self) during node-recovery
------------------------------------------------------------
revno: 3927
committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2010-10-28 11:53:43 +0200
message:
  TWS making varsize flexible in size
------------------------------------------------------------
revno: 3926
committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2010-10-28 11:50:56 +0200
message:
  clusterj revno 344
------------------------------------------------------------
revno: 3925 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-28 09:15:49 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.109 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-28 09:11:34 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.38
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2010-10-28 09:07:27 +0200
        message:
          ndb - gcc4.5.1 - This patch makes mtr pass with gcc4.5.1 - I carefully examined code...and think that it smells compiler bug...Didn't find any violations/weirdness in that path
------------------------------------------------------------
revno: 3924 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-27 08:56:04 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.108
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-27 08:54:54 +0200
    message:
      ndb - add DataBuffer2 (which can be used with ArenaPool)
------------------------------------------------------------
revno: 3923 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-27 08:46:59 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.107 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-27 08:45:29 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.37
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2010-10-27 08:35:00 +0200
        message:
          ndb - bug#57761 - fix strict alias violation in DataBuffer::seize()
------------------------------------------------------------
revno: 3922 [merge]
committer: John David Duncan <jdd@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Tue 2010-10-26 12:36:37 -0700
message:
  Merge
    ------------------------------------------------------------
    revno: 3921.1.1
    committer: John David Duncan <jdd@mysql.com>
    branch nick: mbcharsets
    timestamp: Tue 2010-10-26 12:33:51 -0700
    message:
      Better test coverage for JTie utils CharsetMap::isMultibyte()
------------------------------------------------------------
revno: 3921 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-25 20:36:21 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.106 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-25 20:35:08 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.36
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-10-25 12:34:40 +0200
        message:
          ndb - bug#57522 - post autotest fix 1. Fix upgrade which was made "upside-down"
        ------------------------------------------------------------
        revno: 2585.162.35 [merge]
        committer: Martin Sk?ld <martin@swordfish>
        branch nick: mysql-5.1-telco-6.3_merge
        timestamp: Fri 2010-10-22 13:48:02 +0200
        message:
          Merge
------------------------------------------------------------
revno: 3920 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-25 17:17:14 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.105
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-25 17:16:18 +0200
    message:
      ndb
       - set the default value of max_ndb back to $childs/2
------------------------------------------------------------
revno: 3919 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-25 14:42:01 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.104 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-25 14:40:59 +0200
    message:
      Merge in move of .inc files for ndb tests to suite/ndb
        ------------------------------------------------------------
        revno: 3362.85.4
        committer: Magnus Blaudd <msvensson@peek02.mysql.com>
        branch nick: 7.0
        timestamp: Mon 2010-10-25 11:15:03 +0200
        message:
          ndb
           - move ndb_backups* from std_data/ to suite/ndb/std_data
        ------------------------------------------------------------
        revno: 3362.85.3
        committer: Magnus Blaudd <msvensson@peek02.mysql.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 17:16:26 +0200
        message:
          ndb
           - consolidate rpl_ndb test utils in suite/rpl_ndb
           - move ndb_master-slave*.inc to suite/rpl_ndb
           - move have_ndb_ndb.inc to suite/rpl_ndb
           - move all rpl_ndb test in ndb_team to rpl_ndb
        ------------------------------------------------------------
        revno: 3362.85.2
        committer: Magnus Blaudd <msvensson@peek02.mysql.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 16:07:39 +0200
        message:
          ndb - add MTR_MAX_NDB variable to allow more parallel ndb tests
        ------------------------------------------------------------
        revno: 3362.85.1
        committer: Magnus Blaudd <msvensson@peek02.mysql.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 15:53:05 +0200
        message:
          ndb
           - move select_ndb_apply_status.inc to the suite where it's used
------------------------------------------------------------
revno: 3918 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-25 14:29:39 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.103
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-25 14:27:41 +0200
    message:
      ndb
       - revert change of relative dir to fix path for sql/ha_ndbcluster sine it'll break
        embedded server compile.
    ------------------------------------------------------------
    revno: 3362.76.102 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Mon 2010-10-25 12:15:27 +0200
    message:
      Merge
------------------------------------------------------------
revno: 3917 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-25 11:38:22 +0200
message:
  Merge 7.0 to 7.1
    ------------------------------------------------------------
    revno: 3362.83.8
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 16:25:43 +0200
    message:
      ndb
       - move extern declaration of active_mi to before first use
    ------------------------------------------------------------
    revno: 3362.83.7 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 16:13:23 +0200
    message:
      Merge 7.0 -> 7.0
        ------------------------------------------------------------
        revno: 3362.84.3
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 16:12:01 +0200
        message:
          ndb
            - refactor "read before write removal" to reduce size of  the patch.
           - remove  HA_STATUS_WRITTEN_ROWS and instead add
              read_before_write_removal_rows_written()
           - move check of constant expression to sql_update.cc only
           -  remove the "using_quick" member from READ_RECORD
           - rename migh_use_read_removal to using_read_removal
        ------------------------------------------------------------
        revno: 3362.84.2
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 15:22:46 +0200
        message:
          ndb
           - remove uneccessary pointer subtraction, value is already known in "i"
        ------------------------------------------------------------
        revno: 3362.84.1
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-22 15:19:48 +0200
        message:
          ndb
           - move get_ndb_lock_type() to file scope in ha_ndbcluster.cc, this allow
             removal of several casts
    ------------------------------------------------------------
    revno: 3362.83.6
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 14:55:44 +0200
    message:
      ndb
       - use CMAKE_SOURCE_DIR when refering to files to include
    ------------------------------------------------------------
    revno: 3362.83.5
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 14:35:05 +0200
    message:
      ndb
        - add compatibility functions allowing same source to work with
          different MySQL Server versions.
       - Fix the following incompatibilities
         - thd->options moved to thd->variables.option_bits
         - PARTITION_INFO - >PARTITION_STATS
         -  mysql_priv.h split into multiplke include files
         - my_free() has lost an argument, suprised to see that the flags
           are still there(ooh, should keep quiet..)
        - close_cached_tables() has changed signature
    ------------------------------------------------------------
    revno: 3362.83.4
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 14:28:02 +0200
    message:
      ndb
       - add compatitbiltiy code to detect if using the MySQL Server util library for cmake
         or the one included with ndb
    ------------------------------------------------------------
    revno: 3362.83.3
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 14:27:10 +0200
    message:
      ndb
       - add resources to ndbd and ndb_mgmd only on Windows
    ------------------------------------------------------------
    revno: 3362.83.2
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 13:38:03 +0200
    message:
      ndb
       - remove pretty useless dbug print macro
    ------------------------------------------------------------
    revno: 3362.83.1
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-22 11:17:16 +0200
    message:
      ndb
       - Add conditional code to allow ha_ndbcluster to work with MySQL Server
        that does not have OPTION_ALLOW_BATCH
------------------------------------------------------------
revno: 3916 [merge]
committer: jonas oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Sat 2010-10-23 10:24:33 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.101
    committer: jonas oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Sat 2010-10-23 08:46:02 +0200
    message:
      ndb - use NDB_RESTORE in 7.0
    ------------------------------------------------------------
    revno: 3362.76.100 [merge]
    committer: Martin Sk?ld <martin@swordfish>
    branch nick: mysql-5.1-telco-7.0_merge
    timestamp: Fri 2010-10-22 13:55:56 +0200
    message:
      Merge
    ------------------------------------------------------------
    revno: 3362.76.99 [merge]
    committer: Martin Sk?ld <martin@swordfish>
    branch nick: mysql-5.1-telco-7.0_merge
    timestamp: Fri 2010-10-22 13:47:51 +0200
    message:
      Merge
------------------------------------------------------------
revno: 3915 [merge]
committer: Martin Skold <Martin.Skold@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2010-10-22 14:08:44 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 3911.1.3 [merge]
    committer: Martin Sk?ld <martin@swordfish>
    branch nick: mysql-5.1-telco-7.1_merge
    timestamp: Fri 2010-10-22 13:55:09 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3910.1.3 [merge]
        committer: Martin Sk?ld <martin@swordfish>
        branch nick: mysql-5.1-telco-7.1
        timestamp: Fri 2010-10-22 13:54:36 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3362.82.3
            committer: Martin Sk?ld <martin@swordfish>
            branch nick: mysql-5.1-telco-7.0
            timestamp: Fri 2010-10-22 13:53:16 +0200
            message:
              bug#52131 now fixed
    ------------------------------------------------------------
    revno: 3911.1.2 [merge]
    committer: Martin Sk?ld <martin@swordfish>
    branch nick: mysql-5.1-telco-7.1_merge
    timestamp: Fri 2010-10-22 10:15:35 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3910.1.2 [merge]
        committer: Martin Sk?ld <martin@swordfish>
        branch nick: mysql-5.1-telco-7.1
        timestamp: Fri 2010-10-22 10:14:47 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3362.82.2 [merge]
            committer: Martin Sk?ld <martin@swordfish>
            branch nick: mysql-5.1-telco-7.0
            timestamp: Fri 2010-10-22 10:13:00 +0200
            message:
              Merge
                ------------------------------------------------------------
                revno: 2585.170.3
                committer: Martin Sk?ld <martin@swordfish>
                branch nick: mysql-5.1-telco-6.3
                timestamp: Fri 2010-10-22 10:10:43 +0200
                message:
                  Fixed compiler warnings
                ------------------------------------------------------------
                revno: 2585.170.2
                committer: Martin Sk?ld <martin@swordfish>
                branch nick: mysql-5.1-telco-6.3
                timestamp: Fri 2010-10-22 10:10:04 +0200
                message:
                  bug#52131 now fixed
    ------------------------------------------------------------
    revno: 3911.1.1 [merge]
    committer: Martin Sk?ld <martin@swordfish>
    branch nick: mysql-5.1-telco-7.1_merge
    timestamp: Fri 2010-10-22 08:30:53 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3910.1.1 [merge]
        committer: Martin Sk?ld <martin@swordfish>
        branch nick: mysql-5.1-telco-7.1
        timestamp: Thu 2010-10-21 16:55:36 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 3362.82.1 [merge]
            committer: Martin Sk?ld <martin@swordfish>
            branch nick: mysql-5.1-telco-7.0
            timestamp: Thu 2010-10-21 16:35:49 +0200
            message:
              Merge
                ------------------------------------------------------------
                revno: 2585.170.1
                committer: Martin Sk?ld <martin@swordfish>
                branch nick: mysql-5.1-telco-6.3
                timestamp: Thu 2010-10-21 13:46:57 +0200
                message:
                   3089 Mats Kindahl	2010-10-06
                        Bug #52131: SET and ENUM stored endian-dependent in binary log
                        
                        Replication SET and ENUM fields from a big-endian to a little-
                        endian machine (or the opposite) that are represented using
                        more than 1 byte (SET fields with more than 8 members or ENUM
                        fields with more than 256 constants) will fail to replicate
                        correctly when using row-based replication.
                        
                        The reason is that there are no pack() or unpack() functions
                        for Field_set or Field_enum, which make them rely on Field::pack
                        and Field::unpack. These functions pack data as strings, but
                        since Field_set and Field_enum use integral types for
                        representation, the fields are stored incorrectly on big-endian
                        machines.
                        
                        This patch adds Field_enum::pack and Field_enum::unpack
                        functions that store the integral value correctly in the binary
                        log even on big-endian machines. Since Field_set inherits from
                        Field_enum, it will use the same functions for packing and
                        unpacking the field.
                       @ sql/field.cc
                          Removing some obsolete debug printouts and adding Field_enum::pack
                          and Field_enum::unpack functions.
                       @ sql/field.h
                          Adding helper functions for packing and unpacking 16- and
                          24-bit integral types.
                          
                          Field_short::pack and Field_short::unpack now use these functions.
                       @ sql/rpl_record.cc
                          Removing some obsolete debug printouts and adding some
                          more useful ones.
------------------------------------------------------------
revno: 3914 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Fri 2010-10-22 01:31:22 -0700
message:
  crund - merge
    ------------------------------------------------------------
    revno: 3903.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Fri 2010-10-22 01:28:06 -0700
    message:
      crund - added bzr-ignored tws_cpp/Makefile
------------------------------------------------------------
revno: 3913 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-22 10:25:30 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.98 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-22 10:22:32 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.34
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-22 10:02:00 +0200
        message:
          ndb - remove warnings...unsigned can't be less than 0
        ------------------------------------------------------------
        revno: 2585.162.33 [merge]
        committer: Martin Zaun <martin.zaun@oracle.com>
        branch nick: ndb-6.3
        timestamp: Fri 2010-10-22 00:52:40 -0700
        message:
          remove newly added NDB_RESTORE def from mtr
            ------------------------------------------------------------
            revno: 2585.169.1 [merge]
            committer: Martin Zaun <martin.zaun@oracle.com>
            branch nick: ndb-6.3
            timestamp: Thu 2010-10-21 19:47:26 -0700
            message:
              merge from ndb-6.3-mtr-ndb-restore to ndb-6.3
                ------------------------------------------------------------
                revno: 2585.168.1
                committer: Martin Zaun <martin.zaun@oracle.com>
                branch nick: ndb-6.3-mtr-ndb-restore
                timestamp: Thu 2010-10-21 19:45:09 -0700
                message:
                  defined  var for ndb-6.3 mtr tests (as available in >= 7.0).
------------------------------------------------------------
revno: 3912 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Fri 2010-10-22 00:08:16 -0700
message:
  merge from ndb-7.0 to ndb-7.1
    ------------------------------------------------------------
    revno: 3362.76.97 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.0
    timestamp: Thu 2010-10-21 23:52:58 -0700
    message:
      merge from ndb-6.3 to ndb-7.0
        ------------------------------------------------------------
        revno: 2585.162.32 [merge]
        committer: Martin Zaun <martin.zaun@oracle.com>
        branch nick: ndb-6.3
        timestamp: Thu 2010-10-21 23:10:37 -0700
        message:
          merge from ndb-6.3-wl5421 to ndb-6.3
            ------------------------------------------------------------
            revno: 2585.167.2
            committer: Martin Zaun <martin.zaun@oracle.com>
            branch nick: ndb-6.3-wl5421
            timestamp: Thu 2010-10-21 23:00:55 -0700
            message:
              wl5421: mtr tests for ndb_restore with type demotion.
            ------------------------------------------------------------
            revno: 2585.167.1
            committer: Martin Zaun <martin.zaun@oracle.com>
            branch nick: ndb-6.3-wl5421
            timestamp: Thu 2010-10-21 18:15:45 -0700
            message:
              wl5421: support for ndb_restore with type demotion.
------------------------------------------------------------
revno: 3911 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Thu 2010-10-21 17:52:07 -0700
message:
  merge from ndb-7.0 to ndb-7.1
    ------------------------------------------------------------
    revno: 3362.76.96 [merge]
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.0
    timestamp: Thu 2010-10-21 17:50:16 -0700
    message:
      merge from ndb-6.3 to ndb-7.0
        ------------------------------------------------------------
        revno: 2585.162.31 [merge]
        committer: Martin Zaun <martin.zaun@oracle.com>
        branch nick: ndb-6.3
        timestamp: Thu 2010-10-21 17:44:32 -0700
        message:
          merge from ndb-6.3-int64constants to ndb-6.3
            ------------------------------------------------------------
            revno: 2585.166.1
            committer: Martin Zaun <martin.zaun@oracle.com>
            branch nick: ndb-6.3-int64constants
            timestamp: Thu 2010-10-21 17:40:27 -0700
            message:
              added [U]INT_MIN/MAX64 defines (needed for ndb_restore lossy conversion patches).
------------------------------------------------------------
revno: 3910 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-21 14:08:16 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.95 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-21 14:02:45 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.30
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2010-10-21 13:45:41 +0200
        message:
          ndb - fix a (very) sporadic crash when event->subscribe() is performed on a table being dropped. Seen in ndb_binlog_variants and autotest
------------------------------------------------------------
revno: 3909 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-21 10:59:46 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.94 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-21 10:58:41 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.29
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Thu 2010-10-21 10:51:09 +0200
        message:
          ndb - bug#57618 - also retry log-entries, (patch use goto to make it small)
------------------------------------------------------------
revno: 3908 [merge]
committer: Pekka Nousiainen <pekka@mysql.com>
branch nick: ms-bug56853-71
timestamp: Wed 2010-10-20 20:43:03 +0300
message:
  merge 7.0 to 7.1
    ------------------------------------------------------------
    revno: 3362.76.93 [merge]
    committer: Pekka Nousiainen <pekka@mysql.com>
    branch nick: ms-bug56853-70
    timestamp: Wed 2010-10-20 20:41:22 +0300
    message:
      merge 6.3 to 7.0
        ------------------------------------------------------------
        revno: 2585.162.28
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-bug56853-63
        timestamp: Wed 2010-10-20 20:39:53 +0300
        message:
          bug#56853 a01_patch.diff
          missing shrink varchar in index bound dist key check
------------------------------------------------------------
revno: 3907 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Wed 2010-10-20 17:22:42 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.92
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-20 17:21:27 +0200
    message:
      ndb - add the orignal line back as part of tagging patch for bug53205
    ------------------------------------------------------------
    revno: 3362.76.91 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-20 16:06:09 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.162.27 [merge]
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Wed 2010-10-20 16:01:08 +0200
        message:
          Merge 6.2 to 6.3
            ------------------------------------------------------------
            revno: 2572.82.34
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 6.2
            timestamp: Wed 2010-10-20 15:36:40 +0200
            message:
              Bug#57603 slave_allow_batching uses same bit in thd->options as profiling
               - Change so that slave_allow_batching does not use the same bit as profiling
            ------------------------------------------------------------
            revno: 2572.82.33
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 6.2
            timestamp: Wed 2010-10-20 15:35:30 +0200
            message:
              ndb
               - tag WL3733 with MCP ifdef tags
            ------------------------------------------------------------
            revno: 2572.82.32
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 6.2
            timestamp: Wed 2010-10-20 14:13:52 +0200
            message:
              ndb
               - revert addition of field->used_length() and instead use new local function
                 field_used_length() to calculate how much store the field really needs.
            ------------------------------------------------------------
            revno: 2572.82.31 [merge]
            committer: Martin Skold <Martin.Skold@mysql.com>
            branch nick: mysql-5.1-telco-6.2
            timestamp: Thu 2010-10-14 10:44:20 +0200
            message:
              Merge
                ------------------------------------------------------------
                revno: 2572.84.1 [merge]
                committer: Martin Skold <Martin.Skold@mysql.com>
                branch nick: mysql-5.1-telco-6.2_merge
                timestamp: Wed 2010-10-13 13:24:19 +0200
                message:
                  Merge
        ------------------------------------------------------------
        revno: 2585.162.26
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Wed 2010-10-20 14:17:32 +0200
        message:
          Merge 6.2 to 6.3
    ------------------------------------------------------------
    revno: 3362.76.90 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Wed 2010-10-20 14:55:03 +0200
    message:
      Merge
------------------------------------------------------------
revno: 3906 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Wed 2010-10-20 14:34:28 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.81.3
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-20 14:33:24 +0200
    message:
      Merge 6.3 to 7.0
    ------------------------------------------------------------
    revno: 3362.81.2
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0-bug52305-markup
    timestamp: Wed 2010-10-20 13:10:46 +0200
    message:
      ndb
       - mark up BG52305 with MCP ifndef tags
       - split some code to minimize modifying existing code
    ------------------------------------------------------------
    revno: 3362.81.1
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 17:03:27 +0200
    message:
      ndb
       - always compile SysLogHandler.cpp
       - add ifdefs so that SysLogHandler.cpp is an empty compile on Windows.
------------------------------------------------------------
revno: 3905 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-20 11:55:18 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.89 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-20 11:49:55 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.25
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2010-10-20 11:45:01 +0200
        message:
          ndb - bug#57322 - compute correct "failure times" when setting max-lag values for gcp and micro-gcp
        ------------------------------------------------------------
        revno: 2585.162.24
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2010-10-20 10:17:33 +0200
        message:
          ndb - remove "increasing maxGciInLcp from" printouts from release builds
------------------------------------------------------------
revno: 3904 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-20 09:31:48 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.88
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-20 09:12:58 +0200
    message:
      ndb - bug#57563 - add new tool to ndbmtd thread tool-box: synronize_path() which makes blocks until a message has traversed path given as input. Use this in micro-gcp instead of syncronize_threads_for_blocks() too be sure to avoid starvation even in pathological cases
------------------------------------------------------------
revno: 3903 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2010-10-19 19:12:43 -0700
message:
  ndbjtie - merge unit test fix
    ------------------------------------------------------------
    revno: 3901.2.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-dbg32
    timestamp: Tue 2010-10-19 19:11:18 -0700
    message:
      ndbjtie - fixed jtie unit test (myapi [f]inalization failure).
------------------------------------------------------------
revno: 3902 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2010-10-19 18:14:40 -0700
message:
  merge from ndb-7.1-ndbtypes
    ------------------------------------------------------------
    revno: 3901.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-ndbtypes
    timestamp: Tue 2010-10-19 18:10:11 -0700
    message:
      added [U]INT_MIN/MAX64 defines (needed for ndb_restore lossy conversion patches).
------------------------------------------------------------
revno: 3901 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Tue 2010-10-19 16:14:44 -0700
message:
  crund - merge
    ------------------------------------------------------------
    revno: 3856.1.12
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-19 15:56:45 -0700
    message:
      crund - preparations for code sharing between crund and tws.
    ------------------------------------------------------------
    revno: 3856.1.11
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-19 15:53:39 -0700
    message:
      crund - aligned tws benchmark's java with c++ version.
    ------------------------------------------------------------
    revno: 3856.1.10
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-19 15:52:04 -0700
    message:
      crund - aligned c++ design and log+console output with java version.
    ------------------------------------------------------------
    revno: 3856.1.9
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-19 15:50:53 -0700
    message:
      crund - aligned java design and log+console output with c++ version.
    ------------------------------------------------------------
    revno: 3856.1.8
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Fri 2010-10-08 04:17:35 -0700
    message:
      crund - fixes, improvements, cleanups flowing from new TWS code.
    ------------------------------------------------------------
    revno: 3856.1.7
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Fri 2010-10-08 04:14:56 -0700
    message:
      crund - moved the TWS Java benchmark next to the new C++ code.
    ------------------------------------------------------------
    revno: 3856.1.6
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Thu 2010-10-07 21:23:30 -0700
    message:
      crund - added c++/ndbapi TWS benchmark.
    ------------------------------------------------------------
    revno: 3856.1.5
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-05 23:15:04 -0700
    message:
      crund - minor cleanup for easier code sharing with TWS
    ------------------------------------------------------------
    revno: 3856.1.4
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Tue 2010-10-05 01:48:30 -0700
    message:
      crund - refactorization for code copying/sharing with TWS benchmark
------------------------------------------------------------
revno: 3900 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-19 22:12:36 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.87
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-19 22:11:44 +0200
    message:
      ndb - another stab at dict strict alias warning
------------------------------------------------------------
revno: 3899
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-19 21:06:32 +0200
message:
  ndb - kill warning in jtie test
------------------------------------------------------------
revno: 3898 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-19 20:49:46 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.86 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-19 20:42:34 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.23
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Tue 2010-10-19 20:26:17 +0200
        message:
          ndb - bug#57522 - make last step of micro gcp syncronous to avoid rare race with master take-over
------------------------------------------------------------
revno: 3897 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-10-19 15:55:43 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.85
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 15:51:20 +0200
    message:
      ndb
       - suppress Windows warnings only if MSVC
    ------------------------------------------------------------
    revno: 3362.76.84
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 15:27:23 +0200
    message:
      ndb
       - don't build "require-test" from require.c
    ------------------------------------------------------------
    revno: 3362.76.83
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 14:19:31 +0200
    message:
      ndb
       - fix small Cmake file error, remove additional comma
------------------------------------------------------------
revno: 3896 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-10-19 14:06:48 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.82
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 14:05:56 +0200
    message:
      ndb
       - fix warning in IPV6 code, reported as BUG57562
------------------------------------------------------------
revno: 3895 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-10-19 13:39:21 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.81 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 13:28:14 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.162.22
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Mon 2010-10-18 20:53:40 +0200
        message:
          ndb - last compiler warning in 6.3\!
    ------------------------------------------------------------
    revno: 3362.76.80
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Tue 2010-10-19 09:53:03 +0200
    message:
      ndb
       - backport fix for "suggest parentheses around" warning from 5.5
------------------------------------------------------------
revno: 3894
committer: John David Duncan <jdd@mysql.com>
branch nick: mbcharsets
timestamp: Mon 2010-10-18 23:13:29 -0700
message:
  Change signature of CharsetMap::isMultibyte() to return Java boolean[] 
------------------------------------------------------------
revno: 3893 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-18 16:15:29 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.79 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-18 15:46:27 +0200
    message:
      Merge 6.3 to 7.0
        ------------------------------------------------------------
        revno: 2585.162.21
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 14:45:18 +0200
        message:
          ndb
           - tag patches for WL3126 and bug56691 with ifndef tags
        ------------------------------------------------------------
        revno: 2585.162.20
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 14:03:53 +0200
        message:
          ndb
           - temporary fix to silence compiler warnings reported in bug 57476
        ------------------------------------------------------------
        revno: 2585.162.19
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 13:48:36 +0200
        message:
          ndb
           - revert the addition of "using_quick" to READ_RECORD in structs.h, instead
            look directly at select->quick which should mean the same thing.
           - revert small changes of comments in structs.h
        ------------------------------------------------------------
        revno: 2585.162.18
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 13:21:36 +0200
        message:
          ndb
           - mark one more place as being part of WL342
------------------------------------------------------------
revno: 3892 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Mon 2010-10-18 12:55:02 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.78 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-18 12:53:03 +0200
    message:
      Merge 6.3 to 7.0
        ------------------------------------------------------------
        revno: 2585.162.17
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 11:42:37 +0200
        message:
          ndb
           - mark up MCP patch for wl4080
           - mark up two more patches belonging to wl342 and bug47037
        ------------------------------------------------------------
        revno: 2585.162.16
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 11:35:27 +0200
        message:
          ndb
           - revert uneccessary changes to slave.cc
           - revert .result file diffs, "Fatal error: " was missing from error message
             when slave I/O thread stopped.
        ------------------------------------------------------------
        revno: 2585.162.15
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 11:33:24 +0200
        message:
          ndb
           - mark up MCP patches for wl3127, wl342 and bug47037 with ifndefs
        ------------------------------------------------------------
        revno: 2585.162.14 [merge]
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Mon 2010-10-18 08:44:37 +0200
        message:
          Merge
    ------------------------------------------------------------
    revno: 3362.76.77 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Mon 2010-10-18 08:36:58 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.165.2
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Mon 2010-10-18 08:35:42 +0200
        message:
          ndb
           - revert uneccessary change in order to reduce MCP
        ------------------------------------------------------------
        revno: 2585.165.1
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Fri 2010-10-15 14:19:26 +0200
        message:
          ndb - fix compilation warning caused by missing braces around const initializers
------------------------------------------------------------
revno: 3891 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-15 15:10:06 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.76
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-15 15:04:50 +0200
    message:
      ndb - fix strict alias warning
    ------------------------------------------------------------
    revno: 3362.76.75 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-15 15:02:59 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.13
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-15 15:01:34 +0200
        message:
          ndb - allow "Subscription already dropped" aswell...caused spurious crash of ndb_binlog_variants
    ------------------------------------------------------------
    revno: 3362.76.74
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-15 15:02:11 +0200
    message:
      ndb - change number of CFG_DB_EVENTLOG_BUFFER_SIZE since the redo-enhancement numbers has already been sent here and there
------------------------------------------------------------
revno: 3890 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Fri 2010-10-15 12:45:20 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.73 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-15 12:43:31 +0200
    message:
      Merge 6.3 -> 7.0
        ------------------------------------------------------------
        revno: 2585.162.12
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Fri 2010-10-15 12:04:36 +0200
        message:
          ndb - fix compiler warnings in cluster specific slave.cc code
        ------------------------------------------------------------
        revno: 2585.162.11
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 6.3
        timestamp: Fri 2010-10-15 11:20:58 +0200
        message:
          ndb - fix mysqltest.cc warning, filed upstream as 57478
        ------------------------------------------------------------
        revno: 2585.162.10 [merge]
        committer: Martin Skold <Martin.Skold@mysql.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Thu 2010-10-14 10:37:57 +0200
        message:
          Merge
            ------------------------------------------------------------
            revno: 2585.164.2 [merge]
            committer: Martin Skold <Martin.Skold@mysql.com>
            branch nick: mysql-5.1-telco-6.3_merge
            timestamp: Tue 2010-10-12 14:22:37 +0200
            message:
              Merge
            ------------------------------------------------------------
            revno: 2585.164.1 [merge]
            committer: Martin Skold <Martin.Skold@mysql.com>
            branch nick: mysql-5.1-telco-6.3_merge
            timestamp: Tue 2010-10-12 13:57:48 +0200
            message:
              Merge
    ------------------------------------------------------------
    revno: 3362.76.72
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-15 11:47:39 +0200
    message:
      ndb - ignore warning C4090 on Windows.
    ------------------------------------------------------------
    revno: 3362.76.71
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-15 10:57:02 +0200
    message:
      ndb - remove unused BackupEvent struct, it was filled in but never read from or displayed
    ------------------------------------------------------------
    revno: 3362.76.70
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Fri 2010-10-15 10:56:18 +0200
    message:
      ndb - remove unused extern declaration of LOCK_plugin mutex, not used from
        ha_ndbcluster anymore
    ------------------------------------------------------------
    revno: 3362.76.69 [merge]
    committer: Martin Skold <Martin.Skold@mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Thu 2010-10-14 10:26:27 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.80.1 [merge]
        committer: Martin Skold <Martin.Skold@mysql.com>
        branch nick: mysql-5.1-telco-7.0_merge
        timestamp: Tue 2010-10-12 16:55:52 +0200
        message:
          Merge
------------------------------------------------------------
revno: 3889 [merge]
committer: John David Duncan <jdd@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2010-10-14 11:34:05 -0700
message:
  Merge
    ------------------------------------------------------------
    revno: 3865.1.1
    committer: John David Duncan <jdd@mysql.com>
    branch nick: mbcharsets
    timestamp: Thu 2010-10-14 11:31:53 -0700
    message:
      Implement CharsetMap::isMultibyte in mysql utils and map to Java through
      ndbjtie.
------------------------------------------------------------
revno: 3888 [merge]
committer: Martin Skold <Martin.Skold@mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Thu 2010-10-14 10:14:47 +0200
message:
  Merge
    ------------------------------------------------------------
    revno: 3882.1.1 [merge]
    committer: Martin Skold <Martin.Skold@mysql.com>
    branch nick: mysql-5.1-telco-7.1
    timestamp: Wed 2010-10-13 10:08:23 +0200
    message:
      Merged in mysql-5.1.51 from mysql-5.1-telco-7.0
        ------------------------------------------------------------
        revno: 3362.79.1 [merge]
        committer: Martin Skold <Martin.Skold@mysql.com>
        branch nick: mysql-5.1-telco-7.0
        timestamp: Tue 2010-10-12 16:53:28 +0200
        message:
          Merged in mysql-5.1.51 from mysql-5.1-telco-6.3
            ------------------------------------------------------------
            revno: 2585.163.2 [merge]
            committer: Martin Skold <Martin.Skold@mysql.com>
            branch nick: mysql-5.1-telco-6.3
            timestamp: Tue 2010-10-12 14:21:27 +0200
            message:
              Merge
                ------------------------------------------------------------
                revno: 2572.83.3
                committer: Martin Skold <Martin.Skold@mysql.com>
                branch nick: mysql-5.1-telco-6.2
                timestamp: Tue 2010-10-12 14:17:36 +0200
                message:
                  Removed reference to deleted file bcmp.c
            ------------------------------------------------------------
            revno: 2585.163.1 [merge]
            committer: Martin Skold <Martin.Skold@mysql.com>
            branch nick: mysql-5.1-telco-6.3
            timestamp: Tue 2010-10-12 13:54:35 +0200
            message:
              Merged in mysql-5.1.51 from mysql-5.1-telco-6.2
                ------------------------------------------------------------
                revno: 2572.83.2
                committer: Martin Skold <Martin.Skold@mysql.com>
                branch nick: mysql-5.1-telco-6.2
                timestamp: Wed 2010-10-06 14:03:23 +0200
                message:
                  Removed remaing uchar** casts
                ------------------------------------------------------------
                revno: 2572.83.1 [merge]
                committer: Martin Skold <Martin.Skold@mysql.com>
                branch nick: mysql-5.1-telco-6.2
                timestamp: Wed 2010-10-06 12:06:47 +0200
                message:
                  Merged in mysql-5.1.51
                    ------------------------------------------------------------
                    revno: 2555.776.120
                    tags: mysql-5.1.51, clone-5.1.51-build
                    committer: Alfranio Correia <alfranio.correia@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Fri 2010-09-10 11:49:57 +0100
                    message:
                      BUG#55675 rpl.rpl_log_pos fails sporadically with error binlog truncated in the middle
                        
                      Disabled the test case.
                    ------------------------------------------------------------
                    revno: 2555.776.119
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: mysql-5.1-security
                    timestamp: Thu 2010-09-09 13:40:17 +0400
                    message:
                      Fix for bug#56679: gis.test: valgrind error
                      
                      Item_func_spatial_collection::fix_length_and_dec()
                      changed to use argument's print() method to print
                      the ER_ILLEGAL_VALUE_FOR_TYPE error.
                    ------------------------------------------------------------
                    revno: 2555.776.118
                    committer: Sergey Vojtovich <svoj@sun.com>
                    branch nick: mysql-5.1-security
                    timestamp: Wed 2010-09-08 00:16:10 +0400
                    message:
                      main.gis-rtree, main.type_float and main.type_newdecimal
                      were marked as experimental due to BUG38965.
                    ------------------------------------------------------------
                    revno: 2555.776.117
                    committer: Kristofer Pettersson <kristofer.pettersson@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-09-07 15:43:00 +0200
                    message:
                      Post fix following fix for bug55531: Disabling testcase for
                      bug 55568 because {1} isn't a valid geometry for a geometry
                      collection.
                    ------------------------------------------------------------
                    revno: 2555.776.116 [merge]
                    committer: Kristofer Pettersson <kristofer.pettersson@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-09-07 13:34:18 +0200
                    message:
                      Manual resolve of mysql-test/r/gis.result
                        ------------------------------------------------------------
                        revno: 2555.839.3 [merge]
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-security
                        timestamp: Wed 2010-09-01 17:43:02 -0700
                        message:
                          Merge from mysql-5.1-bugteam to mysql-5.1-security
                            ------------------------------------------------------------
                            revno: 2555.827.45
                            committer: Davi Arnaut <davi.arnaut@oracle.com>
                            branch nick: 55846-5.1
                            timestamp: Tue 2010-08-24 10:48:45 -0300
                            message:
                              Bug#55846: Link tests fail on Windows - my_compiler.h missing
                              
                              Make the my_compiler.h header, like my_attribute.h, part of
                              the distribution. This is required due to the dependency of
                              the former on the latter (which can undefine __attribute__).
                            ------------------------------------------------------------
                            revno: 2555.827.44 [merge]
                            committer: Gleb Shchepa <gshchepa@mysql.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Tue 2010-08-31 02:32:03 +0400
                            message:
                              automerge local --> 5.1-bugteam (bug 53034)
                                ------------------------------------------------------------
                                revno: 2555.845.1
                                committer: Gleb Shchepa <gshchepa@mysql.com>
                                branch nick: 53034-5.1-bugteam
                                timestamp: Tue 2010-08-31 02:16:38 +0400
                                message:
                                  Bug #53034: Multiple-table DELETE statements not accepting
                                              "Access compatibility" syntax
                                  
                                  The "wild" "DELETE FROM table_name.* ... USING ..." syntax
                                  for multi-table DELETE statements is documented but it was
                                  lost in the fix for the bug 30234.
                                  
                                  The table_ident_opt_wild parser rule has been added
                                  to restore the lost syntax.
                            ------------------------------------------------------------
                            revno: 2555.827.43 [merge]
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: b51875-5.1-bugteam
                            timestamp: Mon 2010-08-30 12:08:28 +0400
                            message:
                              Automerge.
                                ------------------------------------------------------------
                                revno: 2555.844.1 [merge]
                                committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                                branch nick: mysql-5.1-bugteam
                                timestamp: Mon 2010-08-30 11:19:09 +0400
                                message:
                                  Automerge.
                                    ------------------------------------------------------------
                                    revno: 2555.843.1
                                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                                    branch nick: mysql-5.1-bugteam
                                    timestamp: Fri 2010-08-27 13:44:35 +0400
                                    message:
                                      Bug #54465: assert: field_types == 0 || field_types[field_pos]
                                                  == MYSQL_TYPE_LONGLONG
                                      
                                      A MIN/MAX() function with a subquery as its argument could lead
                                      to a debug assertion on debug builds or wrong data on release
                                      ones.
                                      
                                      The problem was a combination of the following factors:
                                      
                                      - Item_sum_hybrid::fix_fields() might use the argument
                                      (args[0]) to calculate 'hybrid_field_type' which was later used
                                      to decide how the data should be sent to the client.
                                      
                                      - Item_sum::make_field() might use the argument again to
                                      calculate the field's type when sending result set metadata to
                                      the client.
                                      
                                      - The argument could be changed in between these two calls via
                                        Item::set_arg() leading to inconsistent metadata being
                                        reported.
                                      
                                      Here is what was happening for the bug's test case:
                                      
                                      1. Item_sum_hybrid::fix_fields() calculates hybrid_field_type
                                      as MYSQL_TYPE_LONGLONG based on args[0] which is an
                                      Item::SUBSELECT_ITEM at that time.
                                      
                                      2. A temporary table is created to execute the
                                      query. create_tmp_field_from_item() creates a Field_long object
                                      according to the subselect's max_length.
                                      
                                      3. The subselect item in Item_sum_hybrid is replaced by the
                                      Item_field object referencing the newly created Field_long.
                                      
                                      4. Item_sum::make_field() rightfully returns the
                                      MYSQL_TYPE_LONG type when calculating the result set metadata.
                                      
                                      5. When sending the actual data, Item::send() relies on the
                                      virtual field_type() function which in our case returns
                                      previously calculated hybrid_field_type == MYSQL_TYPE_LONGLONG.
                                      
                                      It looks like the only solution is to never refer to the
                                      argument's metadata after the result metadata has been
                                      calculated in fix_fields(), since the argument itself may be
                                      different by then. In this sense, Item_sum::make_field() should
                                      never be used, because it may rely on the argument's metadata
                                      and is only called after fix_fields(). The "default"
                                      implementation in Item::make_field() should be used instead as
                                      it relies only on field_type(), but not on the argument's type.
                                      
                                      Fixed by removing Item_sum::make_field() so that the superclass
                                      implementation Item::make_field() is always used.
                            ------------------------------------------------------------
                            revno: 2555.827.42
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: b51875-5.1-bugteam
                            timestamp: Mon 2010-08-30 11:51:46 +0400
                            message:
                              Fix for bug #51875: crash when loading data into geometry function polyfromwkb
                              
                              Check for number of line strings in the incoming polygon data (wkb) and
                              for number of points in the incoming linestring wkb.
                            ------------------------------------------------------------
                            revno: 2555.827.41 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Sat 2010-08-28 00:58:46 +0300
                            message:
                              Merge mysql-5.1-innodb -> mysql-5.1-bugteam
                                ------------------------------------------------------------
                                revno: 2555.738.187
                                committer: Vasil Dimov <vasil.dimov@oracle.com>
                                branch nick: mysql-5.1-innodb
                                timestamp: Thu 2010-08-26 18:06:07 +0300
                                message:
                                  Increment InnoDB Plugin version to 1.0.12.
                                  InnoDB Plugin 1.0.11 has been released with MySQL 5.1.50.
                                ------------------------------------------------------------
                                revno: 2555.738.186
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Tue 2010-08-24 11:10:03 +0300
                                message:
                                  Bug#55832: selects crash too easily when innodb_force_recovery>3
                                  
                                  dict_update_statistics_low(): Create bogus statistics for those
                                  indexes that cannot be accessed because of the innodb_force_recovery
                                  setting.
                                  
                                  ha_innobase::info(): Calculate statistics for each index, even if
                                  innodb_force_recovery is set. Fill in bogus data for those indexes
                                  that are not accessed because of the innodb_force_recovery setting.
                                ------------------------------------------------------------
                                revno: 2555.738.185
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Mon 2010-08-23 13:28:54 +0300
                                message:
                                  Bug#55832: selects crash too easily when innodb_force_recovery>3
                                  
                                  dict_update_statistics_low(): Create bogus statistics for those
                                  indexes that cannot be accessed because of the innodb_force_recovery
                                  setting.
                                  
                                  ha_innobase::info(): Calculate statistics for each index, even if
                                  innodb_force_recovery is set. Fill in bogus data for those indexes
                                  that are not accessed because of the innodb_force_recovery setting.
                                ------------------------------------------------------------
                                revno: 2555.738.184
                                committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                                branch nick: 5.1
                                timestamp: Fri 2010-08-20 17:49:43 +1000
                                message:
                                  Fix Bug #54538 - use of exclusive innodb dictionary lock limits performance.
                                              
                                  This patch doesn't get rid of the need to acquire the dict_sys->mutex but
                                  reduces the need to keep the mutex locked for the duration of the query
                                  to fsp_get_available_space_in_free_extents() from ha_innobase::info().
                                  
                                  rb://390.
                                ------------------------------------------------------------
                                revno: 2555.738.183
                                committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                                branch nick: 5.1
                                timestamp: Fri 2010-08-20 12:57:04 +1000
                                message:
                                  Fix Bug #55027: assertion: mutex_own(&dict_sys->mutex) in dict_table_get_on_id()
                                  
                                  The callers should indicate that the dictionary is locked or not using
                                  the trx->dict_operation_lock_mode == RW_X_LATCH mode. Checking explicitly
                                  for system tables is unnecessary.
                                  
                                  Approved by Marko on IRC.
                                ------------------------------------------------------------
                                revno: 2555.738.182
                                committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                                branch nick: 5.1
                                timestamp: Fri 2010-08-20 12:55:52 +1000
                                message:
                                  Fix bug#55699 - Assertion failure in innodb plugin with large number of threads
                                        
                                  Fix a debug assertion that was missed in svnrev:2380 (fix for Bug# 35352).
                                  
                                  Approved by Marko on IRC
                                ------------------------------------------------------------
                                revno: 2555.738.181
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Wed 2010-08-18 14:01:10 +0300
                                message:
                                  Bug#55626: MIN and MAX reading a delete-marked record from secondary index
                                  
                                  Remove a bogus debug assertion that triggered the bug.
                                  Add assertions precisely where records must not be delete-marked.
                                  And a comment to clarify when the record is allowed to be delete-marked.
                                ------------------------------------------------------------
                                revno: 2555.738.180 [merge]
                                committer: Vasil Dimov <vasil.dimov@oracle.com>
                                branch nick: mysql-5.1-innodb
                                timestamp: Tue 2010-08-17 22:39:34 +0300
                                message:
                                  Merge mysql-5.1-innodb from bk-internal into my local tree
                                    ------------------------------------------------------------
                                    revno: 2555.842.4
                                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                                    branch nick: mysql-5.1-innodb
                                    timestamp: Fri 2010-08-06 02:49:22 -0700
                                    message:
                                      Address bug #55465 ERROR 1280 (42000): Incorrect index name '<index name>',
                                      adding a couple FK related messages.
                                      
                                      rb://409 approved by Sunny Bains
                                    ------------------------------------------------------------
                                    revno: 2555.842.3
                                    committer: Inaam Rana <inaam.rana@oracle.com>
                                    branch nick: 5.1
                                    timestamp: Thu 2010-08-05 11:34:44 -0400
                                    message:
                                      Backport of revno 3148 mysql-innodb-trunk
                                      
                                        Currently we do a full validation of AHI whenever check tables is
                                        called on any table. This patch fixes this by only doing this full
                                        check in debug versions.
                                        
                                        bug#55716
                                        rb://423
                                        approved by: Marko
                                    ------------------------------------------------------------
                                    revno: 2555.842.2
                                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                                    branch nick: mysql-5.1-innodb
                                    timestamp: Tue 2010-08-03 20:20:55 -0700
                                    message:
                                      Backport "NULL pointer check for ut_free()" from mysql-trunk-innodb to
                                      mysql-5.1-innodb plugin to fix bug #55627 segv in ut_free pars_lexer_close
                                      innobase_shutdown innodb-use-sys-malloc=0.
                                    ------------------------------------------------------------
                                    revno: 2555.842.1
                                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                                    branch nick: mysql-5.1-innodb
                                    timestamp: Sun 2010-08-01 22:25:57 -0700
                                    message:
                                      Fix Bug #55382 Assignment with SELECT expressions takes unexpected S locks
                                      in READ COMMITTED
                                      
                                      rb://410 Approved by Sunny Bains
                                ------------------------------------------------------------
                                revno: 2555.738.179
                                committer: Vasil Dimov <vasil.dimov@oracle.com>
                                branch nick: mysql-5.1-innodb
                                timestamp: Tue 2010-08-17 22:37:18 +0300
                                message:
                                  Disable all innodb_plugin tests on Solaris until the problem is resolved.
                                  
                                  Track this via:
                                  Bug#56063 InnoDB Plugin mysql-tests fail on Solaris
                            ------------------------------------------------------------
                            revno: 2555.827.40
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: b54253-5.1-bugteam
                            timestamp: Fri 2010-08-27 11:44:06 +0400
                            message:
                              Fix for bug #54253: memory leak when using I_S plugins w/o deinit method
                              
                              Free memory allocated by the server for all plugins,
                              with or without deinit() method.
                            ------------------------------------------------------------
                            revno: 2555.827.39
                            committer: Bjorn Munch <bjorn.munch@oracle.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Thu 2010-08-26 15:14:50 +0200
                            message:
                              Reduced #ifndef for 52301, caused compile warning
                            ------------------------------------------------------------
                            revno: 2555.827.38 [merge]
                            committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Thu 2010-08-26 16:36:48 +0400
                            message:
                              Automerge.
                                ------------------------------------------------------------
                                revno: 2555.841.4
                                committer: Sergey Vojtovich <svoj@sun.com>
                                branch nick: mysql-5.1-bugteam-test
                                timestamp: Thu 2010-08-26 15:23:44 +0400
                                message:
                                  Fixed race condition in a test case for BUG#55580.
                                ------------------------------------------------------------
                                revno: 2555.841.3
                                committer: Evgeny Potemkin <epotemkin@mysql.com>
                                branch nick: 55656-bug-5.1-bugteam
                                timestamp: Thu 2010-08-26 13:31:04 +0400
                                message:
                                  Bug #55656: mysqldump can be slower after bug 39653 fix.
                                  After fix for bug 39653 the shortest available secondary index was used for
                                  full table scan. Primary clustered key was used only if no secondary index
                                  can be used. However, when chosen secondary index includes all fields of the
                                  table being scanned it's better to use primary index since the amount of
                                  data to scan is the same but the primary index is clustered.
                                  Now the find_shortest_key function takes this into account.
                                ------------------------------------------------------------
                                revno: 2555.841.2 [merge]
                                committer: Bjorn Munch <bjorn.munch@oracle.com>
                                branch nick: mysql-5.1-bugteam
                                timestamp: Wed 2010-08-25 22:49:52 +0200
                                message:
                                  merge followup fix for 52301
                                    ------------------------------------------------------------
                                    revno: 2555.438.154
                                    committer: Bjorn Munch <bjorn.munch@oracle.com>
                                    branch nick: merge-51
                                    timestamp: Wed 2010-08-25 16:34:31 +0200
                                    message:
                                      Cherry pick 55501
                                    ------------------------------------------------------------
                                    revno: 2555.438.153
                                    committer: Bjorn Munch <bjorn.munch@oracle.com>
                                    branch nick: embprot-51
                                    timestamp: Wed 2010-08-25 10:23:19 +0200
                                    message:
                                      Bug #52301 Add --protocol to mysqltest
                                      Added code resulted in strange linking problem for embedded on Windows
                                      Avoided by not doing this for embedded mode
                                      It's irrelevant for embedded server anyway, --protocol will be ignored
                                ------------------------------------------------------------
                                revno: 2555.841.1
                                committer: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
                                branch nick: 5.1-bugteam-bug29751
                                timestamp: Wed 2010-08-25 15:47:45 +0700
                                message:
                                  Fixed bug #29751 - do not rename the error log at FLUSH LOGS.
                                  Added open log file with FILE_SHARE_DELETE flag on Windows.
                            ------------------------------------------------------------
                            revno: 2555.827.37
                            committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Tue 2010-08-24 19:51:32 +0400
                            message:
                              Bug #54802: 'NOT BETWEEN' evaluation is incorrect
                              
                              Queries involving predicates of the form "const NOT BETWEEN
                              not_indexed_column AND indexed_column" could return wrong data
                              due to incorrect handling by the range optimizer.
                              
                              For "c NOT BETWEEN f1 AND f2" predicates, get_mm_tree()
                              produces a disjunction of the SEL_ARG trees for "f1 > c" and
                              "f2 < c". If one of the trees is empty (i.e. one of the
                              arguments is not sargable) the resulting tree should be empty
                              as well, since the whole expression in this case is not
                              sargable.
                              
                              The above logic is implemented in get_mm_tree() as follows. The
                              initial state of the resulting tree is NULL (aka empty). We
                              then iterate through arguments and compute the corresponding
                              SEL_ARG tree (either "f1 > c" or "f2 < c"). If the resulting
                              tree is NULL, it is simply replaced by the generated
                              tree. Otherwise it is replaced by a disjunction of itself and
                              the generated tree. The obvious flaw in this implementation is
                              that if the first argument is not sargable and thus produces a
                              NULL tree, the resulting tree will simply be replaced by the
                              tree for the second argument. As a result, "c NOT BETWEEN f1
                              AND f2" will end up as just "f2 < c".
                              
                              Fixed by adding a check so that when the first argument
                              produces an empty tree for the NOT BETWEEN case, the loop is
                              aborted with an empty tree as a result. The whole idea of using
                              a loop for 2 arguments does not make much sense, but it was
                              probably used to avoid code duplication for several BETWEEN
                              variants.
                            ------------------------------------------------------------
                            revno: 2555.827.36
                            committer: Mattias Jonsson <mattias.jonsson@sun.com>
                            branch nick: topush-5.1-bugteam
                            timestamp: Fri 2010-08-20 21:17:51 +0200
                            message:
                              post push test fix
                        ------------------------------------------------------------
                        revno: 2555.839.2 [merge]
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: mysql-5.1-security
                        timestamp: Thu 2010-08-26 14:19:04 +0400
                        message:
                          Automerge.
                            ------------------------------------------------------------
                            revno: 2555.840.1
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-security
                            timestamp: Tue 2010-08-24 20:42:33 -0700
                            message:
                              This is to resolve a hang situation in 5.1 builtin raised by
                              bug #49251 (deadlock/crash with concurrent truncate table and index
                              statistics calculation) by backporting a solution from #54678 fixed
                              for 5.1 plugin and 5.5.
                        ------------------------------------------------------------
                        revno: 2555.839.1 [merge]
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: mysql-5.1-security
                        timestamp: Thu 2010-08-26 14:15:40 +0400
                        message:
                          Automerge.
                            ------------------------------------------------------------
                            revno: 2555.838.1
                            committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                            branch nick: 5.1-security
                            timestamp: Thu 2010-08-26 14:13:02 +0400
                            message:
                              Bug #53544: Server hangs during JOIN query in stored procedure
                                          called twice in a row
                              
                              Queries with nested joins could cause an infinite loop in the
                              server when used from SP/PS.
                              
                              When flattening nested joins, simplify_joins() tracks if the
                              name resolution list needs to be updated by setting
                              fix_name_res to TRUE if the current loop iteration has done any
                              transformations to the join table list. The problem was that
                              the flag was not reset before the next loop iteration leading
                              to unnecessary "fixing" of the name resolution list which in
                              turn could lead to a loop (i.e. circularly-linked part) in that
                              list. This was causing problems on subsequent execution when
                              used together with stored procedures or prepared statements.
                              
                              Fixed by making sure fix_name_res is reset on every loop
                              iteration.
                    ------------------------------------------------------------
                    revno: 2555.776.115
                    committer: Kristofer Pettersson <kristofer.pettersson@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-09-07 11:37:46 +0200
                    message:
                      Bug#55531 crash with conversions of geometry types / strings
                      
                      Convertion from a floating point number to a string caused a
                      crash.
                      
                      During rare circumstances a String object could crash when
                      it was requested to allocate new memory.
                      A crash could occcur in Field_double::val_str() because of
                      a pointer referencing memory inside a String object which was
                      of unknown size.
                      And finally, the geometric collection should not accept
                      arguments which are non geometric.
                    ------------------------------------------------------------
                    revno: 2555.776.114 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-08-24 14:44:15 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.837.1
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: 5.1-security
                        timestamp: Tue 2010-08-24 14:35:48 +0400
                        message:
                          Bug #55568: user variable assignments crash server when used
                                      within query
                          
                          The server could crash after materializing a derived table
                          which requires a temporary table for grouping.
                          
                          When destroying the temporary table used to execute a query for
                          a derived table, JOIN::destroy() did not clean up Item_fields
                          pointing to fields in the temporary table. This led to
                          dereferencing a dangling pointer when printing out the items
                          tree later in the outer SELECT.
                          
                          The solution is an addendum to the patch for bug37362: in
                          addition to cleaning up items in tmp_all_fields3, do the same
                          for items in tmp_all_fields1, since now we have an example
                          where this is necessary.
                    ------------------------------------------------------------
                    revno: 2555.776.113 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Fri 2010-08-20 15:23:24 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3998.1 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-security
                        timestamp: Fri 2010-08-20 14:45:08 +0300
                        message:
                          merge
                    ------------------------------------------------------------
                    revno: 2555.776.112 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Fri 2010-08-20 15:08:01 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.827.35 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.1-bugteam
                        timestamp: Fri 2010-08-20 12:13:05 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3997.6 [merge]
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: merge-5.0-bugteam
                            timestamp: Fri 2010-08-20 12:05:31 +0300
                            message:
                              merge
                                ------------------------------------------------------------
                                revno: 1810.3992.21
                                committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                                branch nick: merge-5.0-security
                                timestamp: Mon 2010-08-02 10:48:24 +0300
                                message:
                                  tree name update
                        ------------------------------------------------------------
                        revno: 2555.827.34 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.1-bugteam
                        timestamp: Fri 2010-08-20 12:09:17 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.821.7 [merge]
                            author: karen.langford@oracle.com
                            committer: MySQL Build Team <build@mysql.com>
                            branch nick: mysql-5.1
                            timestamp: Thu 2010-08-19 17:18:58 +0200
                            message:
                              Merge from mysql-5.1.50-release
                            ------------------------------------------------------------
                            revno: 2555.821.6
                            committer: MySQL Build Team <build@mysql.com>
                            branch nick: mysql-5.1
                            timestamp: Thu 2010-08-19 17:03:29 +0200
                            message:
                              Raise the version number, 5.1.50 is (was) being built in a parellel tree.
                        ------------------------------------------------------------
                        revno: 2555.827.33 [merge]
                        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                        branch nick: topush-51-bugteam
                        timestamp: Thu 2010-08-19 09:20:17 +0200
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.836.1
                            committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                            branch nick: b46086-51-bt
                            timestamp: Thu 2010-07-08 14:36:55 +0200
                            message:
                              Bug#46086: crash when dropping a partitioned table
                                         and the original engine is disabled
                              
                              Missing check that engine is available.
                        ------------------------------------------------------------
                        revno: 2555.827.32
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-08-18 12:56:06 +0800
                        message:
                          WL#5370 Keep forward-compatibility when changing
                                  'CREATE TABLE IF NOT EXISTS ... SELECT' behaviour
                          BUG#55474, BUG#55499, BUG#55598, BUG#55616 and BUG#55777 are fixed
                          in this patch too.
                          
                          This is the 5.1 part.
                          It implements:
                          - if the table exists, binlog two events: CREATE TABLE IF NOT EXISTS
                            and INSERT ... SELECT
                          
                          - Insert nothing and binlog nothing on master if the existing object
                            is a view. It only generates a warning that table already exists.
                        ------------------------------------------------------------
                        revno: 2555.827.31
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B55580-5.1-bugteam
                        timestamp: Fri 2010-08-13 11:07:39 +0300
                        message:
                          Bug #55580 : segfault in read_view_sees_trx_id
                          
                          The server was not checking for errors generated during
                          the execution of Item::val_xxx() methods when copying
                          data to the group, order, or distinct temp table's row.
                          Fixed by extending the copy_funcs() to return an error
                          code and by checking for that error code on the places
                          copy_funcs() is called. 
                          Test case added.
                        ------------------------------------------------------------
                        revno: 2555.827.30
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B55565-5.1-bugteam
                        timestamp: Fri 2010-08-13 16:05:46 +0300
                        message:
                          Bug #55565: debug assertion when ordering by expressions with user 
                          variable assignments
                          
                          The assert() that is firing is checking if expressions that can't be
                          null return a NULL when evaluated.
                          MAKEDATE() function can return NULL if the second argument is 
                          less then or equal to 0. Thus its nullability depends not only on 
                          the nullability of its arguments but also on their values.
                          Fixed by (overoptimistically) setting MAKEDATE() to be nullable 
                          despite the nullability of its arguments.
                          Test added.
                          Had to update one test result to reflect the metadata change.
                        ------------------------------------------------------------
                        revno: 2555.827.29
                        committer: Martin Hansson <martin.hansson@sun.com>
                        branch nick: 5.1bt
                        timestamp: Wed 2010-08-11 14:13:59 +0200
                        message:
                          Bug#54444: Do not run main.range test for products without partitioning
                          feature
                          
                          The test for bug no 50939 was put in range.test which isn't such a good idea
                          since it requires partitioning. Fixed by moving the test case to
                          partitioning_range.test.
                        ------------------------------------------------------------
                        revno: 2555.827.28 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B55809-5.1-bugteam
                        timestamp: Tue 2010-08-10 16:39:57 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3997.5
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: B55809-5.0-bugteam
                            timestamp: Tue 2010-08-10 16:32:45 +0300
                            message:
                              Bug #55809: Server README not current
                              
                              Updated the README file.
                        ------------------------------------------------------------
                        revno: 2555.827.27
                        committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
                        branch nick: mysql-5.1-bugteam-bug54106
                        timestamp: Mon 2010-08-09 13:39:59 +0200
                        message:
                          Bug #54106 assert in Protocol::end_statement,
                                     INSERT IGNORE ... SELECT ... UNION SELECT ...
                          
                          This assert was triggered by INSERT IGNORE ... SELECT. The assert checks that a
                          statement either sends OK or an error to the client. If the bug was triggered
                          on release builds, it caused OK to be sent to the client instead of the correct
                          error message (in this case ER_FIELD_SPECIFIED_TWICE).
                          
                          The reason the assert was triggered, was that lex->no_error was set to TRUE
                          during JOIN::optimize() because of IGNORE. This causes all errors to be ignored.
                          However, not all errors can be ignored. Some, such as ER_FIELD_SPECIFIED_TWICE
                          will cause the INSERT to fail no matter what. But since lex->no_error was set,
                          the critical errors were ignored, the INSERT failed and neither OK nor the
                          error message was sent to the client.
                          
                          This patch fixes the problem by temporarily turning off lex->no_error in
                          places where errors cannot be ignored during processing of INSERT ... SELECT.
                          
                          Test case added to insert.test.
                        ------------------------------------------------------------
                        revno: 2555.827.26
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B54909-5.1-bugteam
                        timestamp: Fri 2010-08-06 15:56:23 +0300
                        message:
                          Bug #54909: Confusing description about read_buffer_size and
                          read_rnd_buffer_size
                          
                          Applied the updated description from Paul's patch.
                        ------------------------------------------------------------
                        revno: 2555.827.25
                        committer: Bjorn Munch <bjorn.munch@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-08-06 11:35:17 +0200
                        message:
                          Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of restarted servers
                          Undo workaround as fix is being merged in
                        ------------------------------------------------------------
                        revno: 2555.827.24 [merge]
                        committer: Bjorn Munch <bjorn.munch@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-08-06 11:13:52 +0200
                        message:
                          merge from 5.1-mtr
                            ------------------------------------------------------------
                            revno: 2555.438.152 [merge]
                            committer: Bjorn Munch <bjorn.bunch@oracle.com>
                            branch nick: noroot-51
                            timestamp: Wed 2010-08-04 12:19:51 +0200
                            message:
                              merge from 5.1
                            ------------------------------------------------------------
                            revno: 2555.438.151
                            committer: Bjorn Munch <bjorn.bunch@oracle.com>
                            branch nick: noroot-51
                            timestamp: Wed 2010-08-04 10:52:45 +0200
                            message:
                              Bug #55582 mtr root detection (and if-expression execution) broken
                              Follow-up patch: added test cases for -0 and while
                            ------------------------------------------------------------
                            revno: 2555.438.150
                            committer: Bjorn Munch <bjorn.bunch@oracle.com>
                            branch nick: noroot-51
                            timestamp: Tue 2010-08-03 16:11:23 +0200
                            message:
                              Bug #55582 mtr root detection (and if-expression execution) broken
                              if() treated any non-numeric string as false
                              Fixed to treat those as true instead
                              Added some test cases
                              Fixed missing $ in variable name in include/mix2.inc
                            ------------------------------------------------------------
                            revno: 2555.438.149 [merge]
                            committer: Bjorn Munch <bjorn.bunch@oracle.com>
                            branch nick: leak-51
                            timestamp: Mon 2010-08-02 12:43:28 +0200
                            message:
                              Bug #55597 MTR: Restart the server, from within the test case, with new CLI options.
                              The expect file can now include "restart:<server options>"
                              Also drop check-testcase if this has been done
                              Added comment explaining the restart: syntax
                                ------------------------------------------------------------
                                revno: 2555.835.1
                                committer: Bjorn Munch <bjorn.bunch@oracle.com>
                                branch nick: addopt-51
                                timestamp: Wed 2010-07-28 12:24:38 +0200
                                message:
                                  Bug #55597 MTR: Restart the server, from within the test case, with new CLI options.
                                  The expect file can now include "restart:<server options>"
                                  Also drop check-testcase if this has been done
                            ------------------------------------------------------------
                            revno: 2555.438.148
                            committer: Bjorn Munch <bjorn.bunch@oracle.com>
                            branch nick: leak-51
                            timestamp: Fri 2010-07-23 14:53:09 +0200
                            message:
                              Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of restarted servers
                              Was not covered by "skip" pattern
                              Replace with a more generic pattern for SUMMARY
                            ------------------------------------------------------------
                            revno: 2555.438.147 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: mtr-51
                            timestamp: Thu 2010-06-17 09:34:56 +0200
                            message:
                              merge from 5.1 up to rev 3408
                            ------------------------------------------------------------
                            revno: 2555.438.146
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: mtr-51
                            timestamp: Tue 2010-06-15 13:37:53 +0200
                            message:
                              Bug #54364 Allow multiple --experimental command line options for MTR
                              Bummer: MTR fails if a test fails and no --experimental is used
                              $experimental_test_cases must be intialized
                            ------------------------------------------------------------
                            revno: 2555.438.145 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Tue 2010-06-15 12:14:48 +0200
                            message:
                              merge 54368
                                ------------------------------------------------------------
                                revno: 2555.834.1
                                committer: Bjorn Munch <Bjorn.Munch@sun.com>
                                branch nick: crlf-51
                                timestamp: Mon 2010-06-14 15:34:43 +0200
                                message:
                                  Bug #54368 MTR does not recognize carriage return in --defaults-file
                                  Remove any leftover trailing ^M from lines read in
                            ------------------------------------------------------------
                            revno: 2555.438.144 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Tue 2010-06-15 11:30:44 +0200
                            message:
                              merge 54364
                                ------------------------------------------------------------
                                revno: 2555.833.1
                                committer: Bjorn Munch <Bjorn.Munch@sun.com>
                                branch nick: multexp-51
                                timestamp: Thu 2010-06-10 10:34:16 +0200
                                message:
                                  Bug #54364 Allow multiple --experimental command line options for MTR
                                  Convert --experimental into a multi option
                                  Size of diff is caused by intenting code put into a for loop
                            ------------------------------------------------------------
                            revno: 2555.438.143
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Tue 2010-06-15 11:29:24 +0200
                            message:
                              Bug #54111 mysqltest command remove_files_wildcard does not work in embedded server
                              Wildcard chars are changed in embedded mode
                              Temporarily reset the wild_* variables before wild_compare, also for list_files
                            ------------------------------------------------------------
                            revno: 2555.438.142 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Tue 2010-06-15 11:21:28 +0200
                            message:
                              merge 53949
                                ------------------------------------------------------------
                                revno: 2555.832.1
                                committer: Bjorn Munch <Bjorn.Munch@sun.com>
                                branch nick: skipopt-51
                                timestamp: Wed 2010-06-09 10:21:46 +0200
                                message:
                                  Bug #53949 Allow MTR2 to start server without hardcoded command-line options
                                  Added option --user-args, to be used with --start*
                                  Only keeps --defaults-file and --defaults-group-suffix
                                  Also added missing help text entry for --start-and-exit
                            ------------------------------------------------------------
                            revno: 2555.438.141
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Tue 2010-06-15 11:16:38 +0200
                            message:
                              Bug #52321 mtr test suite paths need to be updated
                              Use $suitedir instead of $basedir to find suites
                              Add 'testdir' to ConfigFactory
                            ------------------------------------------------------------
                            revno: 2555.438.140
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: failperl-51
                            timestamp: Mon 2010-06-07 13:30:23 +0200
                            message:
                              Bug #53374 Don't delete temporary perl file if perl fails
                              Simple condition on the delete stmt
                              But NB: next mtr run will clean up and remove the temp file
                            ------------------------------------------------------------
                            revno: 2555.438.139 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: merge-51
                            timestamp: Wed 2010-06-02 16:23:29 +0200
                            message:
                              Merge from 5.1 up to rev 3392
                            ------------------------------------------------------------
                            revno: 2555.438.138
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: noexit-51
                            timestamp: Tue 2010-04-13 12:41:42 +0200
                            message:
                              Bug #52214 Misleading error msg when test fails before having produced any query
                              output
                              Print error message only if real error
                            ------------------------------------------------------------
                            revno: 2555.438.137
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: noexit-51
                            timestamp: Tue 2010-04-13 10:01:04 +0200
                            message:
                              Bug #42513 mtr2: mysqltest doesn't count internal commands output as real output
                              MTR insited in exit; if run without result file
                              Simply remove the else part producing the error and let test finish
                            ------------------------------------------------------------
                            revno: 2555.438.136
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: tcp-51
                            timestamp: Tue 2010-03-23 15:01:40 +0100
                            message:
                              Bug #52301 Add --protocol to mysqltest
                              Implement as for other clients
                            ------------------------------------------------------------
                            revno: 2555.438.135
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: daoebi-51
                            timestamp: Mon 2010-03-22 11:32:17 +0100
                            message:
                              Two more funcs_1 updates after 43588
                            ------------------------------------------------------------
                            revno: 2555.438.134
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: daoebi-51
                            timestamp: Mon 2010-03-22 11:28:57 +0100
                            message:
                              Bug #43603 mysqltest command disable_abort_on_error does not affect all built-in commands
                              After disable_abort_on_error, behaved as if --error was in effect
                              Add condition before die, as after queries
                            ------------------------------------------------------------
                            revno: 2555.438.133
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: memvar-51
                            timestamp: Fri 2010-03-19 09:56:26 +0100
                            message:
                              Fixed many funcs_1 tests after 43588
                            ------------------------------------------------------------
                            revno: 2555.438.132
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: memvar-51
                            timestamp: Wed 2010-03-17 15:25:55 +0100
                            message:
                              Bug #43588 mysqltest command disable_abort_on_error logs connect commands
                              Only log connects after --error
                              A few small test adjustments needed/possible
                            ------------------------------------------------------------
                            revno: 2555.438.131
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: standex-51
                            timestamp: Tue 2010-03-16 10:45:32 +0100
                            message:
                              Bug #51767 Implement --start-and-exit also for MTR v2
                              Added option and logic, bypass safe_process
                              Adapted after review comments
                            ------------------------------------------------------------
                            revno: 2555.438.130 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: merge-51
                            timestamp: Tue 2010-03-09 16:09:32 +0100
                            message:
                              merge 45482
                                ------------------------------------------------------------
                                revno: 2555.831.1
                                committer: Bjorn Munch <Bjorn.Munch@sun.com>
                                branch nick: engcsv-51
                                timestamp: Thu 2010-03-04 11:09:09 +0100
                                message:
                                  Bug #45482 MTR2: --default-storage-engine=csv is rejected by mtr
                                  Added csv to list of builtin engines
                                  Fixed dysfunctional part of csv.test so it actuallu used csv
                            ------------------------------------------------------------
                            revno: 2555.438.129 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: merge-51
                            timestamp: Mon 2010-03-08 11:30:36 +0100
                            message:
                              small merge from 5.1
                            ------------------------------------------------------------
                            revno: 2555.438.128 [merge]
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: merge-51
                            timestamp: Thu 2010-03-04 12:10:36 +0100
                            message:
                              merge from 5.1
                            ------------------------------------------------------------
                            revno: 2555.438.127
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: daoeif-51
                            timestamp: Wed 2010-03-03 11:17:00 +0100
                            message:
                              followup test fix after 49761
                            ------------------------------------------------------------
                            revno: 2555.438.126
                            committer: Bjorn Munch <Bjorn.Munch@sun.com>
                            branch nick: daoeif-51
                            timestamp: Tue 2010-03-02 12:39:32 +0100
                            message:
                              Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/if
                              abort_on_error flag for stmt was set at initial parse
                              (Re)-set flag before execution instead, also added to test
                        ------------------------------------------------------------
                        revno: 2555.827.23
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Thu 2010-08-05 15:10:24 +0300
                        message:
                          Addendum to bug #42144 : fixed a wrong type conversation causing plugin tests
                          failures on sparc64.
                        ------------------------------------------------------------
                        revno: 2555.827.22
                        committer: Martin Hansson <martin.hansson@sun.com>
                        branch nick: 5.1bt-push
                        timestamp: Thu 2010-08-05 12:42:14 +0200
                        message:
                          Bug#54568: create view cause Assertion failed: 0, 
                          file .\item_subselect.cc, line 836
                          
                          IN quantified predicates are never executed directly. They are rather wrapped
                          inside nodes called IN Optimizers (Item_in_optimizer) which take care of the
                          execution. However, this is not done during query preparation. Unfortunately
                          the LIKE predicate pre-evaluates constant right-hand side arguments even
                          during name resolution. Likely this is meant as an optimization.
                          
                          Fixed by not pre-evaluating LIKE arguments in view prepare mode.
                        ------------------------------------------------------------
                        revno: 2555.827.21
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Wed 2010-08-04 15:58:09 +0300
                        message:
                          Bug #42144: plugin_load fails
                          
                          Reverted the ulong->uint diff
                          Re-applied the first diff.
                          The original commit message follows:
                          
                          enum plugin system variables are ulong internally, not int.
                          On systems where long is not the same as an int it causes
                          problems. 
                          Fixed by correct typecasting. Removed the test from the 
                          experimental list.
                        ------------------------------------------------------------
                        revno: 2555.827.20
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B42144-5.1-bugteam
                        timestamp: Tue 2010-08-03 19:01:30 +0300
                        message:
                          Bug #42144: plugin_load fails
                          
                          The enum system variables were handled inconsistently 
                          as ints, unsigned int and unsigned long on various places.
                          This caused problems on platforms on which 
                          sizeof(int) != sizeof(long).
                          Fixed by homogenizing the type of the enum variables
                          to unsigned int, since it's size compatible with the C enum
                          type. 
                          Removed the test from the experimental list.
                        ------------------------------------------------------------
                        revno: 2555.827.19
                        committer: <Dao-Gang.Qu@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-08-03 18:27:45 +0800
                        message:
                          Bug #34283  	mysqlbinlog leaves tmpfile after termination if binlog contains load data infile
                          
                          Post fix
                        ------------------------------------------------------------
                        revno: 2555.827.18
                        committer: <Dao-Gang.Qu@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-08-03 10:22:19 +0800
                        message:
                          Bug #34283  mysqlbinlog leaves tmpfile after termination if binlog contains load data infile
                          
                          With statement- or mixed-mode logging, "LOAD DATA INFILE" queries
                          are written to the binlog using special types of log events.
                          When mysqlbinlog reads such events, it re-creates the file in a
                          temporary directory with a generated filename and outputs a
                          "LOAD DATA INFILE" query where the filename is replaced by the
                          generated file. The temporary file is not deleted by mysqlbinlog
                          after termination.
                          
                          To fix the problem, in mixed mode we go to row-based. In SBR, we
                          document it to remind user the tmpfile is left in a temporary
                          directory.
                    ------------------------------------------------------------
                    revno: 2555.776.111
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: B55826-5.1-security
                    timestamp: Fri 2010-08-20 11:52:16 +0300
                    message:
                      Bug #55826: create table .. select crashes with when 
                        KILL_BAD_DATA is returned
                      
                      Two problems discovered with the LEAST()/GREATEST() 
                      functions:
                      1. The check for a null value should happen even 
                      after the second call to val_str() in the args. This is
                      important because two subsequent calls to the same
                      Item::val_str() may yield different results.
                      Fixed by checking for NULL value before dereferencing
                      the string result.
                      
                      2. While looping over the arguments and evaluating them 
                      the loop should stop if there was an error evaluating so far
                      or the statement was killed. Fixed by checking for error
                      and bailing out.
                    ------------------------------------------------------------
                    revno: 2555.776.110
                    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                    branch nick: 5.1-security
                    timestamp: Mon 2010-08-16 10:12:22 +1000
                    message:
                      Add test to the plugin branch from fix for bug# 55277.
                    ------------------------------------------------------------
                    revno: 2555.776.109
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: B55615-5.1-security
                    timestamp: Fri 2010-08-13 14:18:46 +0300
                    message:
                      Bug #55615 and bug #55564
                      
                      An user assignment variable expression that's 
                      evaluated in a logical expression context 
                      (Item::val_bool()) can be pre-calculated in a 
                      temporary table for GROUP BY.
                      However when the expression value is used after the
                      temp table creation it was re-evaluated instead of
                      being read from the temp table due to a missing 
                      val_bool_result() method.
                      Fixed by implementing the method.
                    ------------------------------------------------------------
                    revno: 2555.776.108
                    committer: Gleb Shchepa <gshchepa@mysql.com>
                    branch nick: 55424-5.1-bugteam
                    timestamp: Fri 2010-08-06 23:29:37 +0400
                    message:
                      Bug #55424: convert_tz crashes when fed invalid data
                      
                      The CONVERT_TZ function crashes the server when the
                      timezone argument is an empty SET field value.
                      
                      1) The CONVERT_TZ may find a timezone string in the
                         tz_names hash.
                      2) A string representation of the empty SET is a
                         String of zero length with the NULL pointer.
                      3) If the key argument length is zero, hash functions
                         do comparison using the length of the record being
                         compared against.
                      
                      I.e. a zero-length String buffer is an invalid
                      argument for hash search functions, and if String
                      points to NULL buffer, hashcmp() fails with SEGV
                      accessing that memory.
                      
                      The my_tz_find function has been modified to
                      treat empty Strings as invalid timezone values
                      to skip unnecessary hash search.
                    ------------------------------------------------------------
                    revno: 2555.776.107
                    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                    branch nick: 5.1-security
                    timestamp: Thu 2010-08-05 19:24:34 +1000
                    message:
                      Fix Bug #55277 - Failing assertion: auto_inc > 0
                      
                      Handle overflow when reading value from SELECT MAX(C) FROM T;
                      
                      Call ha_innobase::info() after initializing the autoinc value
                      in ha_innobase::open().
                      
                      Fix for both the builtin and plugin.
                      
                      rb://402
                    ------------------------------------------------------------
                    revno: 2555.776.106
                    committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                    branch nick: 5.1-security
                    timestamp: Thu 2010-08-05 19:18:17 +1000
                    message:
                      Fix bug# 55543 - InnoDB Plugin: Signal 6: Assertion failure in file fil/fil0fil.c line 4306
                      
                      The bug is due to a double delete of a BLOB, once via:
                      
                          rollback -> btr_cur_pessimistic_delete()
                      
                      and the second time via purge.
                      
                      The bug is in row_upd_clust_rec_by_insert(). There we relinquish ownership
                      of the non-updated BLOB columns in btr_cur_mark_extern_inherited_fields()
                      before building the row entry that will be inserted and whose contents will
                      be logged in the UNDO log. However, we don't set the BLOB column later to
                      INHERITED so that a possible rollback will not free the original row's
                      non-updated BLOB entries. This is because the condition that checks for
                      that is in :
                      
                      	if (node->upd_ext) {}.
                      
                      node->upd_ext is non-NULL only if a BLOB column was updated and that column
                      is part of some key ordering (see row_upd_replace()). This results in the
                      non-update BLOB columns being deleted during a rollback and subsequently by
                      purge again.
                      
                      rb://413
                    ------------------------------------------------------------
                    revno: 2555.776.105
                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Wed 2010-08-04 03:37:44 -0700
                    message:
                      Fix bug #54678, InnoDB, TRUNCATE, ALTER, I_S SELECT, crash or deadlock
                      
                      rb://399 approved by Sunny Bains
                    ------------------------------------------------------------
                    revno: 2555.776.104
                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Wed 2010-08-04 03:11:33 -0700
                    message:
                      Fix Bug #54582 stack overflow when opening many tables linked with
                      foreign keys at once
                      
                      rb://391 approved by Heikki
                      Z
                    ------------------------------------------------------------
                    revno: 2555.776.103
                    author: karen.langford@oracle.com
                    committer: MySQL Build Team <build@mysql.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-08-03 18:57:39 +0200
                    message:
                      Raise version number after cloning 5.1.50
                    ------------------------------------------------------------
                    revno: 2555.776.102 [merge]
                    tags: clone-5.1.50-build, mysql-5.1.50
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-08-03 12:52:02 +0100
                    message:
                      auto-merge mysql-5.1-security (local) --> mysql-5.1-security
                        ------------------------------------------------------------
                        revno: 2555.830.1
                        committer: Alfranio Correia <alfranio.correia@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Mon 2010-08-02 20:48:56 +0100
                        message:
                          BUG#55625 RBR breaks on failing 'CREATE TABLE'
                          
                          A CREATE...SELECT that fails is written to the binary log if a non-transactional
                          statement is updated. If the logging format is ROW, the CREATE statement and the
                          changes are written to the binary log as distinct events and by consequence the
                          created table is not rolled back in the slave.
                          
                          In this patch, we opted to let the slave goes out of sync by not writting to the
                          binary log the CREATE statement. We do this by simply reseting the binary log's
                          cache.
                    ------------------------------------------------------------
                    revno: 2555.776.101 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Mon 2010-08-02 11:03:41 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3992.20 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-security
                        timestamp: Mon 2010-08-02 10:45:43 +0300
                        message:
                          merge
                    ------------------------------------------------------------
                    revno: 2555.776.100 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Mon 2010-08-02 10:50:15 +0300
                    message:
                      merge mysql-5.1-bugteam into mysql-5.1-security
                        ------------------------------------------------------------
                        revno: 2555.827.17
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: 42733-5.1
                        timestamp: Fri 2010-07-30 17:33:10 -0300
                        message:
                          Bug#45288: pb2 returns a lot of compilation warnings on linux
                          
                          Fix compiler warnings.
                        ------------------------------------------------------------
                        revno: 2555.827.16 [merge]
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam-push
                        timestamp: Fri 2010-07-30 15:32:28 +0100
                        message:
                          Automerge mysql-5.1-bugteam into mysql-5.1-bugteam latest.
                            ------------------------------------------------------------
                            revno: 2555.829.1
                            committer: Luis Soares <luis.soares@sun.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Fri 2010-07-30 14:44:39 +0100
                            message:
                              Revert patch for BUG#34283. Causing lots of test failures in PB2,
                              mostly because existing test result files were not updated.
                        ------------------------------------------------------------
                        revno: 2555.827.15
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B55188-5.1-bugteam
                        timestamp: Fri 2010-07-30 17:09:24 +0300
                        message:
                          Disable the tests failing under valgrind because of bug #55503
                        ------------------------------------------------------------
                        revno: 2555.827.14
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B55188-5.1-bugteam
                        timestamp: Fri 2010-07-30 16:35:06 +0300
                        message:
                          Bug #55188: GROUP BY, GROUP_CONCAT and TEXT - inconsistent results
                          
                          In order to be able to check if the set of the grouping fields in a 
                          GROUP BY has changed (and thus to start a new group) the optimizer
                          caches the current values of these fields in a set of Cached_item 
                          derived objects.
                          The Cached_item_str, used for caching varchar and TEXT columns,
                          is limited in length by the max_sort_length variable.
                          A String buffer to store the value with an alloced length of either
                          the max length of the string or the value of max_sort_length 
                          (whichever is smaller) in Cached_item_str's constructor.
                          Then, at compare time the value of the string to compare to was 
                          truncated to the alloced length of the string buffer inside 
                          Cached_item_str.
                          This is all fine and valid, but only if you're not assigning 
                          values near or equal to the alloced length of this buffer.
                          Because when assigning values like this the alloced length is 
                          rounded up and as a result the next set of data will not match the
                          group buffer, thus leading to wrong results because of the changed
                          alloced_length.
                          Fixed by preserving the original maximum length in the 
                          Cached_item_str's constructor and using this instead of the 
                          alloced_length to limit the string to compare to.
                          Test case added.
                        ------------------------------------------------------------
                        revno: 2555.827.13 [merge]
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-30 09:38:18 -0300
                        message:
                          Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
                            ------------------------------------------------------------
                            revno: 1810.3997.4
                            committer: Davi Arnaut <davi.arnaut@oracle.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Fri 2010-07-30 09:34:40 -0300
                            message:
                              Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
                              
                              Fix a regression (due to a typo) which caused spurious incorrect
                              argument errors for long data stream parameters if all forms of
                              logging were disabled (binary, general and slow logs).
                        ------------------------------------------------------------
                        revno: 2555.827.12
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-30 09:17:10 -0300
                        message:
                          Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
                          
                          Fix a regression (due to a typo) which caused spurious incorrect
                          argument errors for long data stream parameters if all forms of
                          logging were disabled (binary, general and slow logs).
                        ------------------------------------------------------------
                        revno: 2555.827.11
                        committer: <Dao-Gang.Qu@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-30 11:59:34 +0800
                        message:
                          Bug #34283  mysqlbinlog leaves tmpfile after termination if binlog contains load data infile
                          
                          With statement- or mixed-mode logging, "LOAD DATA INFILE" queries
                          are written to the binlog using special types of log events.
                          When mysqlbinlog reads such events, it re-creates the file in a
                          temporary directory with a generated filename and outputs a
                          "LOAD DATA INFILE" query where the filename is replaced by the
                          generated file. The temporary file is not deleted by mysqlbinlog
                          after termination.
                          
                          To fix the problem, in mixed mode we go to row-based. In SBR, we
                          document it to remind user the tmpfile is left in a temporary
                          directory.
                        ------------------------------------------------------------
                        revno: 2555.827.10
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: 53463-5.1
                        timestamp: Wed 2010-07-28 12:59:19 -0300
                        message:
                          Bug#53463: YaSSL patch appears to be reverted
                          
                          The problem is that the fix Bug#29784 was mistakenly
                          reverted when updating YaSSL to a newer version.
                          
                          The solution is to re-apply the fix and this time
                          actually add a meaningful test case so that possible
                          regressions are caught.
                        ------------------------------------------------------------
                        revno: 2555.827.9 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-07-29 11:57:33 +0300
                        message:
                          Merge mysql-5.1-innodb -> mysql-5.1-bugteam
                            ------------------------------------------------------------
                            revno: 2555.738.178 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-07-29 11:51:00 +0300
                            message:
                              Merge mysql-5.1-bugteam -> mysql-5.1-innodb
                            ------------------------------------------------------------
                            revno: 2555.738.177
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-07-28 03:20:44 -0700
                            message:
                              Fix bug #55581 by backporting fix of #52546 from mysql-trunk-innodb
                              to mysql-5.1-innodb plugin.
                            ------------------------------------------------------------
                            revno: 2555.738.176
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Fri 2010-07-23 19:32:38 +0300
                            message:
                              Increment InnoDB Plugin version to 1.0.11.
                              InnoDB Plugin 1.0.10 has been released with MySQL 5.1.49.
                            ------------------------------------------------------------
                            revno: 2555.738.175 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Fri 2010-07-23 12:51:14 +0300
                            message:
                              Merge mysql-5.1 -> mysql-5.1-innodb
                            ------------------------------------------------------------
                            revno: 2555.738.174 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Fri 2010-07-09 15:15:09 +0300
                            message:
                              Merge mysql-5.1 -> mysql-5.1-innodb
                              (no changes introduced by this merge)
                            ------------------------------------------------------------
                            revno: 2555.738.173
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-07-07 20:51:30 +0300
                            message:
                              Add the innodb_plugin tests to "make dist".
                            ------------------------------------------------------------
                            revno: 2555.738.172
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Mon 2010-07-05 19:26:38 -0700
                            message:
                              Add innodb_bug53756-master.opt for innodb_bug53756 test.
                            ------------------------------------------------------------
                            revno: 2555.738.171
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-06-30 22:06:01 -0700
                            message:
                              Port fix for bug #54311 from mysql-trunk-innodb to mysql-5.1-innodb codeline.
                              Bug #54311: Crash on CHECK PARTITION after concurrent LOAD DATA
                              and adaptive_hash_index=OFF
                            ------------------------------------------------------------
                            revno: 2555.738.170
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-06-30 12:38:47 +0300
                            message:
                              Bug#54358 follow-up: Correct some error handling.
                            ------------------------------------------------------------
                            revno: 2555.738.169
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-06-30 12:31:49 +0300
                            message:
                              Correct some comments that were added in the fix of Bug #54358
                              (READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).
                              
                              Records that lack incompletely written externally stored columns may
                              be accessed by READ UNCOMMITTED transaction even without involving a
                              crash during an INSERT or UPDATE operation. I verified this as follows.
                              
                              (1) added a delay after the mini-transaction for writing the clustered
                              index 'stub' record was committed (patch attached)
                              (2) started mysqld in gdb, setting breakpoints to the where the
                              assertions about READ UNCOMMITTED were added in the bug fix
                              (3) invoked ibtest3 --create-options=key_block_size=2
                              to create BLOBs in a COMPRESSED table
                              (4) invoked the following:
                              yes 'set transaction isolation level read uncommitted;
                              checksum table blobt3;select sleep(1);'|mysql -uroot test
                              (5) noted that one of the breakpoints was triggered
                              (return(NULL) in btr_rec_copy_externally_stored_field())
                              
                              === modified file 'storage/innodb_plugin/row/row0ins.c'
                              --- storage/innodb_plugin/row/row0ins.c	2010-06-30 08:17:25 +0000
                              +++ storage/innodb_plugin/row/row0ins.c	2010-06-30 08:17:25 +0000
                              @@ -2120,6 +2120,7 @@ function_exit:
                               		rec_t*	rec;
                               		ulint*	offsets;
                               		mtr_start(&mtr);
                              +		os_thread_sleep(5000000);
                               
                               		btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
                               					    BTR_MODIFY_TREE, &cursor, 0,
                              
                              === modified file 'storage/innodb_plugin/row/row0upd.c'
                              --- storage/innodb_plugin/row/row0upd.c	2010-06-30 08:11:55 +0000
                              +++ storage/innodb_plugin/row/row0upd.c	2010-06-30 08:11:55 +0000
                              @@ -1763,6 +1763,7 @@ row_upd_clust_rec(
                               		rec_offs_init(offsets_);
                               
                               		mtr_start(mtr);
                              +		os_thread_sleep(5000000);
                               
                               		ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
                               		rec = btr_cur_get_rec(btr_cur);
                            ------------------------------------------------------------
                            revno: 2555.738.168
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-29 16:12:19 +0300
                            message:
                              ChangeLog entry for Bug #54408
                            ------------------------------------------------------------
                            revno: 2555.738.167
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-29 16:00:58 +0300
                            message:
                              Bug#54408: txn rollback after recovery: row0umod.c:673
                              dict_table_get_format(index->table)
                              
                              The REDUNDANT and COMPACT formats store a local 768-byte prefix of
                              each externally stored column. No row_ext cache is needed, but we
                              initialized one nevertheless. When the BLOB pointer was zero, we would
                              ignore the locally stored prefix as well. This triggered an assertion
                              failure in row_undo_mod_upd_exist_sec().
                              
                              row_build(): Allow ext==NULL when a REDUNDANT or COMPACT table
                              contains externally stored columns.
                              
                              row_undo_search_clust_to_pcur(), row_upd_store_row(): Invoke
                              row_build() with ext==NULL on REDUNDANT and COMPACT tables.
                              
                              rb://382 approved by Jimmy Yang
                            ------------------------------------------------------------
                            revno: 2555.738.166
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-29 15:56:53 +0300
                            message:
                              ChangeLog entry for Bug #54358
                            ------------------------------------------------------------
                            revno: 2555.738.165
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-29 15:55:18 +0300
                            message:
                              Bug#54358: READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED
                              columns
                              
                              When the server crashes after a record stub has been inserted and
                              before all its off-page columns have been written, the record will
                              contain incomplete off-page columns after crash recovery. Such records
                              may only be accessed at the READ UNCOMMITTED isolation level or when
                              rolling back a recovered transaction in recv_recovery_rollback_active().
                              Skip these records at the READ UNCOMMITTED isolation level.
                              
                              TODO: Add assertions for checking the above assumptions hold when an
                              incomplete BLOB is encountered.
                              
                              btr_rec_copy_externally_stored_field(): Return NULL if the field is
                              incomplete.
                              
                              row_prebuilt_t::templ_contains_blob: Clarify what "BLOB" means in this
                              context. Hint: MySQL BLOBs are not the same as InnoDB BLOBs.
                              
                              row_sel_store_mysql_rec(): Return FALSE if not all columns could be
                              retrieved. Previously this function always returned TRUE.  Assert that
                              the record is not delete-marked.
                              
                              row_sel_push_cache_row_for_mysql(): Return FALSE if not all columns
                              could be retrieved.
                              
                              row_search_for_mysql(): Skip records containing incomplete off-page
                              columns. Assert that the transaction isolation level is READ
                              UNCOMMITTED.
                              
                              rb://380 approved by Jimmy Yang
                            ------------------------------------------------------------
                            revno: 2555.738.164
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Mon 2010-06-28 19:41:37 -0700
                            message:
                              Check in fix for bug #53756: "ALTER TABLE ADD PRIMARY KEY affects
                              crash recovery"
                              
                              rb://369 approved by Marko
                        ------------------------------------------------------------
                        revno: 2555.827.8
                        committer: Alexander Barkov <bar@mysql.com>
                        branch nick: mysql-5.1-bugteam.b45012
                        timestamp: Thu 2010-07-29 10:12:44 +0400
                        message:
                          Postfix for BUG#45012.
                          
                          Problem: The original patch didn't compile on debug_werror
                          due to wrong format in printf("%d") for size_t variables.
                          
                          Fix: Adding cast to (int).
                        ------------------------------------------------------------
                        revno: 2555.827.7
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-07-29 11:00:57 +0800
                        message:
                          BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave
                          
                          /*![:version:] Query Code */, where [:version:] is a sequence of 5 
                          digits representing the mysql server version(e.g /*!50200 ... */),
                          is a special comment that the query in it can be executed on those 
                          servers whose versions are larger than the version appearing in the 
                          comment. It leads to a security issue when slave's version is larger 
                          than master's. A malicious user can improve his privileges on slaves. 
                          Because slave SQL thread is running with SUPER privileges, so it can
                          execute queries that he/she does not have privileges on master.
                          
                          This bug is fixed with the logic below: 
                          - To replace '!' with ' ' in the magic comments which are not applied on
                            master. So they become common comments and will not be applied on slave.
                          
                          - Example:
                            'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /*!99999 ,(3)*/
                            will be binlogged as
                            'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /* 99999 ,(3)*/
                        ------------------------------------------------------------
                        revno: 2555.827.6
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-23 21:55:03 -0300
                        message:
                          Bug#55501: Disable innodb plugin usage in the embedded server on certain OSes
                          
                          Do not attempt to test the innodb plugin with the embedded server,
                          it's not supported for now.
                        ------------------------------------------------------------
                        revno: 2555.827.5 [merge]
                        committer: Sven Sandberg <sven.sandberg@oracle.com>
                        branch nick: 5.1-bugteam
                        timestamp: Mon 2010-07-26 11:56:30 +0200
                        message:
                          merged BUG#55322 to 5.1-bugteam
                            ------------------------------------------------------------
                            revno: 2555.814.4
                            committer: Sven Sandberg <sven.sandberg@oracle.com>
                            branch nick: 5.1
                            timestamp: Tue 2010-07-20 17:27:13 +0200
                            message:
                              BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET
                              
                              Problem: when SHOW BINLOG EVENTS was issued, it increased the value of
                              @@session.max_allowed_packet. This allowed a non-root user to increase
                              the amount of memory used by her thread arbitrarily. Thus, it removes
                              the bound on the amount of system resources used by a client, so it
                              presents a security risk (DoS attack).
                              
                              Fix: it is correct to increase the value of @@session.max_allowed_packet
                              while executing SHOW BINLOG EVENTS (see BUG 30435). However, the
                              increase should only be temporary. Thus, the fix is to restore the value
                              when SHOW BINLOG EVENTS ends.
                              The value of @@session.max_allowed_packet is also increased in
                              mysql_binlog_send (i.e., the binlog dump thread). It is not clear if this
                              can cause any trouble, since normally the client that issues
                              COM_BINLOG_DUMP will not issue any other commands that would be affected
                              by the increased value of @@session.max_allowed_packet. However, we
                              restore the value just in case.
                        ------------------------------------------------------------
                        revno: 2555.827.4
                        committer: Alexander Barkov <bar@mysql.com>
                        branch nick: mysql-5.1-bugteam.b45012
                        timestamp: Mon 2010-07-26 09:06:18 +0400
                        message:
                          Bug#45012 my_like_range_cp932 generates invalid string
                          
                          Problem: The functions my_like_range_xxx() returned
                          badly formed maximum strings for Asian character sets,
                          which made problems for storage engines.
                          
                          Fix: 
                          - Removed a number my_like_range_xxx() implementations,
                            which were in fact dumplicate code pieces.
                          - Using generic my_like_range_mb() instead.
                          - Setting max_sort_char member properly for Asian character sets
                          - Adding unittest/strings/strings-t.c, 
                            to test that my_like_range_xxx() return well-formed 
                            min and max strings.
                          
                          Notes:
                          
                          - No additional tests in mysql/t/ available.
                            Old tests cover the affected code well enough.
                        ------------------------------------------------------------
                        revno: 2555.827.3 [merge]
                        committer: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
                        branch nick: 5.1-bugteam-bug42496
                        timestamp: Fri 2010-07-23 18:15:56 +0700
                        message:
                          Merge 5.1-bugteam -> 5.1-bug-42496
                            ------------------------------------------------------------
                            revno: 2555.828.2 [merge]
                            committer: kevin.lewis@oracle.com
                            branch nick: mysql-5.1-bugteam
                            timestamp: Thu 2010-07-22 11:17:26 -0500
                            message:
                              Merge
                            ------------------------------------------------------------
                            revno: 2555.828.1
                            committer: kevin.lewis@oracle.com
                            branch nick: mysql-5.1-bugteam
                            timestamp: Thu 2010-07-22 11:15:15 -0500
                            message:
                              Bug#49542 - Do as the comment suggests and downgrade directory errors from find_file() to a warning unless they happen during a SHOW command.
                        ------------------------------------------------------------
                        revno: 2555.827.2
                        committer: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
                        branch nick: 5.1-bugteam-bug42496
                        timestamp: Wed 2010-07-21 14:56:43 +0700
                        message:
                          Fixed bug #42496 - the server could crash on a debug assert after a failure
                          to write into a closed socket
                        ------------------------------------------------------------
                        revno: 2555.827.1
                        committer: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
                        branch nick: 5.1-bugteam-bug51855
                        timestamp: Tue 2010-06-29 16:32:03 +0700
                        message:
                          Fixed bug #51855. Race condition in XA START. If several threads
                          concurrently execute the statement XA START 'x', then mysqld
                          server could crash.
                    ------------------------------------------------------------
                    revno: 2555.776.99
                    committer: Gleb Shchepa <gshchepa@mysql.com>
                    branch nick: mysql-5.1-security
                    timestamp: Sun 2010-08-01 22:12:36 +0400
                    message:
                      Bug #54461: crash with longblob and union or update with subquery
                      
                      Queries may crash, if
                        1) the GREATEST or the LEAST function has a mixed list of
                           numeric and LONGBLOB arguments and
                        2) the result of such a function goes through an intermediate
                           temporary table.
                      
                      An Item that references a LONGBLOB field has max_length of
                      UINT_MAX32 == (2^32 - 1).
                      
                      The current implementation of GREATEST/LEAST returns REAL
                      result for a mixed list of numeric and string arguments (that
                      contradicts with the current documentation, this contradiction
                      was discussed and it was decided to update the documentation).
                      
                      The max_length of such a function call was calculated as a
                      maximum of argument max_length values (i.e. UINT_MAX32).
                      
                      That max_length value of UINT_MAX32 was used as a length for
                      the intermediate temporary table Field_double to hold
                      GREATEST/LEAST function result.
                      
                      The Field_double::val_str() method call on that field
                      allocates a String value.
                      
                      Since an allocation of String reserves an additional byte
                      for a zero-termination, the size of String buffer was
                      set to (UINT_MAX32 + 1), that caused an integer overflow:
                      actually, an empty buffer of size 0 was allocated.
                      
                      An initialization of the "first" byte of that zero-size
                      buffer with '\0' caused a crash.
                      
                      The Item_func_min_max::fix_length_and_dec() has been
                      modified to calculate max_length for the REAL result like
                      we do it for arithmetical operators.
                      
                      
                      ******
                      Bug #54461: crash with longblob and union or update with subquery
                      
                      Queries may crash, if
                        1) the GREATEST or the LEAST function has a mixed list of
                           numeric and LONGBLOB arguments and
                        2) the result of such a function goes through an intermediate
                           temporary table.
                      
                      An Item that references a LONGBLOB field has max_length of
                      UINT_MAX32 == (2^32 - 1).
                      
                      The current implementation of GREATEST/LEAST returns REAL
                      result for a mixed list of numeric and string arguments (that
                      contradicts with the current documentation, this contradiction
                      was discussed and it was decided to update the documentation).
                      
                      The max_length of such a function call was calculated as a
                      maximum of argument max_length values (i.e. UINT_MAX32).
                      
                      That max_length value of UINT_MAX32 was used as a length for
                      the intermediate temporary table Field_double to hold
                      GREATEST/LEAST function result.
                      
                      The Field_double::val_str() method call on that field
                      allocates a String value.
                      
                      Since an allocation of String reserves an additional byte
                      for a zero-termination, the size of String buffer was
                      set to (UINT_MAX32 + 1), that caused an integer overflow:
                      actually, an empty buffer of size 0 was allocated.
                      
                      An initialization of the "first" byte of that zero-size
                      buffer with '\0' caused a crash.
                      
                      The Item_func_min_max::fix_length_and_dec() has been
                      modified to calculate max_length for the REAL result like
                      we do it for arithmetical operators.
                    ------------------------------------------------------------
                    revno: 2555.776.98
                    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                    branch nick: mysql-5.1-security
                    timestamp: Fri 2010-07-23 15:52:54 +0400
                    message:
                      Bug #54476: crash when group_concat and 'with rollup' in
                                           prepared statements
                      
                      Using GROUP_CONCAT() together with the WITH ROLLUP modifier
                      could crash the server.
                      
                      The reason was a combination of several facts:
                      
                      1. The Item_func_group_concat class stores pointers to ORDER
                      objects representing the columns in the ORDER BY clause of
                      GROUP_CONCAT().
                      
                      2. find_order_in_list() called from
                      Item_func_group_concat::setup() modifies the ORDER objects so
                      that their 'item' member points to the arguments list
                      allocated in the Item_func_group_concat constructor.
                      
                      3. In some cases (e.g. in JOIN::rollup_make_fields) a copy of
                      the original Item_func_group_concat object could be created by
                      using the Item_func_group_concat::Item_func_group_concat(THD
                      *thd, Item_func_group_concat *item) copy constructor. The
                      latter essentially creates a shallow copy of the source
                      object. Memory for the arguments array is allocated on
                      thd->mem_root, but the pointers for arguments and ORDER are
                      copied verbatim.
                      
                      What happens in the test case is that when executing the query
                      for the first time, after a copy of the original
                      Item_func_group_concat object has been created by
                      JOIN::rollup_make_fields(), find_order_in_list() is called for
                      this new object. It then resolves ORDER BY by modifying the
                      ORDER objects so that they point to elements of the arguments
                      array which is local to the cloned object. When thd->mem_root
                      is freed upon completing the execution, pointers in the ORDER
                      objects become invalid. Those ORDER objects, however, are also
                      shared with the original Item_func_group_concat object which is
                      preserved between executions of a prepared statement. So the
                      first call to find_order_in_list() for the original object on
                      the second execution tries to dereference an invalid pointer.
                      
                      The solution is to create copies of the ORDER objects when
                      copying Item_func_group_concat to not leave any stale pointers
                      in other instances with different lifecycles.
                    ------------------------------------------------------------
                    revno: 2555.776.97 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Wed 2010-07-21 18:56:48 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3992.19 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-security
                        timestamp: Wed 2010-07-21 18:49:24 +0300
                        message:
                          merge
                    ------------------------------------------------------------
                    revno: 2555.776.96 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Wed 2010-07-21 18:54:11 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.823.42 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.1-bugteam
                        timestamp: Wed 2010-07-21 18:36:10 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3997.3 [merge]
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: merge-5.0-bugteam
                            timestamp: Wed 2010-07-21 18:31:28 +0300
                            message:
                              merge
                        ------------------------------------------------------------
                        revno: 2555.823.41 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.1-bugteam
                        timestamp: Wed 2010-07-21 18:34:20 +0300
                        message:
                          merge
                        ------------------------------------------------------------
                        revno: 2555.823.40
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Wed 2010-07-21 18:05:57 +0300
                        message:
                          Addendum #4 to bug #53095
                          
                          SHOW DATABASES LIKE ... was not converting to lowercase on comparison as the
                          documentation is suggesting. 
                          Fixed it to behave similarly to SHOW TABLES LIKE ... and updated the failing
                          on MacOSX lowercase_table2 test case.
                        ------------------------------------------------------------
                        revno: 2555.823.39 [merge]
                        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-07-21 14:14:11 +0400
                        message:
                          Automerge.
                            ------------------------------------------------------------
                            revno: 2555.826.1
                            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                            branch nick: 55061-5.1-bugteam
                            timestamp: Mon 2010-07-12 18:58:55 +0400
                            message:
                              Bug#55061: Build failing on sol 8 x86 - assembler code vs 
                                         compiler problem
                              
                              GCC-style inline assembly is not supported by the Sun Studio
                              compilers prior to version 12.
                              
                              Added a check for the Sun Studio version to avoid using 
                              _FPU_GETCW() / _FPU_SETCW() when inline assembly is
                               unsupported. This can lead to some differences in floating
                              point calculations on Solaris 8/x86 which, however, is not worth
                              bothering with Sun-style assembly .il templates.
                        ------------------------------------------------------------
                        revno: 2555.823.38
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: 45288-5.1
                        timestamp: Tue 2010-07-20 15:07:36 -0300
                        message:
                          Bug#45288: pb2 returns a lot of compilation warnings on linux
                          
                          Fix warnings flagged by the new warning option -Wunused-but-set-variable
                          that was added to GCC 4.6 and that is enabled by -Wunused and -Wall. The
                          option causes a warning whenever a local variable is assigned to but is
                          later unused. It also warns about meaningless pointer dereferences.
                        ------------------------------------------------------------
                        revno: 2555.823.37
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: 52514-5.1
                        timestamp: Tue 2010-07-20 14:44:29 -0300
                        message:
                          Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
                                     due to GCC preprocessor change
                                
                          The problem is that newer GCC versions treats missing headers
                          as fatal errors. The solution is to use a guard macro to prevent
                          the inclusion of system headers when checking the ABI with the
                          C Preprocessor.
                          
                          Reference: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=15638
                                     http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44836
                        ------------------------------------------------------------
                        revno: 2555.823.36
                        committer: Davi Arnaut <davi.arnaut@oracle.com>
                        branch nick: 54453-5.1
                        timestamp: Tue 2010-07-20 14:36:15 -0300
                        message:
                          Bug#54453: Failing assertion: trx->active_trans when renaming a
                                     table with active trx
                          
                          Essentially, the problem is that InnoDB does a implicit commit
                          when a cursor (table handler) is unlocked/closed, creating
                          a dissonance between the transaction state within the server
                          layer and the storage engine layer. Theoretically, a statement
                          transaction can encompass several table instances in a similar
                          manner to a multiple statement transaction, hence it does not
                          make sense to limit a statement transaction to the lifetime of
                          the table instances (cursors) used within it.
                          
                          Since this particular instance of the problem is only triggerable
                          on 5.1 and is masked on 5.5 due 2PC being skipped (assertion is in
                          the prepare phase of a 2PC), the solution (which is less risky) is
                          to explicitly end the transaction before the cached table is unlock
                          on rename table.
                          
                          The patch is to be null merged into trunk.
                        ------------------------------------------------------------
                        revno: 2555.823.35 [merge]
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Mon 2010-07-19 15:34:28 -0300
                        message:
                          Merge of mysql-5.1 into mysql-5.1-bugteam.
                        ------------------------------------------------------------
                        revno: 2555.823.34
                        committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
                        branch nick: mysql-5.1-bugteam-bug54734
                        timestamp: Mon 2010-07-19 11:03:52 +0200
                        message:
                          Bug #54734 assert in Diagnostics_area::set_ok_status
                          
                          This assert checks that the server does not try to send OK to the
                          client if there has been some error during processing. This is done
                          to make sure that the error is in fact sent to the client.
                          
                          The problem was that view errors during processing of WHERE conditions
                          in UPDATE statements where not detected by the update code. It therefore
                          tried to send OK to the client, triggering the assert.
                          The bug was only noticeable in debug builds.
                          
                          This patch fixes the problem by making sure that the update code
                          checks for errors during condition processing and acts accordingly.
                        ------------------------------------------------------------
                        revno: 2555.823.33
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-16 14:33:35 -0300
                        message:
                          Bug#48327: Some crashes specific to FreeBSD ("embedded")
                          Bug#47139: Test "merge" crashes in "embedded" run
                          
                          Backport patch for Bug#47139
                        ------------------------------------------------------------
                        revno: 2555.823.32
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Fri 2010-07-16 16:56:33 +0300
                        message:
                          Addendum to bug #53814 : test results updates
                        ------------------------------------------------------------
                        revno: 2555.823.31
                        committer: Ramil Kalimullin <ramil@mysql.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-16 11:15:22 +0400
                        message:
                          Fix for bug #50667: The InnoDB plugin prevents initialization
                          of the "embedded" server
                          
                          Problem: mysqltest_embedded failed to load ha_innodb_plugin library
                          on some platforms (due to some unresolved references).
                          
                          Fix: on FreeBSD use -export-dynamic flag building mysqltest_embedded.
                          That allows to use its global symbols to resolve references in the
                          dynamically loaded plugin library.
                        ------------------------------------------------------------
                        revno: 2555.823.30
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B53814-5.1-bugteam
                        timestamp: Wed 2010-06-23 19:25:31 +0300
                        message:
                          Bug #53814: NUMERIC_PRECISION for unsigned bigint field is 19, 
                          should be 20
                          
                          Fixed the numeric precision of the unsigned BIGINT column to 
                          be 20 instead of 19.
                        ------------------------------------------------------------
                        revno: 2555.823.29 [merge]
                        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-07-15 17:01:44 +0400
                        message:
                          Manual merge.
                            ------------------------------------------------------------
                            revno: 1810.3997.2
                            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Thu 2010-07-15 10:10:16 +0400
                            message:
                              Backport of the fix for bug#25421 to 5.0.
                              
                              Calculating the estimated number of records for a range scan
                              may take a significant time, and it was impossible for a user
                              to interrupt that process by killing the connection or the
                              query.
                              
                              Fixed by checking the thread's 'killed' status in
                              check_quick_keys() and interrupting the calculation process if
                              it is set to a non-zero value.
                        ------------------------------------------------------------
                        revno: 2555.823.28 [merge]
                        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-07-15 16:39:48 +0400
                        message:
                          Null merge.
                            ------------------------------------------------------------
                            revno: 1810.3997.1
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Wed 2010-07-07 20:13:53 +0300
                            message:
                              Merge the fix for Bug#49238 from SVN
                              (without the unrelated whitespace changes):
                              
                                ------------------------------------------------------------------------
                                r7009 | jyang | 2010-04-29 20:44:56 +0300 (Thu, 29 Apr 2010) | 6 lines
                                
                                branches/5.0: Port fix for bug #49238 (Creating/Dropping a temporary
                                table while at 1023 transactions will cause assert) from 5.1 to
                                branches/5.1. Separate action for return value DB_TOO_MANY_CONCURRENT_TRXS
                                from that of DB_MUST_GET_MORE_FILE_SPACE in row_drop_table_for_mysql().
                                
                                
                                ------------------------------------------------------------------------
                        ------------------------------------------------------------
                        revno: 2555.823.27
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-07-14 16:39:40 -0300
                        message:
                          Bug#42733: Type-punning warnings when compiling MySQL --
                                     strict aliasing violations.
                          
                          Post-merge fix: include my_compiler.h before my_attribute.h
                          as the latter will undef __attribute__ if the compiler is not
                          GCC. Based on the compiler version, in my_compiler.h we know
                          for sure whether the aligned attribute is supported. Furthermore,
                          undefining attribute might cause bugs if some system header
                          uses it.
                        ------------------------------------------------------------
                        revno: 2555.823.26
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 42733-5.1
                        timestamp: Wed 2010-07-14 09:27:13 -0300
                        message:
                          Bug#42733: Type-punning warnings when compiling MySQL --
                                     strict aliasing violations.
                          
                          Another rather noisy violation of strict aliasing rules
                          is the spatial code which makes use of stack-based memory
                          (of type Geometry_buffer) to provide placement for Geometry
                          objects. Although a placement new is allowed to dynamically
                          change the type of a object, the object returned by the
                          new placement was being ignored and the original stack-based
                          object was being casted to the new type, thus violating strict
                          aliasing rules.
                          
                          The solution is to reorganize the code so that the object
                          returned by the new placement is used instead of casting the
                          original object. Also, to ensure that the stack-based object
                          is properly aligned with respect to the objects it provides
                          placement for, a set of compiler-dependent macros and types
                          are introduced so that the alignment of objects can be inquired
                          and specified.
                        ------------------------------------------------------------
                        revno: 2555.823.25
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 48327-5.1
                        timestamp: Wed 2010-07-14 10:10:12 -0300
                        message:
                          Bug#48327: Some crashes specific to FreeBSD ("embedded")
                          
                          Backport fixes from ndb: Rework the constructors of some static
                          object's to not call dbug functions since the constructors will
                          be called before main, and consequently, before the dbug library
                          is initialized.
                        ------------------------------------------------------------
                        revno: 2555.823.24
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B51876-5.1-bugteam
                        timestamp: Wed 2010-07-14 14:54:51 +0300
                        message:
                          Bug #51876: crash/memory underrun when loading data with ucs2
                          and reverse() function
                                
                          3 problems fixed : 
                          1. The reported problem : caused by incorrect parsing of 
                          the file as ucs data resulting in wrong length of the parsed
                          string. Fixed by truncating the invalid trailing bytes 
                          (non-complete multibyte characters) when reading from the file
                          2. LOAD DATA when reading from a proper UCS2 file wasn't 
                          recognizing the new line characters. Fixed by first looking 
                          if a byte is a new line (or any other special) character before
                          reading it as a part of a multibyte character.
                          3. When using user variables to hold the column data in LOAD
                          DATA the character set of the user variable was set incorrectly
                          to the database charset. Fixed by setting it to the charset
                          specified by LOAD DATA (if any). 
                        ------------------------------------------------------------
                        revno: 2555.823.23
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B53493-5.1-bugteam
                        timestamp: Wed 2010-07-14 11:50:17 +0300
                        message:
                          Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VAR
                          
                          bytes_received/bytes_sent are ulonglong so they cannot be handled by the 
                          ulong handling code in add_to_status/add_diff_to_status().
                          
                          Fixed by adding code to handle these two variables in 
                          add_to_status()/add_diff_to_status() and making sure they are not a subject
                          to the ulong handling code.
                        ------------------------------------------------------------
                        revno: 2555.823.22
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B54004-5.1-bugteam
                        timestamp: Wed 2010-07-14 13:53:49 +0300
                        message:
                          Bug #54004 : mysql_secure_installation identifies "local host" incorrectly
                          
                          The removal of non-local root users is overzealous in
                          mysql_secure_installation. (Bug #54004)
                        ------------------------------------------------------------
                        revno: 2555.823.21
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B52274-5.1-bugteam
                        timestamp: Fri 2010-07-09 14:11:12 +0300
                        message:
                          Bug #52274 : Missing path to mysql in mysql_secure_installation
                                
                          Added some code to try to find the mysql command line in the most 
                          common places and stop if it's not there.
                        ------------------------------------------------------------
                        revno: 2555.823.20
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-09 16:37:52 -0300
                        message:
                          Use UNINIT_VAR workaround instead of LINT_INIT.
                        ------------------------------------------------------------
                        revno: 2555.823.19 [merge]
                        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                        branch nick: topush-51-bugteam
                        timestamp: Fri 2010-07-09 15:00:33 +0200
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.825.1
                            committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                            branch nick: b52517-51-bugteam
                            timestamp: Fri 2010-07-09 13:15:26 +0200
                            message:
                              Bug#52517: Regression in ROW level replication performance with partitions
                              
                              In bug-28430 HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
                              was disabled in the partitioning engine in the first patch,
                              That bug was later fixed a second time, but that flag
                              was not removed.
                              
                              No need to disable this flag, as it leads to bad
                              choise in row replication.
                        ------------------------------------------------------------
                        revno: 2555.823.18 [merge]
                        committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                        branch nick: topush-51-bugteam
                        timestamp: Fri 2010-07-09 14:59:40 +0200
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.824.1
                            committer: Mattias Jonsson <mattias.jonsson@oracle.com>
                            branch nick: b52455-51-bt
                            timestamp: Fri 2010-07-09 01:09:31 +0200
                            message:
                              Bug#52455: Subpar INSERT ON DUPLICATE KEY UPDATE performance with many partitions
                              
                              The handler function for reading one row from a specific index
                              was not optimized in the partitioning handler since it
                              used the default implementation.
                              
                              No test case since it is performance only, verified by hand.
                        ------------------------------------------------------------
                        revno: 2555.823.17
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-09 09:51:21 -0300
                        message:
                          Remove AC_LANG_WERROR, it causes trouble earlier versions
                          of autoconf and is not strictly needed for now.
                        ------------------------------------------------------------
                        revno: 2555.823.16
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Fri 2010-07-09 15:17:47 +0300
                        message:
                          Addendum #2 to bug #53095 : fixed a bad testcase result.
                        ------------------------------------------------------------
                        revno: 2555.823.15
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 53445-5.1
                        timestamp: Fri 2010-07-09 09:00:17 -0300
                        message:
                          Bug#45288: pb2 returns a lot of compilation warnings on linux
                          
                          Although the C standard mandates that sprintf return the number
                          of bytes written, some very ancient systems (i.e. SunOS 4)
                          returned a pointer to the buffer instead. Since these systems
                          are not supported anymore and are hopefully long dead by now,
                          simply remove the portability wrapper that dealt with this
                          discrepancy. The autoconf check was causing trouble with GCC.
                        ------------------------------------------------------------
                        revno: 2555.823.14
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 53445-5.1
                        timestamp: Fri 2010-07-09 08:37:51 -0300
                        message:
                          Bug#53445: Build with -Wall and fix warnings that it generates
                          
                          Introduce a MySQL maintainer/developer mode that enables
                          a set of warning options for the C/C++ compiler. This mode
                          is intended to help improve the overall quality of the code.
                          
                          The warning options are:
                          
                          C_WARNINGS="-Wall -Wextra -Wunused -Wwrite-strings -Werror"
                          CXX_WARNINGS="$C_WARNINGS -Wno-unused-parameter"
                          
                          Since -Wall is essentially a moving target, autoconf checks
                          are not run with warning options enabled, in particualr -Werror.
                          This decision might be revisited in the future. The patch also
                          fixes a mistake in the makefiles, where automake CXXFLAGS would
                          be set to CFLAGS.
                        ------------------------------------------------------------
                        revno: 2555.823.13
                        committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-09 14:39:47 +0400
                        message:
                          Bug#54416 MAX from JOIN with HAVING returning NULL with 5.1 and Empty set
                          The problem there is that HAVING condition evaluates const
                          parts of condition despite the condition has references
                          on aggregate functions. Table t1 became const tables
                          after make_join_statistics and table1.pk = 1, HAVING is
                          transformed into MAX(1) < 7 and taken away from HAVING.
                          The fix is to skip evaluation of HAVING conts parts if
                          HAVING condition has references on aggregate functions.
                        ------------------------------------------------------------
                        revno: 2555.823.12
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-07-08 10:44:26 +0800
                        message:
                          Postfix bug#48321
                          Fix the memory leak
                        ------------------------------------------------------------
                        revno: 2555.823.11
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.1-bugteam
                        timestamp: Wed 2010-07-07 12:15:58 +0300
                        message:
                          Addendum to the fix for bug #53095 (failing information_schema.test on windows)
                          
                          Since the original fix for this bug lowercases the search pattern it's not a 
                          good idea to copy the search pattern to the output instead of the real table 
                          name found (since, depending on the case mode these two names may differ in 
                          case).
                          Fixed the infrmation_schema.test failure by making sure the actual table 
                          name of an inoformation schema table is passed instead of the lookup pattern
                          even when the pattern doesn't contain wildcards.
                        ------------------------------------------------------------
                        revno: 2555.823.10
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-07-06 19:31:54 -0300
                        message:
                          Fix what is probably the result of a bad merge. No functional change.
                        ------------------------------------------------------------
                        revno: 2555.823.9
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 52514-5.1
                        timestamp: Tue 2010-07-06 15:36:31 -0300
                        message:
                          Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5
                                     due to GCC preprocessor change
                          
                          Temporary workaround: disable abi_check if GCC >= 4.5
                        ------------------------------------------------------------
                        revno: 2555.823.8
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 22320-5.1
                        timestamp: Mon 2010-07-05 09:00:39 -0300
                        message:
                          Bug#22320: my_atomic-t unit test fails
                          
                          The atomic operations implementation on 5.1 has a few problems,
                          which might cause tests to abort randomly. Since no code in 5.1
                          uses atomic operations, simply remove the code.
                        ------------------------------------------------------------
                        revno: 2555.823.7
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B53613-5.1-bugteam
                        timestamp: Thu 2010-07-01 12:05:09 +0300
                        message:
                          Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given table
                          
                          Fixed an incomplete historical ALTER TABLE MODIFY trimming the trigger 
                          privilege bit from mysql.tables_priv.Table_priv column.
                          Removed the duplicate ALTER TABLE MODIFY.
                          Test suite added.
                        ------------------------------------------------------------
                        revno: 2555.823.6
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B53095-5.1-bugteam
                        timestamp: Fri 2010-06-25 15:59:44 +0300
                        message:
                          Bug #53095: SELECT column_name FROM INFORMATION_SCHEMA.STATISTICS 
                          returns nothing
                                
                          When looking for table or database names inside INFORMATION_SCHEMA
                          we must convert the table and database names to lowercase (just as it's
                          done in the rest of the server) when lowercase_table_names is non-zero.
                          This will allow us to find the same tables that we would find if there
                          is no condition.
                          
                          Fixed by converting to lower case when extracting the database and 
                          table name conditions.
                          Test case added.
                        ------------------------------------------------------------
                        revno: 2555.823.5
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Sun 2010-07-04 16:17:53 +0800
                        message:
                          Postfix for bug#48321
                          Some test cases set ANSI_QUOTES in sql_mode.
                          So we have to use single quotes to quote literal strings.
                        ------------------------------------------------------------
                        revno: 2555.823.4
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Sun 2010-07-04 12:02:49 +0800
                        message:
                          The following statements support the CURRENT_USER() where a user is needed.
                          DROP USER 
                          RENAME USER CURRENT_USER() ...
                          GRANT ... TO CURRENT_USER()
                          REVOKE ... FROM CURRENT_USER()
                          ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
                          as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
                          executes the log event, 'CURRENT_USER()' is expand to the user of slave 
                          SQL thread, but SQL thread's user name always NULL. This breaks the replication.
                          
                          After this patch, session's user will be written into query log events 
                          if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
                        ------------------------------------------------------------
                        revno: 2555.823.3
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Sat 2010-07-03 10:20:05 -0300
                        message:
                          Fix somewhat bogus GCC warning. Although needless as the base
                          class is mostly empty, initialize the base class explicitly in
                          the copy constructor.
                        ------------------------------------------------------------
                        revno: 2555.823.2
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-07-02 18:42:32 -0300
                        message:
                          Bug#53445: Build with -Wall and fix warnings that it generates
                          
                          If bzero is not available, resort to memset. Also, remove dead
                          bzero.c
                        ------------------------------------------------------------
                        revno: 2555.823.1
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 53445-5.1
                        timestamp: Fri 2010-07-02 15:30:47 -0300
                        message:
                          Bug#53445: Build with -Wall and fix warnings that it generates
                          
                          Apart strict-aliasing warnings, fix the remaining warnings
                          generated by GCC 4.4.4 -Wall and -Wextra flags.
                          
                          One major source of warnings was the in-house function my_bcmp
                          which (unconventionally) took pointers to unsigned characters
                          as the byte sequences to be compared. Since my_bcmp and bcmp
                          are deprecated functions whose only difference with memcmp is
                          the return value, every use of the function is replaced with
                          memcmp as the special return value wasn't actually being used
                          by any caller.
                          
                          There were also various other warnings, mostly due to type
                          mismatches, missing return values, missing prototypes, dead
                          code (unreachable) and ignored return values.
                    ------------------------------------------------------------
                    revno: 2555.776.95 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-security
                    timestamp: Wed 2010-07-21 18:51:36 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.821.5 [merge]
                        committer: Joerg Bruehe <joerg@mysql.com>
                        branch nick: mysql-5.1
                        timestamp: Wed 2010-07-21 12:09:50 +0200
                        message:
                          Merge the version number increase (5.1.49 -> 5.1.50) into the main tree.
                        ------------------------------------------------------------
                        revno: 2555.821.4
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: mysql-5.1
                        timestamp: Mon 2010-07-19 17:47:17 +0300
                        message:
                          fix tree names
                        ------------------------------------------------------------
                        revno: 2555.821.3 [merge]
                        committer: MySQL Build Team <build@mysql.com>
                        branch nick: mysql-5.1.49-release
                        timestamp: Mon 2010-07-19 16:30:34 +0200
                        message:
                          5.1.49 push to mysql-5.1
                            ------------------------------------------------------------
                            revno: 2555.814.3 [merge]
                            author: karen.langford@sun.com
                            committer: sunanda <sunanda.menon@sun.com>
                            branch nick: mysql-5.1
                            timestamp: Thu 2010-07-08 20:46:26 +0200
                            message:
                              Null-merge from mysql-5.1.46sp1-release
                                ------------------------------------------------------------
                                revno: 2555.822.14
                                tags: mysql-5.1.46sp1
                                committer: sunanda <sunanda.menon@sun.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Wed 2010-06-23 12:22:05 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3392.1.1
                                  > revision-id: gshchepa@mysql.com-20100521184732-0jvpzinv0uwyvr2d
                                  > parent: sven.sandberg@sun.com-20100520153801-yyhujm1qqa4eyfn0
                                  > committer: Gleb Shchepa <gshchepa@mysql.com>
                                  > branch nick: 53804-5.1
                                  > timestamp: Fri 2010-05-21 22:47:32 +0400
                                  > message:
                                  >   Bug #53804: serious flaws in the alter database .. upgrade
                                  >               data directory name command
                                  >   
                                  >   The check_db_name function has been modified to validate tails of
                                  >   #mysql50#-prefixed database names for compliance with MySQL 5.0
                                  >   database name encoding rules (the check_table_name function call
                                  >   has been reused).
                                ------------------------------------------------------------
                                revno: 2555.822.13
                                committer: sunanda <sunanda.menon@sun.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Wed 2010-06-23 12:14:23 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3386
                                  > revision-id: sergey.glukhov@sun.com-20100518082821-yajhvbv1ghmlpu1n
                                  > parent: aelkin@mysql.com-20100516170332-x8priwrdjwolc065
                                  > committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                                  > branch nick: mysql-5.1-bugteam
                                  > timestamp: Tue 2010-05-18 13:28:21 +0500
                                  > message:
                                  >   Bug#48729 SELECT ... FROM INFORMATION_SCHEMA.ROUTINES causes memory to grow
                                  >   Analysis showed that in case of accessing I_S table
                                  >   ROUTINES we perform unnecessary allocations
                                  >   with get_field() function for every processed row that
                                  >   in their turn causes significant memory growth.
                                  >   the fix is to avoid use of get_field().
                                ------------------------------------------------------------
                                revno: 2555.822.12
                                committer: sunanda <sunanda.menon@sun.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Wed 2010-06-23 12:03:22 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3367 [merge]
                                  > revision-id: joro@sun.com-20100504140328-srxf3c088j2twnq6
                                  > parent: kristofer.pettersson@sun.com-20100503172109-f9hracq5pqsaomb1
                                  > parent: joro@sun.com-20100503151651-nakknn8amrapmdp7
                                  > committer: Georgi Kodinov <joro@sun.com>
                                  > branch nick: B53371-5.1-bugteam
                                  > timestamp: Tue 2010-05-04 17:03:28 +0300
                                  > message:
                                  >   Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.
                                  >   
                                  >   This is the 5.1 merge and extension of the fix.
                                  >   The server was happily accepting paths in table name in all places a table
                                  >   name is accepted (e.g. a SELECT). This allowed all users that have some 
                                  >   privilege over some database to read all tables in all databases in all
                                  >   mysql server instances that the server file system has access to.
                                  >   Fixed by :
                                  >   1. making sure no path elements are allowed in quoted table name when
                                  >   constructing the path (note that the path symbols are still valid in table names
                                  >   when they're properly escaped by the server).
                                  >   2. checking the #mysql50# prefixed names the same way they're checked for
                                  >   path elements in mysql-5.0.
                                  > ------------------------------------------------------------
                                  > Use --include-merges or -n0 to see merged revisions.
                                ------------------------------------------------------------
                                revno: 2555.822.11
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 22:53:01 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.41.1
                                  > revision-id: alexey.kopytov@sun.com-20100430111048-jdls6ofn4kkmpt09
                                  > parent: sergey.glukhov@sun.com-20100329134249-03wyhzp5k92dzhcb
                                  > committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                                  > branch nick: my51-bug48419
                                  > timestamp: Fri 2010-04-30 15:10:48 +0400
                                  > message:
                                  >   Bug #48419: another explain crash..
                                  >   
                                  >   WHERE predicates containing references to empty tables in a
                                  >   subquery were handled incorrectly by the optimizer when
                                  >   executing EXPLAIN. As a result, the optimizer could try to
                                  >   evaluate such predicates rather than just stop with
                                  >   "Impossible WHERE noticed after reading const tables" as 
                                  >   it would do in a non-subquery case. This led to valgrind 
                                  >   errors and crashes.
                                  >   
                                  >   Fixed the code checking the above condition so that subqueries
                                  >   are not excluded and hence are handled in the same way as top
                                  >   level SELECTs.
                                ------------------------------------------------------------
                                revno: 2555.822.10
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 22:51:35 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 1810.3987.14
                                  > revision-id: davi.arnaut@sun.com-20100429132816-ictyul6d75itek22
                                  > parent: ramil@mysql.com-20100429044232-f0pkyx8fnpszf142
                                  > committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                                  > branch nick: 50974-5.0
                                  > timestamp: Thu 2010-04-29 10:28:16 -0300
                                  > message:
                                  >   Bug#50974: Server keeps receiving big (> max_allowed_packet) packets indefinitely.
                                  >   
                                  >   The server could be tricked to read packets indefinitely if it
                                  >   received a packet larger than the maximum size of one packet.
                                  >   This problem is aggravated by the fact that it can be triggered
                                  >   before authentication.
                                  >   
                                  >   The solution is to no skip big packets for non-authenticated
                                  >   sessions. If a big packet is sent before a session is authen-
                                  >   ticated, a error is returned and the connection is closed.
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3363 [merge]
                                  > revision-id: davi.arnaut@sun.com-20100429231819-i3anwzrdasjmezvt
                                  > parent: davi.arnaut@sun.com-20100401131522-895y8uzvv8ag44gs
                                  > parent: davi.arnaut@sun.com-20100429132816-ictyul6d75itek22
                                  > committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                                  > branch nick: mysql-5.1-bugteam
                                  > timestamp: Thu 2010-04-29 20:18:19 -0300
                                  > message:
                                  >   Manual merge.
                                  > ------------------------------------------------------------
                                  > Use --include-merges or -n0 to see merged revisions.
                                ------------------------------------------------------------
                                revno: 2555.822.9
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 22:34:48 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 1810.3987.13
                                  > revision-id: ramil@mysql.com-20100429044232-f0pkyx8fnpszf142
                                  > parent: alexey.kopytov@sun.com-20100426200600-op06qy98llzpzgl1
                                  > committer: Ramil Kalimullin <ramil@mysql.com>
                                  > branch nick: b53237-5.0-bugteam
                                  > timestamp: Thu 2010-04-29 08:42:32 +0400
                                  > message:
                                  >   Fix for bug #53237: mysql_list_fields/COM_FIELD_LIST stack smashing
                                  >   
                                  >   Problem: "COM_FIELD_LIST is an old command of the MySQL server, before there was real move to only
                                  >   SQL. Seems that the data sent to COM_FIELD_LIST( mysql_list_fields() function) is not
                                  >   checked for sanity. By sending long data for the table a buffer is overflown, which can
                                  >   be used deliberately to include code that harms".
                                  >   
                                  >   Fix: check incoming data length.
                                  
                                  The patch did not apply cleanly:
                                  - Line numbers are completely off, roughly it is 2030 -> 1313
                                  - What is called "pend" in the patch, is "arg_end" in the source.
                                ------------------------------------------------------------
                                revno: 2555.822.8
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 22:09:31 +0200
                                message:
                                  Backport into 5.1.46sp1:
                                  
                                  > revno: 3351.14.56
                                  > committer: Marko Mdkeld <marko.makela@oracle.com>
                                  > branch nick: 5.1-innodb
                                  > timestamp: Mon 2010-04-26 14:08:56 +0300
                                  > message:
                                  >   Add a test case for Bug #52745.
                                ------------------------------------------------------------
                                revno: 2555.822.7
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:59:35 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.14.47
                                  > revision-id: marko.makela@oracle.com-20100421095033-0acvzxb8um8cms0a
                                  > parent: marko.makela@oracle.com-20100421094032-ir4glqk46qvg2ywn
                                  > committer: Marko M?kel? <marko.makela@oracle.com>
                                  > branch nick: 5.1-innodb
                                  > timestamp: Wed 2010-04-21 12:50:33 +0300
                                  > message:
                                  >   dtuple_convert_big_rec(): Store locally any fields whose maximum length
                                  >   is less than 256 bytes. (Bug #52745)
                                  >   Add related comments and debug assertions to the "offsets"
                                  >   functions in rem0rec.c.
                                  >   Approved by Sunny Bains
                                ------------------------------------------------------------
                                revno: 2555.822.6
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:56:18 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.47.2
                                  > revision-id: marko.makela@oracle.com-20100511104910-nim8kgguawpis7zo
                                  > parent: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9
                                  > committer: Marko M?kel? <marko.makela@oracle.com>
                                  > branch nick: mysql-5.1-innodb2
                                  > timestamp: Tue 2010-05-11 13:49:10 +0300
                                  > message:
                                  >   btr_page_split_and_insert(): Add an assertion
                                  >   suggested by Sunny Bains when reviewing Bug #52964.
                                ------------------------------------------------------------
                                revno: 2555.822.5
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:54:41 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.47.1
                                  > revision-id: marko.makela@oracle.com-20100511104500-c6kzd0bg5s42p8e9
                                  > parent: vasil.dimov@oracle.com-20100510132852-cz457uqvj8iiy9mm
                                  > committer: Marko M?kel? <marko.makela@oracle.com>
                                  > branch nick: mysql-5.1-innodb2
                                  > timestamp: Tue 2010-05-11 13:45:00 +0300
                                  > message:
                                  >   Remove a stray expression. Spotted by Sunny Bains.
                                ------------------------------------------------------------
                                revno: 2555.822.4
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:52:43 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.14.74
                                  > revision-id: marko.makela@oracle.com-20100504093128-44v6glupe1dsh0ug
                                  > parent: marko.makela@oracle.com-20100503122859-k73bl51re93o0mt4
                                  > committer: Marko M?kel? <marko.makela@oracle.com>
                                  > branch nick: 5.1-innodb
                                  > timestamp: Tue 2010-05-04 12:31:28 +0300
                                  > message:
                                  >   btr_page_split_and_insert(): Correct the fix of Bug #52964.
                                  >   When split_rec==NULL, choose the correct node pointer key (first_rec).
                                ------------------------------------------------------------
                                revno: 2555.822.3
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:50:47 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3351.14.50
                                  > revision-id: marko.makela@oracle.com-20100421185359-8qaxoa2yyrpzwdd7
                                  > parent: marko.makela@oracle.com-20100421102723-0i80uezbyu0ekj5d
                                  > committer: Marko M?kel? <marko.makela@oracle.com>
                                  > branch nick: 5.1-innodb
                                  > timestamp: Wed 2010-04-21 21:53:59 +0300
                                  > message:
                                  >   btr_page_split_and_insert(): Avoid an infinite loop. (Bug #52964)
                                  >   
                                  >   btr_page_tuple_smaller(): New function, refactored from
                                  >   btr_page_split_and_insert().
                                  >   
                                  >   btr_page_get_split_rec(): Renamed from btr_page_get_sure_split_rec().
                                  >   Note that a NULL return may mean that the tuple is to be inserted into
                                  >   either the lower or upper page, to be determined by btr_page_tuple_smaller().
                                  >   
                                  >   btr_page_split_and_insert(): When btr_page_get_split_rec() returns NULL,
                                  >   invoke btr_page_tuple_smaller() to determine which half-page the tuple
                                  >   belongs to.
                                  >   
                                  >   Reviewed by Sunny Bains
                                ------------------------------------------------------------
                                revno: 2555.822.2
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 21:42:14 +0200
                                message:
                                  Backport into build-201006221614-5.1.46sp1
                                  
                                  > ------------------------------------------------------------
                                  > revno: 3362
                                  > revision-id: davi.arnaut@sun.com-20100401131522-895y8uzvv8ag44gs
                                  > parent: ramil@mysql.com-20100429045409-r7r5lcyiruis15v7
                                  > committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                                  > branch nick: 50755-5.1
                                  > timestamp: Thu 2010-04-01 10:15:22 -0300
                                  > message:
                                  >   Bug#50755: Crash if stored routine def contains version comments
                                  >   
                                  >   The problem was that a syntactically invalid trigger could cause
                                  >   the server to crash when trying to list triggers. The crash would
                                  >   happen due to a mishap in the backup/restore procedure that should
                                  >   protect parser items which are not associated with the trigger. The
                                  >   backup/restore is used to isolate the parse tree (and context) of
                                  >   a statement from the load (and parsing) of a trigger. In this case,
                                  >   a error during the parsing of a trigger could cause the improper
                                  >   backup/restore sequence.
                                  >   
                                  >   The solution is to properly restore the original statement context
                                  >   before the parser is exited due to syntax errors in the trigger body.
                                ------------------------------------------------------------
                                revno: 2555.822.1
                                author: karen.langford@oracle.com
                                committer: MySQL Build Team<build@mysql.com>
                                branch nick: mysql-5.1.46sp1-release
                                timestamp: Tue 2010-06-22 19:21:25 +0200
                                message:
                                  Set version number for mysql-5.1.46sp1 release
                        ------------------------------------------------------------
                        revno: 2555.821.2
                        tags: mysql-5.1.49
                        author: karen.langford@oracle.com
                        committer: Karen Langford <karen.langford@oracle.com>
                        branch nick: mysql-5.1.49-release
                        timestamp: Fri 2010-07-09 14:23:48 +0200
                        message:
                          Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.
                        ------------------------------------------------------------
                        revno: 2555.821.1
                        committer: sunanda <sunanda.menon@sun.com>
                        branch nick: mysql-5.1.49-release
                        timestamp: Wed 2010-07-07 20:34:50 +0200
                        message:
                          rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run default suites
                          was not complete. Bootstrap failed to pick up necessary files needed by test and hence
                          all tests failed.
                    ------------------------------------------------------------
                    revno: 2555.776.94
                    committer: Jimmy Yang <jimmy.yang@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Fri 2010-07-09 01:39:20 -0700
                    message:
                      Fix bug #55039 Failing assertion: space_id > 0 in fil0fil.c.
                      
                      rb://396, approved by Sunny Bains.
                    ------------------------------------------------------------
                    revno: 2555.776.93
                    committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
                    branch nick: mysql-5.1-security-test
                    timestamp: Wed 2010-07-07 13:55:09 +0200
                    message:
                      Bug #54117 crash in thr_multi_unlock, temporary table
                      
                      This crash occured after ALTER TABLE was used on a temporary
                      transactional table locked by LOCK TABLES. Any later attempts to
                      execute LOCK/UNLOCK TABLES, caused the server to crash.
                      
                      The reason for the crash was the list of locked tables would
                      end up having a pointer to a free'd table instance. This happened
                      because ALTER TABLE deleted the table without also removing the
                      table reference from the locked tables list.
                      
                      This patch fixes the problem by making sure ALTER TABLE also
                      removes the table from the locked tables list.
                      
                      Test case added to innodb_mysql.test.
                    ------------------------------------------------------------
                    revno: 2555.776.92
                    author: karen.langford@sun.com
                    committer: sunanda <sunanda.menon@sun.com>
                    branch nick: mysql-5.1-security
                    timestamp: Tue 2010-07-06 16:01:02 +0200
                    message:
                      Raise version number after cloning 5.1.49
                    ------------------------------------------------------------
                    revno: 2555.776.91 [merge]
                    tags: clone-5.1.49-build
                    committer: Vasil Dimov <vasil.dimov@oracle.com>
                    branch nick: mysql-5.1-security
                    timestamp: Sun 2010-07-04 10:12:44 +0300
                    message:
                      Merge mysql-5.1-innodb -> mysql-5.1-security
                      
                      Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
                      There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
                      failure for a test added in one of them. If that is resolved quickly
                      then those 8 more changesets will be merged too.
                        ------------------------------------------------------------
                        revno: 2555.738.163
                        committer: Sunny Bains <Sunny.Bains@Oracle.Com>
                        branch nick: 5.1
                        timestamp: Fri 2010-06-25 18:18:41 +1000
                        message:
                          Fix bug#54583. This change reverses rsvn:1350 by getting rid of a bogus assertion
                          and clarifies the invariant in dict_table_get_on_id().
                                
                          In Mar 2007 Marko observed a crash during recovery, the crash resulted from
                          an UNDO operation on a system table. His solution was to acquire an X lock on
                          the data dictionary, this in hindsight was an overkill. It is unclear what
                          caused the crash, current hypothesis is that it was a memory corruption.
                                
                          The X lock results in performance issues by when undoing changes due to
                          rollback during normal operation on regular tables.
                                
                          Why the change is safe:
                          ======================
                          The InnoDB code has changed since the original X lock change was made. In the
                          new code we always lock the data dictionary in X mode during startup when
                          UNDOing operations on the system tables (this is a given). This ensures that
                          the crash Marko observed cannot happen as long as all transactions that update
                          the system tables follow the standard rules by setting the appropriate DICT_OP
                          flag when writing the log records when they make the changes.
                                
                          If transactions violate the above mentioned rule then during recovery (at
                          startup) the rollback code (see trx0roll.c) will not acquire the X lock
                          and we will see the crash again.  This will however be a different bug.
                        ------------------------------------------------------------
                        revno: 2555.738.162 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-25 11:10:44 +0300
                        message:
                          Merge a lost changeset inaam.rana@oracle.com-20100624124843-m7ouqwe5zqcqapn1
                          (no changed files)
                            ------------------------------------------------------------
                            revno: 2555.820.2 [merge]
                            committer: Inaam Rana <inaam.rana@oracle.com>
                            branch nick: 5.1
                            timestamp: Thu 2010-06-24 08:48:43 -0400
                            message:
                              merge
                        ------------------------------------------------------------
                        revno: 2555.738.161 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-25 11:08:52 +0300
                        message:
                          Merge a lost changeset inaam.rana@oracle.com-20100624124450-2m3mg1238ewvakgx
                            ------------------------------------------------------------
                            revno: 2555.820.1
                            committer: Inaam Rana <inaam.rana@oracle.com>
                            branch nick: 5.1
                            timestamp: Thu 2010-06-24 08:44:50 -0400
                            message:
                              Add ChangeLog for bug#39168
                        ------------------------------------------------------------
                        revno: 2555.738.160 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-25 11:06:02 +0300
                        message:
                          Merge a lost changeset marko.makela@oracle.com-20100624104820-p4ojmxcmq8qeos6d
                            ------------------------------------------------------------
                            revno: 2555.819.3
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Thu 2010-06-24 13:48:20 +0300
                            message:
                              Add ChangeLog entry for Bug#54679
                        ------------------------------------------------------------
                        revno: 2555.738.159 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-25 11:03:38 +0300
                        message:
                          Merge a lost changeset marko.makela@oracle.com-20100624104620-pklunowaigv7quu9
                            ------------------------------------------------------------
                            revno: 2555.819.2
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Thu 2010-06-24 13:46:20 +0300
                            message:
                              Bug#54679: alter table causes compressed row_format to revert to compact
                              
                              ha_innobase::create(): Add the local variable row_type = form->s->row_type.
                              Adjust it to ROW_TYPE_COMPRESSED when ROW_FORMAT is not specified or inherited
                              but KEY_BLOCK_SIZE is. Observe the inherited ROW_FORMAT even when it is not
                              explicitly specified.
                              
                              innodb_bug54679.test: New test, to test the bug and to ensure that there are
                              no regressions. (The only difference in the test result without the patch
                              applied is that the first ALTER TABLE changes ROW_FORMAT to Compact.)
                        ------------------------------------------------------------
                        revno: 2555.738.158 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-25 11:02:31 +0300
                        message:
                          Merge a lost changeset jimmy.yang@oracle.com-20100624021010-oh2hnp8e1xbaax6u
                            ------------------------------------------------------------
                            revno: 2555.819.1
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-06-23 19:10:10 -0700
                            message:
                              Move the fix for bug #54044 to security branch, and revert commit -r3520:3521.
                        ------------------------------------------------------------
                        revno: 2555.738.157
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-22 19:39:20 -0700
                        message:
                          Port fix for "bug #54044 Create temporary tables and using innodb crashes"
                          to 5.1 plugin codeline.
                          
                          rb://378, approved by Marko
                        ------------------------------------------------------------
                        revno: 2555.738.156
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-22 19:04:31 -0700
                        message:
                          Fix bug #54044, Create temporary tables and using innodb crashes. Screen
                          out NULL type columns, and return without creating the table.
                          
                          rb://378 approved by Marko
                        ------------------------------------------------------------
                        revno: 2555.738.155 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-22 20:12:05 +0300
                        message:
                          Merge mysql-5.1-innodb from bk-internal to my local tree
                            ------------------------------------------------------------
                            revno: 2555.818.2
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-22 14:59:49 +0300
                            message:
                              ChangeLog for Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
                            ------------------------------------------------------------
                            revno: 2555.818.1
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-06-22 14:52:15 +0300
                            message:
                              Bug#54686 "field->col->mtype == type" assertion error at row/row0sel.c
                              ha_innobase::index_read(), ha_innobase::records_in_range(): Check that
                              the index is useable before invoking row_sel_convert_mysql_key_to_innobase().
                              
                              This fix is based on a suggestion by Yasufumi Kinoshita.
                        ------------------------------------------------------------
                        revno: 2555.738.154
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-22 20:04:54 +0300
                        message:
                          Add ChangeLog entry for the fix of Bug#47991
                        ------------------------------------------------------------
                        revno: 2555.738.153
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-22 19:30:43 +0300
                        message:
                          Fix Bug#47991 InnoDB Dictionary Cache memory usage increases indefinitely
                          when renaming tables
                          
                          Allocate the table name using ut_malloc() instead of table->heap because
                          the latter cannot be freed.
                          
                          Adjust dict_sys->size calculations all over the code.
                          
                          Change dict_table_t::name from const char* to char* because we need to
                          ut_malloc()/ut_free() it.
                          
                          Reviewed by:	Inaam, Marko, Heikki (rb://384)
                          Approved by:	Heikki (rb://384)
                        ------------------------------------------------------------
                        revno: 2555.738.152
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Mon 2010-06-21 12:51:48 +0300
                        message:
                          Bug#54658: Add ChangeLog entry
                        ------------------------------------------------------------
                        revno: 2555.738.151
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Mon 2010-06-21 12:40:08 +0300
                        message:
                          Bug #54658: InnoDB: Warning: allocated tablespace %lu, old maximum was 0
                          
                          dict_check_tablespaces_and_store_max_id(): Initialize max_space_id
                          and fil_system->max_assigned_id from DICT_HDR_MAX_SPACE_ID.
                          
                          fil_space_create(): Suppress the warning unless !recv_recovery_on
                          (do not complain while applying the redo log).
                        ------------------------------------------------------------
                        revno: 2555.738.150 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-18 11:51:55 +0300
                        message:
                          Merge mysql-5.1-innodb from bk-internal to my local repo
                            ------------------------------------------------------------
                            revno: 2555.817.2
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-06-17 22:38:22 -0700
                            message:
                              Check in fix for Bug #52814 InnoDB: Use the new ha_data interfaces
                              
                              rb://290, approved by Sunny
                            ------------------------------------------------------------
                            revno: 2555.817.1
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-06-17 10:33:03 -0700
                            message:
                              Fix an overly asserted assertion during previous checkin for bug #54330.
                        ------------------------------------------------------------
                        revno: 2555.738.149
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Fri 2010-06-18 10:00:01 +0300
                        message:
                          Increment InnoDB Plugin version from 1.0.9 to 1.0.10, after
                          1.0.9 has been released with MySQL 5.1.48.
                        ------------------------------------------------------------
                        revno: 2555.738.148
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Wed 2010-06-16 19:12:04 -0700
                        message:
                          Fix Bug #54330 Broken fast index creation. Add additional array to
                          account for each merge run's start offset, so correct offsets are
                          paired up for multiple merge runs.
                          
                          rb://377 approved by Marko
                        ------------------------------------------------------------
                        revno: 2555.738.147
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Tue 2010-06-15 02:33:26 -0700
                        message:
                          Add checkin description for bug #47622 to ChangeLog.
                        ------------------------------------------------------------
                        revno: 2555.738.146
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Mon 2010-06-14 13:35:15 +0300
                        message:
                          Adjust suite/innodb/r/innodb_mysql.result after the merge
                        ------------------------------------------------------------
                        revno: 2555.738.145 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Mon 2010-06-14 12:43:02 +0300
                        message:
                          Merge mysql-5.1 -> mysql-5.1-innodb
                          (innodb_mysql.result needs to be adjusted after this commit)
                        ------------------------------------------------------------
                        revno: 2555.738.144 [merge]
                        committer: Inaam Rana <inaam.rana@oracle.com>
                        branch nick: 5.1
                        timestamp: Thu 2010-06-10 10:35:39 -0400
                        message:
                          merge from parent
                            ------------------------------------------------------------
                            revno: 2555.816.3
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Thu 2010-06-10 15:56:23 +0300
                            message:
                              Bug #38999: Re-enable innodb_multi_update.test
                            ------------------------------------------------------------
                            revno: 2555.816.2
                            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-06-09 16:17:18 +0400
                            message:
                              Bug#38999 valgrind warnings for update statement in function compare_record()
                              (InnoDB plugin branch)
                            ------------------------------------------------------------
                            revno: 2555.816.1
                            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Wed 2010-06-09 16:07:34 +0400
                            message:
                              Bug#38999 valgrind warnings for update statement in function compare_record()
                              Valgrind warning happpens because of uninitialized null bytes.
                              In row_sel_push_cache_row_for_mysql() function we fill fetch cache
                              with necessary field values, row_sel_store_mysql_rec() is called
                              for this and leaves null bytes untouched.
                              Later row_sel_pop_cached_row_for_mysql() rewrites table record
                              buffer with uninited null bytes. We can see the problem from the
                              test case:
                              At 'SELECT...' we call row_sel_push...->row_sel_store...->row_sel_pop_cached...
                              chain which rewrites table->record[0] buffer with uninitialized null bytes.
                              When we call 'UPDATE...' statement, compare_record uses this buffer and
                              valgrind warning occurs.
                              The fix is to init null bytes with default values.
                        ------------------------------------------------------------
                        revno: 2555.738.143
                        committer: Inaam Rana <inaam.rana@oracle.com>
                        branch nick: 5.1
                        timestamp: Thu 2010-06-10 10:31:28 -0400
                        message:
                          Add a debug assertion.
                        ------------------------------------------------------------
                        revno: 2555.738.142
                        committer: Inaam Rana <inaam.rana@oracle.com>
                        branch nick: 5.1
                        timestamp: Thu 2010-06-10 09:58:11 -0400
                        message:
                          Formatting changes
                        ------------------------------------------------------------
                        revno: 2555.738.141
                        committer: Inaam Rana <inaam.rana@oracle.com>
                        branch nick: 5.1
                        timestamp: Tue 2010-06-08 14:14:08 -0400
                        message:
                          Add call to log_free_check() in the DML code paths that were missing
                          this before.
                        ------------------------------------------------------------
                        revno: 2555.738.140
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Tue 2010-06-08 15:12:15 +0300
                        message:
                          Document Bug#54009 in the InnoDB Plugin ChangeLog.
                        ------------------------------------------------------------
                        revno: 2555.738.139
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Tue 2010-06-08 15:10:41 +0300
                        message:
                          Bug#54009: Server crashes when data is selected from non backed up table
                          for InnoDB plugin
                          
                          dict_load_table(): Pass the correct tablespace flags to
                          fil_open_single_table_tablespace(). For ROW_FORMAT=COMPACT and REDUNDANT,
                          the tablespace flags are 0. The table flags would be 0 or DICT_TF_COMPACT.
                        ------------------------------------------------------------
                        revno: 2555.738.138
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Tue 2010-06-08 14:40:55 +0300
                        message:
                          buf_page_get_gen(): Pass file,line to rw_lock_x_lock().
                        ------------------------------------------------------------
                        revno: 2555.738.137
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Thu 2010-06-03 06:44:48 -0700
                        message:
                          Remove unncessary name comapre in innobase_get_mysql_key_number_for_index()
                          introduced in bug fix #53592, since dict_table_t can sufficiently unique
                          identify the the table.
                        ------------------------------------------------------------
                        revno: 2555.738.136
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Thu 2010-06-03 12:50:32 +0300
                        message:
                          Move some InnoDB tests to mysql-test/suite/innodb.
                        ------------------------------------------------------------
                        revno: 2555.738.135
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Thu 2010-06-03 12:48:59 +0300
                        message:
                          Copy built-in InnoDB tests to mysql-test/suite/innodb_plugin.
                        ------------------------------------------------------------
                        revno: 2555.738.134
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Thu 2010-06-03 12:46:37 +0300
                        message:
                          Source have_innodb_plugin.inc in the plugin tests.
                        ------------------------------------------------------------
                        revno: 2555.738.133
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Thu 2010-06-03 12:45:34 +0300
                        message:
                          Add innodb_plugin to mysql-test-run default suites.
                        ------------------------------------------------------------
                        revno: 2555.738.132
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Wed 2010-06-02 13:39:03 +0300
                        message:
                          Document the Bug #53674 fix in the InnoDB Plugin
                        ------------------------------------------------------------
                        revno: 2555.738.131
                        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.
                        ------------------------------------------------------------
                        revno: 2555.738.130
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Wed 2010-06-02 13:26:37 +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.
                          
                          Define DB_SUCCESS_LOCKED_REC for indicating a successful operation
                          where a record lock was created.
                          
                          lock_rec_lock_fast(): Return LOCK_REC_SUCCESS,
                          LOCK_REC_SUCCESS_CREATED, or LOCK_REC_FAIL instead of TRUE/FALSE.
                          
                          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.
                        ------------------------------------------------------------
                        revno: 2555.738.129
                        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.
                        ------------------------------------------------------------
                        revno: 2555.738.128
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Tue 2010-06-01 16:58:02 +0300
                        message:
                          Document Bug #48197 fix
                        ------------------------------------------------------------
                        revno: 2555.738.127
                        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.
                        ------------------------------------------------------------
                        revno: 2555.738.126
                        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.
                        ------------------------------------------------------------
                        revno: 2555.738.125
                        committer: Marko M?kel? <marko.makela@oracle.com>
                        branch nick: 5.1-innodb
                        timestamp: Tue 2010-06-01 15:05:21 +0300
                        message:
                          Document the Bug #53812 fix.
                        ------------------------------------------------------------
                        revno: 2555.738.124
                        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.
                        ------------------------------------------------------------
                        revno: 2555.738.123
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1-innodb
                        timestamp: Mon 2010-05-31 19:35:40 +0300
                        message:
                          Merge a change from mysql-trunk-innodb:
                          
                            ------------------------------------------------------------
                            revno: 3127
                            revision-id: vasil.dimov@oracle.com-20100531152341-x2d4hma644icamh1
                            parent: vasil.dimov@oracle.com-20100531105923-kpjwl4rbgfpfj13c
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-trunk-innodb
                            timestamp: Mon 2010-05-31 18:23:41 +0300
                            message:
                              Fix Bug #53947 InnoDB: Assertion failure in thread 4224 in file .\sync\sync0sync.c line 324
                              
                              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
                    ------------------------------------------------------------
                    revno: 2555.776.90 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Fri 2010-07-02 14:34:17 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3992.18
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-bugteam
                        timestamp: Fri 2010-07-02 14:33:17 +0300
                        message:
                          merge
                        ------------------------------------------------------------
                        revno: 1810.3992.17 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-bugteam
                        timestamp: Fri 2010-07-02 14:29:19 +0300
                        message:
                          merge
                    ------------------------------------------------------------
                    revno: 2555.776.89
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Fri 2010-07-02 14:31:16 +0300
                    message:
                      merge
                    ------------------------------------------------------------
                    revno: 2555.776.88 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Fri 2010-07-02 14:29:55 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.815.3
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-security
                        timestamp: Tue 2010-06-29 00:13:18 -0700
                        message:
                          Change the table name in innodb_bug54044 to lower case to avoid
                          platform dependent diffs.
                        ------------------------------------------------------------
                        revno: 2555.815.2
                        committer: Jimmy Yang <jimmy.yang@oracle.com>
                        branch nick: mysql-5.1-security
                        timestamp: Thu 2010-06-24 01:20:25 -0700
                        message:
                          Fix Bug #54044 Create temporary tables and using innodb crashes.
                        ------------------------------------------------------------
                        revno: 2555.815.1 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: mysql-5.1-security
                        timestamp: Mon 2010-06-21 14:49:37 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3996.2
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: mysql-5.0-security
                            timestamp: Mon 2010-06-21 14:09:23 +0300
                            message:
                              tree name change
                            ------------------------------------------------------------
                            revno: 1810.3996.1
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: mysql-5.0-security
                            timestamp: Mon 2010-06-21 14:06:14 +0300
                            message:
                              Switched the mailing lists
                    ------------------------------------------------------------
                    revno: 2555.776.87 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Fri 2010-07-02 14:25:26 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3992.16 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.0-bugteam
                        timestamp: Fri 2010-07-02 14:21:48 +0300
                        message:
                          merge
                    ------------------------------------------------------------
                    revno: 2555.776.86 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Fri 2010-07-02 14:23:07 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.814.2
                        author: karen.langford@oracle.com
                        committer: MySQL Build Team<build@mysql.com>
                        branch nick: mysql-5.1
                        timestamp: Thu 2010-06-03 16:03:17 +0200
                        message:
                          Raise version number after cloning 5.1.48
                        ------------------------------------------------------------
                        revno: 2555.814.1 [merge]
                        tags: mysql-5.1.48, clone-5.1.48-build
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: merge-5.1-bugteam
                        timestamp: Wed 2010-06-02 11:44:11 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3995.1
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: merge-5.0-bugteam
                            timestamp: Wed 2010-06-02 11:42:37 +0300
                            message:
                              changed the tree name
                    ------------------------------------------------------------
                    revno: 2555.776.85 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-07-01 12:10:35 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.813.1
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: bug54667-5.1-bugteam
                        timestamp: Thu 2010-07-01 12:02:00 +0400
                        message:
                          Bug#54667: Unnecessary signal handler redefinition
                          
                          POSIX requires that a signal handler defined with sigaction()
                          is not reset on delivering a signal unless SA_NODEFER or
                          SA_RESETHAND is set. It is therefore unnecessary to redefine
                          the handler on signal delivery on platforms where sigaction()
                          is used without those flags.
                    ------------------------------------------------------------
                    revno: 2555.776.84
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2010-06-30 17:06:25 +0400
                    message:
                      Bug#51431 Wrong sort order after import of dump file
                      The problem is that QUICK_SELECT_DESC behaviour depends
                      on used_key_parts value which can be bigger than selected
                      best_key_parts value if an engine supports clustered key.
                      But used_key_parts is overwritten with best_key_parts
                      value that prevents from correct selection of index
                      access method. The fix is to preserve used_key_parts
                      value for further use in QUICK_SELECT_DESC.
                    ------------------------------------------------------------
                    revno: 2555.776.83
                    committer: Staale Smedseng <staale.smedseng@sun.com>
                    branch nick: 53899-51
                    timestamp: Wed 2010-06-30 11:16:06 +0200
                    message:
                      Bug #53899 Wrong mysql_stmt_errno() after connection loss with
                      automatic reconnect
                      
                      A client with automatic reconnect enabled will see the error
                      message "Lost connection to MySQL server during query" if the
                      connection is lost between mysql_stmt_prepare() and
                      mysql_stmt_execute(). The mysql_stmt_errno() number, however,
                      is 0 -- not the corresponding value 2013.
                      
                      This patch checks for the case where the prepared statement
                      has been pruned due to a connection loss (i.e., stmt->mysql
                      has been set to NULL) during a call to cli_advanced_command(),
                      and avoids changing the last_errno to the result of the last
                      reconnect attempt.
                    ------------------------------------------------------------
                    revno: 2555.776.82
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt
                    timestamp: Tue 2010-06-29 10:28:17 +0200
                    message:
                      Fix of bad merge of test case for Bug#41660 (test case moved).
                    ------------------------------------------------------------
                    revno: 2555.776.81 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-06-28 23:09:00 +0100
                    message:
                      BUG 53657: automerge bzr bundle from bug report into mysql-5.1-bugteam.
                        ------------------------------------------------------------
                        revno: 2555.812.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam-latest
                        timestamp: Mon 2010-05-24 17:43:27 +0100
                        message:
                          BUG#53657: Slave crashed with error 22 when trying to lock mutex
                                     at mf_iocache.c, line 1722
                          
                          The slave crashed while two threads: IO thread and user thread
                          raced for the same mutex (the append_buffer_lock protecting the
                          relay log's IO_CACHE). The IO thread was trying to flush the
                          cache, and for that was grabbing the append_buffer_lock. 
                          
                          However, the other thread was closing and reopening the relay log
                          when the IO thread tried to lock. Closing and reopening the log
                          includes destroying and reinitialising the IO_CACHE
                          mutex. Therefore, the IO thread tried to lock a destroyed mutex.
                          
                          We fix this by backporting patch for BUG#50364 which fixed this
                          bug in mysql server 5.5+. The patch deploys missing
                          synchronization when flush_master_info is called and the relay
                          log is flushed by the IO thread. In detail the patch backports
                          revision (from mysql-trunk):
                          - luis.soares@sun.com-20100203165617-b1yydr0ee24ycpjm
                          
                          This patch already includes the post-push fix also in BUG#50364:
                          - luis.soares@sun.com-20100222002629-0cijwqk6baxhj7gr
                    ------------------------------------------------------------
                    revno: 2555.776.80
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-06-28 17:59:41 -0300
                    message:
                      Revert Bug#48321 due to build breakage and failing tests.
                    ------------------------------------------------------------
                    revno: 2555.776.79 [merge]
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-06-28 17:29:19 -0300
                    message:
                      Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
                        ------------------------------------------------------------
                        revno: 1810.3992.15
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 54041-5.0
                        timestamp: Mon 2010-06-28 12:21:28 -0300
                        message:
                          Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
                          
                          The problem was that a user could supply supply data in chunks
                          via the COM_STMT_SEND_LONG_DATA command to prepared statement
                          parameter other than of type TEXT or BLOB. This posed a problem
                          since other parameter types aren't setup to handle long data,
                          which would lead to a crash when attempting to use the supplied
                          data.
                          
                          Given that long data can be supplied at any stage of a prepared
                          statement, coupled with the fact that the type of a parameter
                          marker might change between consecutive executions, the solution
                          is to validate at execution time each parameter marker for which
                          a data stream was provided. If the parameter type is not TEXT or
                          BLOB (that is, if the type is not able to handle a data stream),
                          a error is returned.
                    ------------------------------------------------------------
                    revno: 2555.776.78
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: 54457-5.1
                    timestamp: Mon 2010-06-28 16:20:28 -0300
                    message:
                      Bug#54457: Test suite broken for 32-bit build
                      
                      The default value of the myisam_max_extra_sort_file_size could be
                      higher than the maximum accepted value, leading to warnings upon
                      the server start.
                      
                      The solution is to simply set the value to the maximum value in a
                      32-bit built (2147483647, one less than the current). This should
                      be harmless as the option is currently unused in 5.1.
                    ------------------------------------------------------------
                    revno: 2555.776.77 [merge]
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam.merge
                    timestamp: Sun 2010-06-27 18:31:42 +0100
                    message:
                      merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 2555.811.1 [merge]
                        committer: Alfranio Correia <alfranio.correia@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-06-17 01:25:07 +0100
                        message:
                          merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteam
                            ------------------------------------------------------------
                            revno: 2555.810.1
                            committer: Alfranio Correia <alfranio.correia@sun.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Wed 2010-05-19 18:01:12 +0100
                            message:
                              BUG#53560 CREATE TEMP./DROP TEMP. are not binglogged correctly after a failed statement
                              
                              This patch fixes two problems described as follows:
                              
                              1 - If there is an on-going transaction and a temporary table is created or
                              dropped, any failed statement that follows the "create" or "drop commands"
                              triggers a rollback and by consequence the slave will go out sync because
                              the binary log will have a wrong sequence of events.
                              
                              To fix the problem, we changed the expression that evaluates when the
                              cache should be flushed after either the rollback of a statment or
                              transaction.
                              
                              2 - When a "CREATE TEMPORARY TABLE SELECT * FROM" was executed the
                              OPTION_KEEP_LOG was not set into the thd->options. For that reason, if
                              the transaction had updated only transactional engines and was rolled
                              back at the end (.e.g due to a deadlock) the changes were not written
                              to the binary log, including the creation of the temporary table.
                                    
                              To fix the problem, we have set the OPTION_KEEP_LOG into the thd->options
                              when a "CREATE TEMPORARY TABLE SELECT * FROM" is executed.
                    ------------------------------------------------------------
                    revno: 2555.776.76
                    committer: <Li-Bing.Song@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2010-06-27 12:42:06 +0800
                    message:
                      The following statements support the CURRENT_USER() where a user is needed.
                      DROP USER 
                      RENAME USER CURRENT_USER() ...
                      GRANT ... TO CURRENT_USER()
                      REVOKE ... FROM CURRENT_USER()
                      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
                      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
                      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
                      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
                      
                      After this patch, session's user will be written into query log events 
                      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
                    ------------------------------------------------------------
                    revno: 2555.776.75
                    committer: Jon Olav Hauglid <jon.hauglid@sun.com>
                    branch nick: mysql-5.1-bugteam-bug54360
                    timestamp: Sat 2010-06-26 19:36:00 +0200
                    message:
                      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER
                      
                      This deadlock happened if DROP DATABASE was blocked due to an open
                      HANDLER table from a different connection. While DROP DATABASE
                      is blocked, it holds the LOCK_mysql_create_db mutex. This results
                      in a deadlock if the connection with the open HANDLER table tries
                      to execute a CREATE/ALTER/DROP DATABASE statement as they all
                      try to acquire LOCK_mysql_create_db.
                      
                      This patch makes this deadlock scenario very unlikely by closing and
                      marking for re-open all HANDLER tables for which there are pending
                      conflicing locks, before LOCK_mysql_create_db is acquired.
                      However, there is still a very slight possibility that a connection
                      could access one of these HANDLER tables between closing/marking for
                      re-open and the acquisition of LOCK_mysql_create_db.
                      
                      This patch is for 5.1 only, a separate and complete fix will be
                      made for 5.5+.
                      
                      Test case added to schema.test.
                    ------------------------------------------------------------
                    revno: 2555.776.74 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: B52711-5.1-bugteam
                    timestamp: Fri 2010-06-25 16:20:22 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.809.1
                        committer: Georgi Kodinov <joro@sun.com>
                        branch nick: B52711-5.1-bugteam
                        timestamp: Thu 2010-04-15 17:04:24 +0300
                        message:
                          Bug #52711: Segfault when doing EXPLAIN SELECT with
                          union...order by (select... where...)
                          
                          The problem is mysql is trying to materialize and 
                          cache the scalar sub-queries at JOIN::optimize
                          even for EXPLAIN where the number of columns is 
                          totally different from what's expected.
                          Fixed by not executing the scalar subqueries 
                          for EXPLAIN.
                    ------------------------------------------------------------
                    revno: 2555.776.73
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2010-06-25 12:01:47 +0400
                    message:
                      Bug#54422 query with = 'variables'
                      During creation of the table list of
                      processed tables hidden I_S table 'VARIABLES'
                      is erroneously added into the table list.
                      it leads to ER_UNKNOWN_TABLE error in
                      TABLE_LIST::add_table_to_list() function.
                      The fix is to skip addition of hidden I_S
                      tables into the table list.
                    ------------------------------------------------------------
                    revno: 2555.776.72
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-06-24 21:13:08 +0400
                    message:
                      Accidentally pushed test changes (#54459) removed.
                    ------------------------------------------------------------
                    revno: 2555.776.71
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt
                    timestamp: Thu 2010-06-24 15:21:23 +0200
                    message:
                      Bug#41660: Sort-index_merge for non-first join table may
                      require O(#scans) memory
                      
                      When an index merge operation was restarted, it would
                      re-allocate the Unique object controlling the duplicate row
                      ID elimination. Fixed by making the Unique object a member
                      of QUICK_INDEX_MERGE_SELECT and thus reusing it throughout
                      the lifetime of this object.
                    ------------------------------------------------------------
                    revno: 2555.776.70 [merge]
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-06-24 15:26:14 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.808.1
                        committer: Ramil Kalimullin <ramil@mysql.com>
                        branch nick: b54575-5.1-bugteam
                        timestamp: Sun 2010-06-20 02:02:58 +0400
                        message:
                          Fix for bug #54575: crash when joining tables with unique set column
                          
                          Problem: a flaw (derefencing a NULL pointer) in the LIKE optimization
                          code may lead to a server crash in some rare cases.
                          
                          Fix: check the pointer before its dereferencing.
                    ------------------------------------------------------------
                    revno: 2555.776.69 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-06-24 14:47:09 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.807.1
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: bug54477-5.1-bugteam
                        timestamp: Tue 2010-06-22 22:53:08 +0400
                        message:
                          Bug#54477: Crash on IN / CASE with NULL arguments
                          
                          Incorrect handling of NULL arguments could lead to a crash on
                          the IN or CASE operations when either NULL arguments were
                          passed explicitly as arguments (IN) or implicitly generated by
                          the WITH ROLLUP modifier (both IN and CASE).
                          
                          Item_func_case::find_item() assumed all necessary comparators
                          to be instantiated in fix_length_and_dec(). However, in the
                          presence of WITH ROLLUP modifier, arguments could be
                          substituted with an Item_null leading to an "unexpected"
                          STRING_RESULT comparator being invoked.
                          
                          In addition to the problem identical to the above,
                          Item_func_in::val_int() could crash even with explicitly passed
                          NULL arguments due to an optimization in fix_length_and_dec()
                          leading to NULL arguments being ignored during comparators
                          creation.
                    ------------------------------------------------------------
                    revno: 2555.776.68
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: b54459-5.1-bugteam
                    timestamp: Thu 2010-06-24 12:00:48 +0400
                    message:
                      Fix for bug #54459: Assertion failed: param.sort_length, 
                      file .\filesort.cc, line 149 (part II)
                      
                      Problem: the server didn't disregard sort order 
                      for some zero length tuples.
                      
                      Fix: skip sort order in such a case 
                      (zero length NOT NULL string functions).
                    ------------------------------------------------------------
                    revno: 2555.776.67
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-06-21 15:09:58 +0400
                    message:
                      Bug#50389 Using intersect does not return all rows
                      In process of record search it is not taken into account
                      that inital quick->file->ref value could be inapplicable
                      to range interval. After proper row is found this value is
                      stored into the record buffer and later the record is
                      filtered out at condition evaluation stage.
                      The fix is store a refernce of found row to the handler ref field.
                    ------------------------------------------------------------
                    revno: 2555.776.66
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: b54393-5.1-bugteam
                    timestamp: Fri 2010-06-18 21:32:23 +0400
                    message:
                      Fix for bug #54393: crash and/or valgrind errors in
                      mysql_client_binlog_statement
                      
                      Problem: server may read from unassigned memory performing
                      "wrong" BINLOG queries.
                      
                      Fix: never read from unassigned memory.
                    ------------------------------------------------------------
                    revno: 2555.776.65 [merge]
                    committer: Joerg Bruehe <joerg@mysql.com>
                    branch nick: bug54590-5.1
                    timestamp: Thu 2010-06-17 19:55:21 +0200
                    message:
                      Bug#54590  "make_binary_distribution" fails because a command
                      line exceeds the limit
                      
                      Upmerge the fix from 5.0 to 5.1
                        ------------------------------------------------------------
                        revno: 1810.3992.14
                        committer: Joerg Bruehe <joerg@mysql.com>
                        branch nick: bug54590-5.0
                        timestamp: Thu 2010-06-17 19:47:38 +0200
                        message:
                          Bug#54590  "make_binary_distribution" fails because a command
                                     line exceeds the limit
                          
                          The number and/or names of our files for the main test suite
                          (contents of "mysql-test/t/") now exceeds the command line
                          length limit on AIX.
                          Solve the problem by using separate "cp" commands for the
                          various file name extensions.
                    ------------------------------------------------------------
                    revno: 2555.776.64 [merge]
                    committer: Joerg Bruehe <joerg@mysql.com>
                    branch nick: push-5.1
                    timestamp: Thu 2010-06-17 13:07:33 +0200
                    message:
                      Automerge the fix for bug#27072 into 5.1-bugteam
                        ------------------------------------------------------------
                        revno: 2555.806.1
                        committer: Joerg Bruehe <joerg@mysql.com>
                        branch nick: bug27072-5.1
                        timestamp: Tue 2010-06-15 22:27:48 +0200
                        message:
                          Fix bug#27072:  RPM autostarts the server
                          
                          This is the fix for 5.1, where only the behaviour on upgrade is changed:
                          If the server was stopped when the upgrade begins, we assume the
                          administrator is taking manual action, so we do not start the (new)
                          server at the end of the upgrade.
                          We still install the start/stop script, so it will be started on reboot.
                    ------------------------------------------------------------
                    revno: 2555.776.63
                    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-15 18:29:53 +0400
                    message:
                      Backport of the patch for bug52208 to 5.1 since the
                      root cause of 52208 resulted in another test failure
                      in 5.1.
                    ------------------------------------------------------------
                    revno: 2555.776.62 [merge]
                    committer: Bjorn Munch <Bjorn.Munch@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-15 11:03:52 +0200
                    message:
                      null upmerge 53424, irrelevant for 5.1
                        ------------------------------------------------------------
                        revno: 1810.3992.13
                        committer: Bjorn Munch <Bjorn.Munch@sun.com>
                        branch nick: interr-50
                        timestamp: Tue 2010-06-15 11:00:02 +0200
                        message:
                          Bug #53424 Certain combination of flags give internal error
                          Reorder code breaks when finding tests skipped due to --skip-rpl etc.
                          Add simple test that master_opt is non-empty
                    ------------------------------------------------------------
                    revno: 2555.776.61 [merge]
                    committer: Bjorn Munch <Bjorn.Munch@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-06-14 11:31:22 +0200
                    message:
                      Upmerge and port 46882
                        ------------------------------------------------------------
                        revno: 1810.3992.12
                        committer: Bjorn Munch <Bjorn.Munch@sun.com>
                        branch nick: stray-50
                        timestamp: Mon 2010-06-14 11:26:42 +0200
                        message:
                          Bug #46882 Suite timeout doesn't kill stray processes
                          Kill mysqltest and call mtr_kill_leftovers() before terminating
                    ------------------------------------------------------------
                    revno: 2555.776.60
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sat 2010-06-12 09:52:31 +0400
                    message:
                      Addendum for the fix for bug #42064:
                      
                      In Prepared_statement::prepare() bail out as soon as
                      parser_state.init() fails, trying to continue leads to crashes.
                    ------------------------------------------------------------
                    revno: 2555.776.59 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2010-06-11 23:44:01 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.805.1 [merge]
                        committer: Ramil Kalimullin <ramil@mysql.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-06-11 18:43:36 +0400
                        message:
                          Automerge.
                            ------------------------------------------------------------
                            revno: 2555.804.1
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: b54007-5.1-bugteam
                            timestamp: Wed 2010-06-09 14:45:04 +0400
                            message:
                              Fix for bug #54007: assert in ha_myisam::index_next, HANDLER
                              
                              Problem: the server missed the fact that one can read from 
                              2 indexes alternately using HANDLER interface.
                              
                              Fix: check if the same (initialized) index is involved
                              reading next/prev values from the index.
                    ------------------------------------------------------------
                    revno: 2555.776.58 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2010-06-11 16:52:06 +0400
                    message:
                      Manual merge from the bugfix tree.
                      
                      conflicts:
                         conflict      sql/sql_parse.cc
                        ------------------------------------------------------------
                        revno: 2555.803.1
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: my51-bug42064
                        timestamp: Fri 2010-05-21 15:23:48 +0400
                        message:
                          Bug #42064: low memory crash when importing hex strings, in
                                      Item_hex_string::Item_hex_string
                          
                          The status of memory allocation in the Lex_input_stream (called
                          from the Parser_state constructor) was not checked which led to
                          a parser crash in case of the out-of-memory error.
                          
                          The solution is to introduce new init() member function in
                          Parser_state and Lex_input_stream so that status of memory
                          allocation can be returned to the caller.
                    ------------------------------------------------------------
                    revno: 2555.776.57
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt
                    timestamp: Fri 2010-06-11 09:38:29 +0200
                    message:
                      Bug#53859: Valgrind: opt_sum_query(TABLE_LIST*, List<Item>&,
                      Item*) at opt_sum.cc:305
                            
                      Queries applying MIN/MAX functions to indexed columns are
                      optimized to read directly from the index if all key parts
                      of the index preceding the aggregated key part are bound to
                      constants by the WHERE clause. A prefix length is also
                      produced, equal to the total length of the bound key
                      parts. If the aggregated column itself is bound to a
                      constant, however, it is also included in the prefix.
                      
                      Such full search keys are read as closed intervals for
                      reasons beyond the scope of this bug. However, the procedure
                      missed one case where a key part meant for use as range
                      endpoint was being overwritten with a NULL value destined
                      for equality checking. In this case the key part was
                      overwritten but the range flag remained, causing open
                      interval reading to be performed.
                      
                      Bug was fixed by adding more stringent checking to the
                      search key building procedure (matching_cond) and never
                      allow overwrites of range predicates with non-range
                      predicates.
                      
                      An assertion was added to make sure open intervals are never
                      used with full search keys.
                    ------------------------------------------------------------
                    revno: 2555.776.56
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: 42733-5.1
                    timestamp: Thu 2010-06-10 17:45:22 -0300
                    message:
                      Bug#42733: Type-punning warnings when compiling MySQL --
                                  strict aliasing violations.
                      
                      One somewhat major source of strict-aliasing violations and
                      related warnings is the SQL_LIST structure. For example,
                      consider its member function `link_in_list` which takes
                      a pointer to pointer of type T (any type) as a pointer to
                      pointer to unsigned char. Dereferencing this pointer, which
                      is done to reset the next field, violates strict-aliasing
                      rules and might cause problems for surrounding code that
                      uses the next field of the object being added to the list.
                      
                      The solution is to use templates to parametrize the SQL_LIST
                      structure in order to deference the pointers with compatible
                      types. As a side bonus, it becomes possible to remove quite
                      a few casts related to acessing data members of SQL_LIST.
                    ------------------------------------------------------------
                    revno: 2555.776.55
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: 42733-5.1
                    timestamp: Thu 2010-06-10 17:16:43 -0300
                    message:
                      Bug#42733: Type-punning warnings when compiling MySQL --
                                 strict aliasing violations.
                      
                      Essentially, the problem is that large parts of the server were
                      developed in simpler times (last decades, pre C99 standard) when
                      strict aliasing and compilers supporting such optimizations were
                      rare to non-existent. Thus, when compiling the server with a modern
                      compiler that uses strict aliasing rules to perform optimizations,
                      there are several places in the code that might trigger undefined
                      behavior.
                      
                      As evinced by some recent bugs, GCC does a somewhat good of job
                      misoptimizing such code, but on the other hand also gives warnings
                      about suspicious code. One problem is that the warnings aren't
                      always accurate, yet we can't afford to just shut them off as we
                      might miss real cases. False-positive cases are aggravated mostly
                      by casts that are likely to trigger undefined behavior.
                      
                      The solution is to start a cleanup process focused on fixing and
                      reducing the amount of strict-aliasing related warnings produced
                      by GCC and others compilers. A good deal of noise reduction can
                      be achieved by just removing useless casts that are product of
                      historical cruft and are likely to trigger undefined behavior if
                      dereferenced.
                    ------------------------------------------------------------
                    revno: 2555.776.54
                    committer: Tor Didriksen <tor.didriksen@sun.com>
                    branch nick: 5.1-bugteam-bug53303
                    timestamp: Thu 2010-06-10 13:15:35 +0200
                    message:
                      Backport of Bug#53303 mytap tests should always have a plan()
                      
                      The bug was caused by buffered output. Flushing resolved it.
                      We still recommend to allways call plan().
                        
                      Also fix some compile warnings (formal parameter different from declaration)
                    ------------------------------------------------------------
                    revno: 2555.776.53 [merge]
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2010-06-09 21:36:20 -0300
                    message:
                      Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
                        ------------------------------------------------------------
                        revno: 1810.3992.11
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 34236-5.0
                        timestamp: Wed 2010-06-09 21:30:41 -0300
                        message:
                          Bug#34236: Various possibly related SSL crashes
                          
                          Addendum: Work around a compilation failure on Windows due to
                                    windows.h not being added to the global namespace.
                    ------------------------------------------------------------
                    revno: 2555.776.52 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: B52512-5.1-bugteam
                    timestamp: Wed 2010-06-09 11:29:27 +0300
                    message:
                      Merge
                        ------------------------------------------------------------
                        revno: 2555.802.1
                        committer: Georgi Kodinov <joro@sun.com>
                        branch nick: B52512-5.1-bugteam
                        timestamp: Wed 2010-04-07 18:17:56 +0300
                        message:
                          Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status 
                          on LOAD DATA
                          
                          Two problems :
                          1. LOAD DATA was not checking for SQL errors and was sending an OK
                          packet even when there were errors reported already. Fixed to check for
                          SQL errors in addition to the error conditions already detected.
                          2. There was an over-ambitious assert() on the server to check if the 
                          protocol is always followed by the client. This can cause crashes on 
                          debug servers by clients not completing the protocol exchange for some
                          reason (e.g. --send command in mysqltest). Fixed by keeping the assert
                          only on client side, since the server always completes the protocol 
                          exchange.
                    ------------------------------------------------------------
                    revno: 2555.776.51 [merge]
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-08 18:14:18 -0300
                    message:
                      Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
                        ------------------------------------------------------------
                        revno: 1810.3992.10
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 34236-5.0
                        timestamp: Tue 2010-06-08 16:20:54 -0300
                        message:
                          Bug#53906: Stray semicolon in my_sys.h corrupts macro function definition of MY_INIT
                        ------------------------------------------------------------
                        revno: 1810.3992.9
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 34236-5.0
                        timestamp: Tue 2010-06-08 10:36:47 -0300
                        message:
                          Bug#34236: Various possibly related SSL crashes
                          
                          The problem was that the bundled yaSSL library was being built
                          without thread safety support regardless of the thread safeness
                          of the compoments linked with it.
                          
                          The solution is to enable yaSSL thread safety support if any
                          component (server or client) is to be built with thread support.
                          
                          Also, generate new certificates for yaSSL's test suite.
                    ------------------------------------------------------------
                    revno: 2555.776.50 [merge]
                    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-08 13:50:54 +0200
                    message:
                      automerge
                        ------------------------------------------------------------
                        revno: 2555.801.1 [merge]
                        committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-06-08 10:28:30 +0400
                        message:
                          5.0-bugteam->5.1-bugteam merge
                            ------------------------------------------------------------
                            revno: 1810.3992.8
                            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Tue 2010-06-08 10:22:40 +0400
                            message:
                              Bug#53933 crash when using uncacheable subquery in the having clause of outer query
                              The problem is in the Item_func_isnull::update_used_tables() function,
                              bracket is at the wrong place. Because of that isnull item erroneously
                              is treated as const item. The fix is to set brackets in the right place.
                    ------------------------------------------------------------
                    revno: 2555.776.49
                    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-08 10:58:19 +0200
                    message:
                      Bug#53191 Lock_time in slow log is negative when logging stored routines
                      
                      Logging slow stored procedures caused the slow log to write 
                      very large lock times. The lock times was a result of a 
                      negative number being cast to an unsigned integer.
                      The reason the lock time appeard negative was because 
                      one of the measurements points was reset after execution
                      causing it to change order with the start time of the 
                      statement.
                            
                      This bug is related to bug 47905 which in turn was 
                      introduced because of a joint fix for 12480,12481,12482 and 11587.
                      
                      The fix is to only reset the start_time before any statement
                      execution in a SP while not resetting start_utime or
                      utime_after_lock which are used for measuring the 
                      performance of the SP. Start_time is used to set the
                      timestamp on the replication event which controlls how
                      the slave interprets time functions like NOW().
                    ------------------------------------------------------------
                    revno: 2555.776.48 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: fix-5.1-bugteam
                    timestamp: Mon 2010-06-07 13:01:54 +0300
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 1810.3992.7
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: fix-5.0-bugteam
                        timestamp: Mon 2010-06-07 12:49:52 +0300
                        message:
                          Addendum to the fix for bug #52315: need to set a proper shutdown type
                          when an out-of-supported-range date is detected.
                    ------------------------------------------------------------
                    revno: 2555.776.47 [merge]
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: b53912-5.1-bugteam
                    timestamp: Fri 2010-06-04 22:01:27 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.800.1 [merge]
                        committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                        branch nick: B52315-5.1-bugteam
                        timestamp: Fri 2010-06-04 17:10:22 +0300
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 1810.3992.6
                            committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                            branch nick: B52315-5.0-bugteam
                            timestamp: Fri 2010-06-04 16:21:19 +0300
                            message:
                              Bug #52315: utc_date() crashes when system time > year 2037
                                          
                              Some of the server implementations don't support dates later
                              than 2038 due to the internal time type being 32 bit.
                              Added checks so that the server will refuse dates that cannot
                              be handled by either throwing an error when setting date at 
                              runtime or by refusing to start or shutting down the server if 
                              the system date cannot be stored in my_time_t.
                    ------------------------------------------------------------
                    revno: 2555.776.46
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: b53912-5.1-bugteam
                    timestamp: Fri 2010-06-04 21:58:41 +0400
                    message:
                      Fix for bug #53912: Fails to build from source
                      
                      NET::skip_big_packet isn't defined for the embedded server,
                      hide it in such a case.
                    ------------------------------------------------------------
                    revno: 2555.776.45
                    committer: Horst.Hunger <horst.hunger@sun.com>
                    branch nick: 5.1-52913-3
                    timestamp: Fri 2010-06-04 10:53:18 +0200
                    message:
                      Patch for bug#52913: Inserted check if mysqlhotcopy script is existing as requested by review. DIsabled the test until bug#54129 will befixed.
                    ------------------------------------------------------------
                    revno: 2555.776.44 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2010-06-04 00:49:09 +0100
                    message:
                      BUG 53893: Automerged from mysql-5.1-bugteam-gca into mysql-5.1-bugteam.
                      
                      Post-push fix.
                        ------------------------------------------------------------
                        revno: 2555.799.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam-gca
                        timestamp: Fri 2010-06-04 00:45:07 +0100
                        message:
                          BUG#53893: RBR: nullable unique key can lead to out-of-sync slave
                            
                          Post-push fix.
                            
                          There was a valgrind issue on the loop that checks whether there
                          are NULL fields in the UNIQUE KEY or not. In detail, for the last 
                          iteration the server may read out of the key_part array boundaries,
                          making valgrind to output warnings.
                          
                          We fix this by correcting the loop, ie, moving the part that reads
                          from the key_part to be inside the loop statement block. This way
                          the assignment is protected by the loop condition.
                    ------------------------------------------------------------
                    revno: 2555.776.43
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-06-03 09:54:37 -0300
                    message:
                      Don't enable safemalloc for valgrind builds, it's too slow.
                    ------------------------------------------------------------
                    revno: 2555.776.42
                    committer: Horst.Hunger <horst.hunger@sun.com>
                    branch nick: 5.1-52913-2
                    timestamp: Thu 2010-06-03 10:31:26 +0200
                    message:
                      Patch for bug#52913 including all review results and changes of date format.
                    ------------------------------------------------------------
                    revno: 2555.776.41 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam-push
                    timestamp: Thu 2010-06-03 00:04:27 +0100
                    message:
                      BUG 53893: automerged bug branch into mysql-5.1-bugteam latest.
                        ------------------------------------------------------------
                        revno: 2555.798.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-06-02 23:26:12 +0100
                        message:
                          BUG#53893: RBR: nullable unique key can lead to out-of-sync slave
                          
                          When using Unique Keys with nullable parts in RBR, the slave can
                          choose the wrong row to update. This happens because a table with
                          an unique key containing nullable parts cannot strictly guarantee 
                          uniqueness. As stated in the manual, for all engines, a UNIQUE 
                          index allows multiple NULL values for columns that can contain 
                          NULL.
                          
                          We fix this at the slave by extending the checks before assuming
                          that the row found through an unique index is is the correct
                          one. This means that when a record (R) is fetched from the storage
                          engine and a key that is not primary (K) is used, the server does 
                          the following: 
                          
                           - If K is unique and has no nullable parts, it returns R;
                           - Otherwise, if any field in the before image that is part of K
                             is null do an index scan;
                           - If there is no NULL field in the BI part of K, then return R.
                          
                          A side change: renamed the existing test case file and added a
                          test case covering the changes in this patch.
                    ------------------------------------------------------------
                    revno: 2555.776.40 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam-push
                    timestamp: Wed 2010-06-02 13:13:30 +0100
                    message:
                      BUG 54161: automerged bzr bundle from bug report.
                        ------------------------------------------------------------
                        revno: 2555.797.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-06-02 12:20:43 +0100
                        message:
                          BUG#54161: MTR: disabled.def lists don't work with FQ test names
                          
                          MTR will ignore fully qualified test name entries in disabled.def 
                          lists. Therefore, it would still run the test case, even if it is
                          listed.
                          
                          This patch fix this by extending the check when marking the test
                          case as disabled to take into consideration not only the cases that
                          contain the simple test name but also those that contain fully 
                          qualified test names.
                    ------------------------------------------------------------
                    revno: 2555.776.39 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2010-06-02 13:54:40 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.796.1
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: my51-bug48537
                        timestamp: Sat 2010-05-29 22:16:45 +0400
                        message:
                          Bug #48537: difference of index selection between rpm binary
                                      and .tar.gz, windows vs linux..
                          
                          On Intel x86 machines index selection by the MySQL query
                          optimizer could sometimes depend on the compiler version and
                          optimization flags used to build the server binary.
                          
                          The problem was a result of a known issue with floating point
                          calculations on x86: since internal FPU precision (80 bit)
                          differs from precision used by programs (32-bit float or 64-bit
                          double), the result of calculating a complex expression may
                          depend on how FPU registers are allocated by the compiler and
                          whether intermediate values are spilled from FPU to memory. In
                          this particular case compiler versions and optimization flags
                          had an effect on cost calculation when choosing the best index
                          in best_access_path().
                          
                          A possible solution to this problem which has already been
                          implemented in mysql-trunk is to limit FPU internal precision
                          to 64 bits. So the fix is a backport of the relevant code to
                          5.1 from mysql-trunk.
                    ------------------------------------------------------------
                    revno: 2555.776.38
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Tue 2010-06-01 15:16:35 +0300
                    message:
                      Bug#40928 : make main.func_str experimental on Solaris
                    ------------------------------------------------------------
                    revno: 2555.776.37
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Tue 2010-06-01 15:14:38 +0300
                    message:
                      Bug #54138 : making main.sp and rpl.rpl_row_sp011 experimental on solaris
                    ------------------------------------------------------------
                    revno: 2555.776.36 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Tue 2010-06-01 14:48:24 +0300
                    message:
                      merged mysql-5.0-bugteam -> mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 1810.3992.5 [merge]
                        committer: Georgi Kodinov <joro@sun.com>
                        branch nick: merge-5.0-bugteam
                        timestamp: Tue 2010-06-01 14:28:58 +0300
                        message:
                          merged mysql-5.0 to mysql-5.0-bugteam
                            ------------------------------------------------------------
                            revno: 1810.3989.18 [merge]
                            author: joerg.bruehe@sun.com
                            committer: MySQL Build Team<build@mysql.com>
                            branch nick: mysql-5.0
                            timestamp: Wed 2010-05-19 20:02:53 +0200
                            message:
                              Merge from mysql-5.0.91-release
                                ------------------------------------------------------------
                                revno: 1810.3994.1
                                tags: mysql-5.0.91
                                committer: Sunanda Menon <sunanda.menon@sun.com
                                branch nick: mysql-5.0.91-release
                                timestamp: Wed 2010-05-05 15:33:46 +0200
                                message:
                                  ------------------------------------------------------------
                                  revno: 2861
                                  committer: Georgi Kodinov <joro@sun.com>
                                  branch nick: B53371-5.0-bugteam
                                  timestamp: Mon 2010-05-03 18:16:51 +0300
                                  message:
                                    Bug #53371: COM_FIELD_LIST can be abused to bypass table level grants.
                                    
                                    The server was not checking the supplied to COM_FIELD_LIST table name
                                    for validity and compliance to acceptable table names standards.
                                    Fixed by checking the table name for compliance similar to how it's 
                                    normally checked by the parser and returning an error message if 
                                    it's not compliant.
                    ------------------------------------------------------------
                    revno: 2555.776.35 [merge]
                    committer: Georgi Kodinov <Georgi.Kodinov@Oracle.com>
                    branch nick: merge-5.1-bugteam
                    timestamp: Tue 2010-06-01 14:44:31 +0300
                    message:
                      merge mysql-5.1 -> mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 2555.789.3 [merge]
                        committer: Vasil Dimov <vasil.dimov@oracle.com>
                        branch nick: mysql-5.1
                        timestamp: Mon 2010-05-31 11:23:07 +0300
                        message:
                          Merge mysql-5.1-innodb -> mysql-5.1
                            ------------------------------------------------------------
                            revno: 2555.738.122
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Fri 2010-05-28 06:17:37 -0700
                            message:
                              This is to fix a special case for the fix on bug #53592, where the
                              err_index could be not a member of the share structure or prebuilt
                              structure passed from MySQL. For now, we resort to the traditional
                              way of scanning index->table for the index number.
                            ------------------------------------------------------------
                            revno: 2555.738.121
                            committer: Inaam Rana <inaam.rana@oracle.com>
                            branch nick: 5.1
                            timestamp: Thu 2010-05-27 12:31:00 -0400
                            message:
                              Fix the printout in for long semaphore waits to not
                              list a thread doing a wait_ex as an s-lock waiter.
                            ------------------------------------------------------------
                            revno: 2555.738.120
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 22:38:14 -0700
                            message:
                              Update ChangeLog for bug fix regarding 53582.
                            ------------------------------------------------------------
                            revno: 2555.738.119
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 22:31:27 -0700
                            message:
                              Fix Bug #53592 in plugin code, "crash replacing duplicates into table
                              after fast alter table added unique key". Look up MySQL index number should
                              go through index translation table.
                              
                              rb://347, approved by Marko
                            ------------------------------------------------------------
                            revno: 2555.738.118 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 17:21:33 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal into my local tree
                                ------------------------------------------------------------
                                revno: 2555.795.4
                                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.
                                ------------------------------------------------------------
                                revno: 2555.795.3
                                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.
                            ------------------------------------------------------------
                            revno: 2555.738.117 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 12:45:17 +0300
                            message:
                              Merge mysql-5.1 into mysql-5.1-innodb
                              (this changeset does not introduce any changes)
                            ------------------------------------------------------------
                            revno: 2555.738.116 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 12:14:57 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal into my local tree
                                ------------------------------------------------------------
                                revno: 2555.795.2
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Mon 2010-05-24 14:43:49 +0300
                                message:
                                  Document the Bug #53578 fix.
                                ------------------------------------------------------------
                                revno: 2555.795.1
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Mon 2010-05-24 14:04:39 +0300
                                message:
                                  Bug#53578: assert on invalid page access, in fil_io()
                                  
                                  Store the max_space_id in the data dictionary header in order to avoid
                                  space_id reuse.
                                  
                                  DICT_HDR_MIX_ID: Renamed to DICT_HDR_MAX_SPACE_ID, DICT_HDR_MIX_ID_LOW.
                                  
                                  dict_hdr_get_new_id(): Return table_id, index_id, space_id or a subset of them.
                                  
                                  fil_system_t: Add ibool space_id_reuse_warned.
                                  
                                  fil_create_new_single_table_tablespace(): Get the space_id from the caller.
                                  
                                  fil_space_create(): Issue a warning if the fil_system->max_assigned_id
                                  is exceeded.
                                  
                                  fil_assign_new_space_id(): Return TRUE/FALSE and take a pointer to the
                                  space_id as a parameter. Make the function public.
                                  
                                  fil_init(): Initialize all fil_system fields by mem_zalloc(). Remove
                                  explicit initializations of certain fields to 0 or NULL.
                            ------------------------------------------------------------
                            revno: 2555.738.115
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-25 11:01:03 +0300
                            message:
                              Fix comments on row_merge_write()
                              
                              This is a port of
                              vasil.dimov@oracle.com-20100521175337-c1b1lqxgizqegb0w and
                              vasil.dimov@oracle.com-20100521180951-mef23h24k023xuwq
                              from mysql-trunk-innodb
                            ------------------------------------------------------------
                            revno: 2555.738.114 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-05-20 16:31:57 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal into my local tree
                                ------------------------------------------------------------
                                revno: 2555.794.2
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Thu 2010-05-20 16:07:34 +0300
                                message:
                                  buf_LRU_free_block(): Correct an error in the comment.
                            ------------------------------------------------------------
                            revno: 2555.738.113
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-05-20 16:27:35 +0300
                            message:
                              Disable main.ps_3innodb for valgrind tests since it results in known
                              failures, that are described in
                              
                              Bug#38999 valgrind warnings for update statement in function compare_record()
                              
                              At the time I am adding this the failures are:
                              
                              main.ps_3innodb                          [ fail ]  Found warnings/errors in server log file!
                                      Test ended at 2010-05-20 01:17:34
                              line
                              ==31559== Thread 11:
                              ==31559== Conditional jump or move depends on uninitialised value(s)
                              ==31559==    at 0x75C5BD: compare_record(st_table*) (sql_update.cc:35)
                              ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
                              ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
                              ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
                              ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
                              ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
                              ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
                              ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
                              ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
                              ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
                              ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
                              ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
                              ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
                              ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
                              ==31559== Conditional jump or move depends on uninitialised value(s)
                              ==31559==    at 0x75C5D0: compare_record(st_table*) (sql_update.cc:35)
                              ==31559==    by 0x744732: write_record(THD*, st_table*, st_copy_info*) (sql_insert.cc:1486)
                              ==31559==    by 0x74A0D7: mysql_insert(THD*, TABLE_LIST*, List<Item>&, List<List<Item> >&, List<Item>&, List<Item>&, enum_duplicates, bool) (sql_insert.cc:835)
                              ==31559==    by 0x6A79B4: mysql_execute_command(THD*) (sql_parse.cc:3198)
                              ==31559==    by 0x754998: Prepared_statement::execute(String*, bool) (sql_prepare.cc:3583)
                              ==31559==    by 0x754C4F: Prepared_statement::execute_loop(String*, bool, unsigned char*, unsigned char*) (sql_prepare.cc:3258)
                              ==31559==    by 0x754F33: mysql_sql_stmt_execute(THD*) (sql_prepare.cc:2529)
                              ==31559==    by 0x6A5028: mysql_execute_command(THD*) (sql_parse.cc:2272)
                              ==31559==    by 0x6ADAE8: mysql_parse(THD*, char const*, unsigned, char const**) (sql_parse.cc:5986)
                              ==31559==    by 0x6AF3A4: dispatch_command(enum_server_command, THD*, char*, unsigned) (sql_parse.cc:1233)
                              ==31559==    by 0x6B0800: do_command(THD*) (sql_parse.cc:874)
                              ==31559==    by 0x69CB46: handle_one_connection (sql_connect.cc:1134)
                              ==31559==    by 0x33EDA062F6: start_thread (in /lib64/libpthread-2.5.so)
                              ==31559==    by 0x33ECED1B6C: clone (in /lib64/libc-2.5.so)
                              ^ Found warnings in /export/home4/pb2/test/sb_3-1827397-1274300957.87/mysql-5.1.48-linux-x86_64-test/mysql-test/var-n_mix/log/mysqld.1.err
                            ------------------------------------------------------------
                            revno: 2555.738.112 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-05-20 15:54:03 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal into my local tree
                                ------------------------------------------------------------
                                revno: 2555.794.1
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: 5.1-innodb
                                timestamp: Thu 2010-05-20 13:40:42 +0300
                                message:
                                  Bug#53593: Add some instrumentation to improve Valgrind sensitivity
                                  
                                  BUILD/*: Add valgrind_configs=--with-valgrind.
                                  BUILD/*: Remove -USAFEMALLOC from valgrind_flags.
                                  
                                  configure.in: Add AC_ARG_WITH(valgrind) and HAVE_VALGRIND.
                                  
                                  include/my_sys.h: Define a number of MEM_ wrappers for VALGRIND_ functions.
                                  include/my_sys.h: Make TRASH do MEM_UNDEFINED().
                                  
                                  include/m_string.h: Remove unused macro bzero_if_purify(A,B).
                                  
                                  _mymalloc(): Declare MEM_UNDEFINED() on the allocated memory.
                                  
                                  _myfree(): Declare MEM_NOACCESS() on the freed memory.
                                  
                                  storage/innobase/include/univ.i: Enable UNIV_DEBUG_VALGRIND based on
                                  HAVE_VALGRIND rather than HAVE_purify.
                                  
                                  Possible things to do:
                                   * In my_global.h, remove the defined(HAVE_purify) condition
                                     from the _WIN32 uint3korr().
                                   * In my_global.h *int*korr(), use | instead of +
                                     in order to keep the Valgrind V bits accurate
                                   * Consider replacing HAVE_purify with HAVE_VALGRIND
                                   * Use VALGRIND_CREATE_BLOCK, VALGRIND_DISCARD in mem_root and similar places
                            ------------------------------------------------------------
                            revno: 2555.738.111
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-05-20 10:50:07 +0300
                            message:
                              Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innodb_plugin:
                              
                                ------------------------------------------------------------
                                revno: 3094
                                revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
                                parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
                                committer: Vasil Dimov <vasil.dimov@oracle.com>
                                branch nick: mysql-trunk-innodb
                                timestamp: Thu 2010-05-13 10:46:52 +0300
                                message:
                                  Followup to Bug#51920, fix binlog.binlog_killed
                                  
                                  This is a followup to the fix of
                                  
                                  Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
                                  timeout
                                  
                                  in that fix (rb://279) the behavior was changed to honor when a trx is
                                  interrupted during lock wait, but the returned error code was still
                                  "lock wait timeout" when it should be "interrupted".
                                  
                                  This change fixes the non-deterministically failing test binlog.binlog_killed,
                                  that failed like this:
                                  
                                  binlog.binlog_killed 'stmt'              [ fail ]
                                          Test ended at 2010-05-12 11:39:08
                                  
                                  CURRENT_TEST: binlog.binlog_killed
                                  mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
                                  
                                  Approved by:	Sunny Bains (rb://344)
                                ------------------------------------------------------------
                            ------------------------------------------------------------
                            revno: 2555.738.110
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Thu 2010-05-20 10:39:02 +0300
                            message:
                              Merge from mysql-trunk-innodb into mysql-5.1-innodb/storage/innobase:
                              
                                ------------------------------------------------------------
                                revno: 3094
                                revision-id: vasil.dimov@oracle.com-20100513074652-0cvlhgkesgbb2bfh
                                parent: vasil.dimov@oracle.com-20100512173700-byf8xntxjur1hqov
                                committer: Vasil Dimov <vasil.dimov@oracle.com>
                                branch nick: mysql-trunk-innodb
                                timestamp: Thu 2010-05-13 10:46:52 +0300
                                message:
                                  Followup to Bug#51920, fix binlog.binlog_killed
                                  
                                  This is a followup to the fix of
                                  
                                  Bug#51920 Innodb connections in row lock wait ignore KILL until lock wait
                                  timeout
                                  
                                  in that fix (rb://279) the behavior was changed to honor when a trx is
                                  interrupted during lock wait, but the returned error code was still
                                  "lock wait timeout" when it should be "interrupted".
                                  
                                  This change fixes the non-deterministically failing test binlog.binlog_killed,
                                  that failed like this:
                                  
                                  binlog.binlog_killed 'stmt'              [ fail ]
                                          Test ended at 2010-05-12 11:39:08
                                  
                                  CURRENT_TEST: binlog.binlog_killed
                                  mysqltest: At line 208: query 'reap' failed with wrong errno 1205: 'Lock wait timeout exceeded; try restarting transaction', instead of 0...
                                  
                                  Approved by:	Sunny Bains (rb://344)
                                ------------------------------------------------------------
                              
                              This merge is non-trivial since it has to introduce the DB_INTERRUPTED
                              error code.
                              
                              Also revert vasil.dimov@oracle.com-20100408165555-9rpjh24o0sa9ad5y
                              which adjusted the binlog.binlog_killed test to the new (wrong) behavior
                            ------------------------------------------------------------
                            revno: 2555.738.109
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-19 11:16:18 +0300
                            message:
                              Make UNIV_DEBUG Valgrind friendly in the built-in InnoDB.
                              Use | instead of +, and mask out the dont-care bits in debug assertions.
                            ------------------------------------------------------------
                            revno: 2555.738.108
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-19 11:07:43 +0300
                            message:
                              Make UNIV_DEBUG Valgrind friendly. Use | instead of +,
                              and mask out the dont-care bits in debug assertions.
                            ------------------------------------------------------------
                            revno: 2555.738.107
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-19 11:01:52 +0300
                            message:
                              Silence some more bogus Valgrind warnings on non-32-bit systems. (Bug #53307)
                            ------------------------------------------------------------
                            revno: 2555.738.106
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-19 10:58:43 +0300
                            message:
                              Add Valgrind checks to compressed BLOB access.
                            ------------------------------------------------------------
                            revno: 2555.738.105
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-19 10:56:13 +0300
                            message:
                              Work around Bug #53750 in innodb.innodb_bug48024
                            ------------------------------------------------------------
                            revno: 2555.738.104
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-18 16:06:58 +0300
                            message:
                              Work around Bug #53750 in innodb_bug48024.test
                            ------------------------------------------------------------
                            revno: 2555.738.103
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Fri 2010-05-14 16:10:50 +0300
                            message:
                              Document Bug #48024 and Bug #53644 in the ChangeLog
                            ------------------------------------------------------------
                            revno: 2555.738.102
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Fri 2010-05-14 16:08:15 +0300
                            message:
                              Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
                              Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
                              
                              This fixes the bugs in the InnoDB Plugin.
                              
                              ha_innodb.h: Use trx_query_string() instead of trx_query() when
                              available (MySQL 5.1.42 or later).
                              
                              innobase_get_stmt(): New function, to retrieve the currently running
                              SQL statement.
                              
                              struct trx_struct: Remove mysql_query_str. Use innobase_get_stmt() instead.
                              
                              dict_strip_comments(): Add and observe the parameter sql_length. Treat
                              /*/ as the start of a comment.
                              
                              dict_create_foreign_constraints(), row_table_add_foreign_constraints():
                              Add the parameter sql_length.
                            ------------------------------------------------------------
                            revno: 2555.738.101
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Fri 2010-05-14 16:02:28 +0300
                            message:
                              Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)
                              Also make InnoDB thinks that /*/ only starts a comment. (Bug #53644).
                              
                              struct trx_struct: Add mysql_query_len.
                              
                              ha_innodb.cc: Use trx_query_string() instead of trx_query() and
                              initialize trx->mysql_query_len.
                              
                              INNOBASE_COPY_STMT(thd, trx): New macro, to initialize
                              trx->mysql_query_str and trx->mysql_query_len.
                              
                              dict_strip_comments(): Add and observe the parameter sql_length. Treat
                              /*/ as the start of a comment.
                              
                              dict_create_foreign_constraints(), row_table_add_foreign_constraints():
                              Add the parameter sql_length.
                            ------------------------------------------------------------
                            revno: 2555.738.100
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Fri 2010-05-14 13:51:26 +0300
                            message:
                              Remove unused code.
                            ------------------------------------------------------------
                            revno: 2555.738.99
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Wed 2010-05-12 13:46:03 +0300
                            message:
                              Document the Bug #53591 fix in the ChangeLog.
                            ------------------------------------------------------------
                            revno: 2555.738.98
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Wed 2010-05-12 13:42:12 +0300
                            message:
                              ha_innobase::add_index(): Reset trx->error_state in error handling.
                              (Bug #53591)
                            ------------------------------------------------------------
                            revno: 2555.738.97
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Wed 2010-05-12 09:09:22 +0300
                            message:
                              Document recent fixes in ChangeLog.
                            ------------------------------------------------------------
                            revno: 2555.738.96
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Wed 2010-05-12 08:39:25 +0300
                            message:
                              row_merge_drop_temp_indexes(): Do not reference freed memory.
                              (Bug #53471)
                            ------------------------------------------------------------
                            revno: 2555.738.95
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: mysql-5.1-innodb2
                            timestamp: Tue 2010-05-11 19:58:45 +0300
                            message:
                              Fix sys_vars.tx_isolation_func.test, which was broken in revno 3432
                              when making READ UNCOMMITTED lock as little as READ COMMITTED.
                            ------------------------------------------------------------
                            revno: 2555.738.94 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-11 14:00:29 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal locally
                                ------------------------------------------------------------
                                revno: 2555.792.4 [merge]
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: mysql-5.1-innodb2
                                timestamp: Tue 2010-05-11 13:53:08 +0300
                                message:
                                  Merge a patch from Facebook to fix Bug #53290
                                  
                                  commit e759bc64eb5c5eed4f75677ad67246797d486460
                                  Author: Ryan Mack
                                  Date:   3 days ago
                                  
                                      Bugfix for 53290, fast unique index creation fails on duplicate null values
                                  
                                      Summary:
                                      Bug in the fast index creation code incorrectly considers null
                                      values to be duplicates during block merging.  Innodb policy is that
                                      multiple null values are allowed in a unique index.  Null duplicates
                                      were correctly ignored while sorting individual blocks and with slow
                                      index creation.
                                  
                                      Test Plan:
                                      mtr, including new test, load dbs using deferred index creation
                                  
                                      License:
                                      Copyright (C) 2009-2010 Facebook, Inc.  All Rights Reserved.
                                  
                                      Dual licensed under BSD license and GPLv2.
                                  
                                      Redistribution and use in source and binary forms, with or without
                                      modification, are permitted provided that the following conditions are met:
                                      1. Redistributions of source code must retain the above copyright notice,
                                         this list of conditions and the following disclaimer.
                                      2. Redistributions in binary form must reproduce the above copyright notice,
                                         this list of conditions and the following disclaimer in the documentation
                                         and/or other materials provided with the distribution.
                                  
                                      THIS SOFTWARE IS PROVIDED BY FACEBOOK, INC. ``AS IS'' AND ANY EXPRESS OR
                                      IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
                                      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
                                      EVENT SHALL FACEBOOK, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
                                      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
                                      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
                                      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
                                      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
                                      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
                                      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
                                  
                                      This program is free software; you can redistribute it and/or modify it
                                      under the terms of the GNU General Public License as published by the Free
                                      Software Foundation; version 2 of the License.
                                  
                                      This program is distributed in the hope that it will be useful, but WITHOUT
                                      ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
                                      FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
                                      more details.
                                  
                                      You should have received a copy of the GNU General Public License along with
                                      this program; if not, write to the Free Software Foundation, Inc., 59 Temple
                                      Place, Suite 330, Boston, MA  02111-1307  USA
                                    ------------------------------------------------------------
                                    revno: 2555.793.1
                                    committer: Marko M?kel? <marko.makela@oracle.com>
                                    branch nick: 5.1-innodb
                                    timestamp: Wed 2010-05-05 15:39:01 +0300
                                    message:
                                      Merge a contribution from Ryan Mack at Facebook:
                                      
                                      Bugfix for 53290, fast unique index creation fails on duplicate null values
                                      
                                          Summary:
                                          Bug in the fast index creation code incorrectly considers null
                                          values to be duplicates during block merging.  Innodb policy is that
                                          multiple null values are allowed in a unique index.  Null duplicates
                                          were correctly ignored while sorting individual blocks and with slow
                                          index creation.
                                      
                                          Test Plan:
                                          mtr, including new test, load dbs using deferred index creation
                                      
                                          DiffCamp Revision: 110840
                                          Reviewed By: mcallaghan
                                          CC: mcallaghan, mysql-devel@lists
                                          Revert Plan:
                                          OK
                                ------------------------------------------------------------
                                revno: 2555.792.3
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: mysql-5.1-innodb2
                                timestamp: Tue 2010-05-11 13:50:12 +0300
                                message:
                                  Do not demand that buf_page_t be fully initialized on 64-bit systems.
                                  There may be padding before buf_page_t::zip. (Bug #53307)
                                ------------------------------------------------------------
                                revno: 2555.792.2
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: mysql-5.1-innodb2
                                timestamp: Tue 2010-05-11 13:49:10 +0300
                                message:
                                  btr_page_split_and_insert(): Add an assertion
                                  suggested by Sunny Bains when reviewing Bug #52964.
                                ------------------------------------------------------------
                                revno: 2555.792.1
                                committer: Marko M?kel? <marko.makela@oracle.com>
                                branch nick: mysql-5.1-innodb2
                                timestamp: Tue 2010-05-11 13:45:00 +0300
                                message:
                                  Remove a stray expression. Spotted by Sunny Bains.
                            ------------------------------------------------------------
                            revno: 2555.738.93
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-11 13:58:28 +0300
                            message:
                              Raise InnoDB Plugin version from 1.0.8 to 1.0.9.
                              1.0.8 will be released in MySQL 5.1.47, so
                              1.0.9 will be released in MySQL 5.1.48
                            ------------------------------------------------------------
                            revno: 2555.738.92 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Tue 2010-05-11 13:41:34 +0300
                            message:
                              Merge mysql-5.1 into mysql-5.1-innodb
                            ------------------------------------------------------------
                            revno: 2555.738.91 [merge]
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Mon 2010-05-10 16:28:52 +0300
                            message:
                              Merge mysql-5.1-innodb from bk-internal into my local branch
                                ------------------------------------------------------------
                                revno: 2555.791.2
                                committer: Marko Makela <mmakela@bk-internal.mysql.com>
                                branch nick: mysql-5.1-innodb
                                timestamp: Mon 2010-05-10 13:38:25 +0200
                                message:
                                  Add an innodb_plugin test case for Bug #49164.
                                ------------------------------------------------------------
                                revno: 2555.791.1
                                committer: Marko Makela <mmakela@bk-internal.mysql.com>
                                branch nick: mysql-5.1-innodb
                                timestamp: Mon 2010-05-10 13:37:52 +0200
                                message:
                                  Add an innodb test case for Bug #49164.
                            ------------------------------------------------------------
                            revno: 2555.738.90
                            committer: Vasil Dimov <vasil.dimov@oracle.com>
                            branch nick: mysql-5.1-innodb
                            timestamp: Mon 2010-05-10 16:24:33 +0300
                            message:
                              Make dict_index_stat_mutex[] static because it is only used in dict0dict.c
                            ------------------------------------------------------------
                            revno: 2555.738.89
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 15:05:55 +0300
                            message:
                              Re-enable ps_3innodb.
                            ------------------------------------------------------------
                            revno: 2555.738.88
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 14:50:11 +0300
                            message:
                              Document Bug #53256
                            ------------------------------------------------------------
                            revno: 2555.738.87
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 14:45:13 +0300
                            message:
                              Note the 1.0.7 release
                            ------------------------------------------------------------
                            revno: 2555.738.86
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 14:24:11 +0300
                            message:
                              row_merge_drop_temp_indexes(): Load the table via the dictionary cache.
                              Allow multiple indexes to be dropped. (Bug #53256)
                            ------------------------------------------------------------
                            revno: 2555.738.85
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 13:44:25 +0300
                            message:
                              Factor out innodb_multi_update.test from innodb.test
                            ------------------------------------------------------------
                            revno: 2555.738.84
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 13:40:01 +0300
                            message:
                              Factor out innodb_multi_update.test from innodb.test
                            ------------------------------------------------------------
                            revno: 2555.738.83 [merge]
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 13:37:33 +0300
                            message:
                              Merge
                                ------------------------------------------------------------
                                revno: 2555.790.1
                                committer: Jimmy Yang <jimmy.yang@oracle.com>
                                branch nick: mysql-5.1
                                timestamp: Wed 2010-05-05 03:02:19 -0700
                                message:
                                  Update ChangeLog for bug fix of #53165
                            ------------------------------------------------------------
                            revno: 2555.738.82
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 13:05:07 +0300
                            message:
                              Add Valgrind diagnostics to track down Bug #38999.
                            ------------------------------------------------------------
                            revno: 2555.738.81
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Wed 2010-05-05 12:53:28 +0300
                            message:
                              Add Valgrind diagnostics to track down Bug #38999.
                            ------------------------------------------------------------
                            revno: 2555.738.80
                            committer: Jimmy Yang <jimmy.yang@oracle.com>
                            branch nick: mysql-5.1
                            timestamp: Tue 2010-05-04 21:52:24 -0700
                            message:
                              Port fix for 53165 to InnoDB 5.1 plugin. The change buffering options
                              are different in 5.1 comparing to that of 5.5, so a hand port is
                              necessary to avoid wrong default option to be set by a simple
                              branch merge.
                            ------------------------------------------------------------
                            revno: 2555.738.79
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 16:15:17 +0300
                            message:
                              Document Bug #53306 in the InnoDB Plugin ChangeLog.
                            ------------------------------------------------------------
                            revno: 2555.738.78
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 16:13:58 +0300
                            message:
                              fsp_init_file_page_low(): Zero out the page. (Bug #53306)
                            ------------------------------------------------------------
                            revno: 2555.738.77
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 16:09:17 +0300
                            message:
                              fsp_init_file_page_low(): Zero out the page. (Bug #53306)
                            ------------------------------------------------------------
                            revno: 2555.738.76
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 15:55:10 +0300
                            message:
                              Add Valgrind checks to catch uninitialized writes to data files.
                              buf_flush_insert_into_flush_list(),
                              buf_flush_insert_sorted_into_flush_list(),
                              buf_flush_post_to_doublewrite_buf(): Check that the page is initialized.
                            ------------------------------------------------------------
                            revno: 2555.738.75
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 15:47:44 +0300
                            message:
                              Add Valgrind checks to catch uninitialized writes to data files.
                              buf_flush_insert_into_flush_list(),
                              buf_flush_insert_sorted_into_flush_list(),
                              buf_flush_post_to_doublewrite_buf(): Check that the page is initialized.
                            ------------------------------------------------------------
                            revno: 2555.738.74
                            committer: Marko M?kel? <marko.makela@oracle.com>
                            branch nick: 5.1-innodb
                            timestamp: Tue 2010-05-04 13:55:46 +0300
                            message:
                              Remove UNIV_BTR_AVOID_COPY. It was broken because btr_attach_half_pages()
                              would get the block, new_block in the wrong order.
                              Fixing that would have complicated the function even further
                              for this marginal case.
                        ------------------------------------------------------------
                        revno: 2555.789.2 [merge]
                        author: hery.ramilison@oracle.com
                        committer: MySQL Build Team<build@mysql.com>
                        branch nick: mysql-5.1
                        timestamp: Thu 2010-05-20 01:33:57 +0200
                        message:
                          Merge from mysql-5.1.47-release
                        ------------------------------------------------------------
                        revno: 2555.789.1
                        author: hery.ramilison@oracle.com
                        committer: MySQL Build Team <build@mysql.com>
                        branch nick: mysql-5.1
                        timestamp: Wed 2010-05-05 19:58:16 +0200
                        message:
                          Raise version number after cloning 5.1.47
                    ------------------------------------------------------------
                    revno: 2555.776.34
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-06-01 11:54:06 +0400
                    message:
                      test case fix
                    ------------------------------------------------------------
                    revno: 2555.776.33
                    committer: Mattias Jonsson <mattias.jonsson@sun.com>
                    branch nick: topush-51-bugteam
                    timestamp: Tue 2010-06-01 09:02:28 +0200
                    message:
                      post push fix for bug#49161
                      
                      result file differs on embedded
                    ------------------------------------------------------------
                    revno: 2555.776.32
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Mon 2010-05-31 13:25:11 +0400
                    message:
                      Bug#53942 valgrind warnings with timestamp() function and incomplete datetime values
                      Field_time::get_date method does not initialize MYSQL_TIME::time_type field.
                      The fix is to init this field.
                    ------------------------------------------------------------
                    revno: 2555.776.31 [merge]
                    committer: Mattias Jonsson <mattias.jonsson@sun.com>
                    branch nick: topush-51-bugteam
                    timestamp: Fri 2010-05-28 14:49:25 +0200
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.788.1
                        committer: Mattias Jonsson <mattias.jonsson@sun.com>
                        branch nick: b49161-51-bugteam
                        timestamp: Tue 2010-05-25 15:41:00 +0200
                        message:
                          Bug#49161: Out of memory; restart server and try again (needed 2 bytes)
                          
                          Problem was reporting wrong error
                          
                          Fixed by adding a new error which better explain the problem.
                    ------------------------------------------------------------
                    revno: 2555.776.30
                    committer: <Li-Bing.Song@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2010-05-28 10:57:45 +0800
                    message:
                      Postfix for BUG#49741
                      Add code to waiting for a set of errors.
                      Add code to waiting for an error instead of waiting for io thread to stop, as
                      after 'START SLAVE', the status of io thread is still not running.
                      But it doesn't mean slave io thread encounters an error.
                    ------------------------------------------------------------
                    revno: 2555.776.29
                    committer: Dmitry Lenev <dlenev@mysql.com>
                    branch nick: mysql-5.1-bg46947-small
                    timestamp: Fri 2010-05-28 00:07:40 +0400
                    message:
                      A 5.1-only version of  fix for bug #46947 "Embedded SELECT
                      without FOR UPDATE is causing a lock".
                      
                      SELECT statements with subqueries referencing InnoDB tables
                      were acquiring shared locks on rows in these tables when they
                      were executed in REPEATABLE-READ mode and with statement or
                      mixed mode binary logging turned on.
                      
                      This was a regression which were introduced when fixing
                      bug 39843.
                      
                      The problem was that for tables belonging to subqueries
                      parser set TL_READ_DEFAULT as a lock type. In cases when
                      statement/mixed binary logging at open_tables() time this
                      type of lock was converted to TL_READ_NO_INSERT lock at
                      open_tables() time and caused InnoDB engine to acquire
                      shared locks on reads from these tables. Although in some
                      cases such behavior was correct (e.g. for subqueries in
                      DELETE) in case of SELECT it has caused unnecessary locking.
                      
                      This patch implements minimal version of the fix for the
                      specific problem described in the bug-report which supposed
                      to be not too risky for pushing into 5.1 tree.
                      The 5.5 tree already contains a more appropriate solution
                      which also addresses other related issues like bug 53921
                      "Wrong locks for SELECTs used stored functions may lead
                      to broken SBR".
                      
                      This patch tries to solve the problem by ensuring that
                      TL_READ_DEFAULT lock which is set in the parser for
                      tables participating in subqueries at open_tables()
                      time is interpreted as TL_READ_NO_INSERT or TL_READ.
                      TL_READ is used only if we know that this is a SELECT
                      and that this particular table is not used by a stored
                      function.
                      
                      Test coverage is added for both InnoDB and MyISAM.
                      
                      This patch introduces an "incompatible" change in locking
                      scheme for subqueries used in SELECT ... FOR UPDATE and
                      SELECT .. IN SHARE MODE.
                      
                      In 4.1 (as well as in 5.0 and 5.1 before fix for bug 39843)
                      the server would use a snapshot InnoDB read for subqueries
                      in SELECT FOR UPDATE and SELECT .. IN SHARE MODE statements,
                      regardless of whether the binary log is on or off.
                      
                      If the user required a different type of read (i.e. locking
                      read), he/she could request so explicitly by providing FOR
                      UPDATE/IN SHARE MODE clause for each individual subquery.
                      
                      The patch for bug 39843 broke this behaviour (which was not
                      documented or tested), and started to use locking reads for
                      all subqueries in SELECT ... FOR UPDATE/IN SHARE MODE.
                      This patch restores 4.1 behaviour.
                      
                      This patch should be mostly null-merged into 5.5 tree.
                    ------------------------------------------------------------
                    revno: 2555.776.28
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-27 19:13:53 +0400
                    message:
                      Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins
                      There are two problems:
                      1. In simplify_joins function we calculate table dependencies. If STRAIGHT_JOIN hint
                      is used for whole SELECT we do not count it and as result some dependendecies
                      might be lost. It leads to incorrect table order which is returned by
                      join_tab_cmp_straight() function.
                      2. make_join_statistics() calculate the transitive closure for relations a particular
                      JOIN_TAB is 'dependent on'.
                      We aggregate the dependent table_map of a JOIN_TAB by adding dependencies from other
                      tables which we depend on. However, this may also cause new dependencies to be
                      available after we have completed processing a certain JOIN_TAB.
                      Both these problems affect condition pushdown and as result condition might be pushed
                      into wrong table which leads to crash or even omitted which leads to wrong result.
                      The fix:
                      1. Use modified 'transitive closure' algorithm provided by Ole John Aske
                      2. Update table dependences in simplify_joins according to 
                         global STRAIGHT_JOIN hint.
                      Note: the patch also fixes bugs 46091 & 51492
                    ------------------------------------------------------------
                    revno: 2555.776.27 [merge]
                    committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-27 14:14:27 +0400
                    message:
                      Automerge.
                        ------------------------------------------------------------
                        revno: 2555.786.2
                        committer: Alexey Kopytov <Alexey.Kopytov@Sun.com>
                        branch nick: my51-bug53830
                        timestamp: Tue 2010-05-25 18:43:45 +0400
                        message:
                          Bug #53830: !table || (!table->read_set ||
                                       bitmap_is_set(table->read_set, field_index))
                          
                          UPDATE on an InnoDB table modifying the same index that is used
                          to satisfy the WHERE condition could trigger a debug assertion
                          under some circumstances.
                          
                          Since for engines with the HA_PRIMARY_KEY_IN_READ_INDEX flag
                          set results of an index scan on a secondary index are appended
                          by the primary key value, if a query involves only columns from
                          the primary key and a secondary index, the latter is considered
                          to be covering.
                          
                          That tricks mysql_update() to mark for reading only columns
                          from the secondary index when it does an index scan to retrieve
                          rows to update in case a part of that key is also being
                          updated. However, there may be other columns in WHERE that are
                          part of the primary key, but not the secondary one.
                          
                          What we actually want to do in this case is to add index
                          columns to the existing WHERE columns bitmap rather than
                          replace it.
                    ------------------------------------------------------------
                    revno: 2555.776.26 [merge]
                    committer: Kristofer Pettersson <kristofer.pettersson@oracle.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2010-05-26 17:17:33 +0200
                    message:
                      automerge
                        ------------------------------------------------------------
                        revno: 2555.787.4 [merge]
                        committer: Ramil Kalimullin <ramil@mysql.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-05-25 22:30:08 +0400
                        message:
                          Manual merge.
                            ------------------------------------------------------------
                            revno: 1810.3992.4 [merge]
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Tue 2010-05-25 18:07:47 +0400
                            message:
                              Automerge.
                                ------------------------------------------------------------
                                revno: 1810.3993.1
                                committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                                branch nick: 53908-5.0
                                timestamp: Tue 2010-05-25 10:36:48 -0300
                                message:
                                  Bug#53908: compile failure with embedded enabled
                                  
                                  This fixes a recently introduced regression, where a variable is
                                  not defined for the embedded server. Although the embedded server
                                  is not supported in 5.0, make it at least compile.
                            ------------------------------------------------------------
                            revno: 1810.3992.3
                            committer: Ramil Kalimullin <ramil@mysql.com>
                            branch nick: mysql-5.0-bugteam
                            timestamp: Tue 2010-05-25 17:56:23 +0400
                            message:
                              Fix for bug #53907: Table dump command can be abused to dump arbitrary tables.
                              
                              Problem: one with SELECT privilege on some table may dump other table
                              performing COM_TABLE_DUMP command due to missed check of the table name.
                              
                              Fix: check the table name.
                        ------------------------------------------------------------
                        revno: 2555.787.3
                        committer: Jonathan Perkin <jonathan.perkin@oracle.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-05-25 14:27:52 +0100
                        message:
                          bug#49968: Properly define HAVE_ERRNO_AS_DEFINE for the appropriate
                          OpenBSD releases.
                          
                          Apply patch from Brad Smith, thanks!
                        ------------------------------------------------------------
                        revno: 2555.787.2
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Tue 2010-05-25 11:39:45 +0800
                        message:
                          Postfix BUG#49741
                        ------------------------------------------------------------
                        revno: 2555.787.1
                        committer: <Li-Bing.Song@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Mon 2010-05-24 21:54:08 +0800
                        message:
                          Bug #49741  test files contain explicit references to bin/relay-log positions
                          
                          Some of the test cases reference to binlog position and
                          these position numbers are written into result explicitly.
                          It is difficult to maintain if log event format changes. 
                          
                          There are a couple of cases explicit position number appears, 
                          we handle them in different ways
                          A. 'CHANGE MASTER ...' with MASTER_LOG_POS or/and RELAY_LOG_POS options
                             Use --replace_result to mask them.
                          B. 'SHOW BINLOG EVENT ...'
                             Replaced by show_binlog_events.inc or wait_for_binlog_event.inc. 
                             show_binlog_events.inc file's function is enhanced by given
                             $binlog_file and $binlog_limit.
                          C. 'SHOW SLAVE STATUS', 'show_slave_status.inc' and 'show_slave_status2.inc'
                             For the test cases just care a few items in the result of 'SHOW SLAVE STATUS',
                             only the items related to each test case are showed.
                             'show_slave_status.inc' is rebuild, only the given items in $status_items
                             will be showed.
                             'check_slave_is_running.inc' and 'check_slave_no_error.inc'
                             and 'check_slave_param.inc' are auxiliary files helping
                             to show running status and error information easily.
                    ------------------------------------------------------------
                    revno: 2555.776.25
                    committer: Kristofer Pettersson <kristofer.pettersson@oracle.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2010-05-26 17:13:02 +0200
                    message:
                      Bug#52107 Comment in sql/net_serv.cc still makes "GPL protocol" claim
                      
                      Removed misleading comments.
                    ------------------------------------------------------------
                    revno: 2555.776.24 [merge]
                    committer: Mattias Jonsson <mattias.jonsson@sun.com>
                    branch nick: topush-51-bugteam
                    timestamp: Sun 2010-05-23 18:08:33 +0200
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.786.1
                        committer: Gleb Shchepa <gshchepa@mysql.com>
                        branch nick: 53804-5.1
                        timestamp: Fri 2010-05-21 22:47:32 +0400
                        message:
                          Bug #53804: serious flaws in the alter database .. upgrade
                                      data directory name command
                          
                          The check_db_name function has been modified to validate tails of
                          #mysql50#-prefixed database names for compliance with MySQL 5.0
                          database name encoding rules (the check_table_name function call
                          has been reused).
                    ------------------------------------------------------------
                    revno: 2555.776.23 [merge]
                    committer: Mattias Jonsson <mattias.jonsson@sun.com>
                    branch nick: topush-51-bugteam
                    timestamp: Fri 2010-05-21 14:18:14 +0200
                    message:
                      merge into mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 2555.785.1
                        committer: Mattias Jonsson <mattias.jonsson@sun.com>
                        branch nick: b49477-51-bugteam
                        timestamp: Fri 2009-12-11 18:41:31 +0100
                        message:
                          Bug#49477: Assertion `0' failed in ha_partition.cc:5530
                          with temporary table and partitions
                          
                          It was possible to create temporary partitioned tables
                          via create table ... like ... (which is not allowed with
                          create temporary table). This lead to a new HA_EXTRA flag
                          (HA_EXTRA_MMAP) was sent to the partitioning handler,
                          which was caught on an assert in debug builds.
                          
                          Solution was to check for partitioned tables when
                          doing create table ... like ... and disallow it.
                    ------------------------------------------------------------
                    revno: 2555.776.22
                    committer: Sven Sandberg <sven.sandberg@sun.com>
                    branch nick: 5.1-bugteam
                    timestamp: Thu 2010-05-20 17:38:01 +0200
                    message:
                      BUG#52987: mysqldump fails if umask=0077
                      Problem: The test case mysqldump reads a file that must
                      be world-readable. The test did not force the file to be
                      world-readable, so if the tree was branched with a umask
                      of 0077, the test would fail.
                      Fix: chmod the file.
                    ------------------------------------------------------------
                    revno: 2555.776.21
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-20 10:31:03 +0400
                    message:
                      Bug#52884 mysql-test-run does not work with --debug option
                      Server crashes on 64bit linux with 'double free or corruption'
                      message, on 32bit mysql-test-run silently fails on bootstrap
                      stage. The problem is that FreeState() is called twice
                      for init_settings struct in _db_end_ function.
                      The fix is to remove superfluous FreeState() call.
                      Additional fix:
                      fixed discrepancy of result file when
                      debug & valgrind options are enabled
                      for MTR.
                    ------------------------------------------------------------
                    revno: 2555.776.20 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-20 00:52:03 +0100
                    message:
                      BUG 53621: automerged bzr bundle from bug report.
                        ------------------------------------------------------------
                        revno: 2555.784.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Thu 2010-05-13 16:40:31 +0100
                        message:
                          BUG#53621: check_testcase fails for rpl_do_grant in mysql-5.1-bugteam
                          
                          MTR sporadically reported that rpl_do_grant does not
                          clean up after itself.
                          
                          We fix this by backporting BUG 50984 fix. This deploys
                          missing synchronization between master and slave.
                          
                          Additionally, it also fixes the check_testcase for
                          rpl_tmp_table_and_DDL.
                    ------------------------------------------------------------
                    revno: 2555.776.19 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-20 00:50:42 +0100
                    message:
                      BUG 52868: automerged bzr bundle from bug report.
                        ------------------------------------------------------------
                        revno: 2555.783.1
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2010-04-21 13:47:55 +0100
                        message:
                          BUG#52868: Wrong handling of NULL value during update, replication out
                                     of sync
                          
                          In RBR, sometimes the table->s->last_null_bit_pos can be zero. This
                          has impact at the slave when it compares records fetched from the
                          storage engine against records in the binary log event. If
                          last_null_bit_pos is zero the slave, while comparing in
                          log_event.cc:record_compare function, would set all bits in the last
                          null_byte to 1 (assumed all 8 were unused) . Thence it would loose the
                          ability to distinguish records that were similar in contents except
                          for the fact that some field was null in one record, but not in the
                          other. Ultimately this would cause wrong matches, and in the specific
                          case depicted in the bug report the same record would be updated
                          twice, resulting in a lost update.
                          
                          Additionally, in the record_compare function the slave was setting the
                          X bit unconditionally. There are cases that the X bit does not exist
                          in the record header. This could also lead to wrong matches between
                          records.
                          
                          We fix both by conditionally resetting the bits: (i) unused null_bits
                          are set if last_null_bit_pos > 0; (ii) X bit is set if
                          HA_OPTION_PACK_RECORD is in use.
                    ------------------------------------------------------------
                    revno: 2555.776.18 [merge]
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Thu 2010-05-20 00:49:18 +0100
                    message:
                      BUG 49522: automerged bzr bundle from bug report.
                        ------------------------------------------------------------
                        revno: 2555.782.1 [merge]
                        committer: Luis Soares <luis.soares@sun.com>
                        branch nick: mysql-5.1-bugteam.new
                        timestamp: Fri 2010-05-07 18:48:35 +0100
                        message:
                          BUG#49522: Replication problem with mixed MyISAM/InnoDB
                          
                          When using a non-transactional table (t1) on the master 
                          and with autocommit disabled, no COMMIT is recorded 
                          in the binary log ending the statement. Therefore, if 
                          the slave has t1 in a transactional engine, then it will 
                          be as if a transaction is started but never ends. This is
                          actually BUG#29288 all over again.
                          
                          We fix this by cherrypicking the cset for BUG#29288 which
                          was pushed to a later mysql version. The revision picked
                          was: mats@sun.com-20090923094343-bnheplq8n95opjay .
                          
                          Additionally, a test case for covering the scenario depicted
                          in the bug report is included in this cset.
                            ------------------------------------------------------------
                            revno: 2555.781.1
                            committer: Mats Kindahl <mats@sun.com>
                            branch nick: patching-5.1
                            timestamp: Wed 2009-09-23 11:43:43 +0200
                            message:
                              BUG#29288: myisam transactions replicated to a transactional
                              slave leaves slave unstable
                              
                              Problem: when replicating from non-transactional to
                              transactional engine with autocommit off, no BEGIN/COMMIT
                              is written to the binlog. When the slave replicates, it
                              will start a transaction that never ends.
                              
                              Fix: Force autocommit=on on slave by always replicating
                              autocommit=1 from the master.
                    ------------------------------------------------------------
                    revno: 2555.776.17
                    committer: Tor Didriksen <tor.didriksen@sun.com>
                    branch nick: 5.1-bugteam-bug50087
                    timestamp: Wed 2010-05-19 11:18:59 +0200
                    message:
                      Backport from next-mr-bugfixing of tor.didriksen@sun.com-20100106140051-3j2iuag63eltsr2e
                      
                      Bug #50087 Interval arithmetic for Event_queue_element is not portable.
                      
                      Subtraction of two unsigned months yielded a (very large) positive value.
                      Conversion of this to a signed value was not necessarily well defined.
                                    
                      Solution: do the subtraction on signed values.
                    ------------------------------------------------------------
                    revno: 2555.776.16
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2010-05-18 13:28:21 +0500
                    message:
                      Bug#48729 SELECT ... FROM INFORMATION_SCHEMA.ROUTINES causes memory to grow
                      Analysis showed that in case of accessing I_S table
                      ROUTINES we perform unnecessary allocations
                      with get_field() function for every processed row that
                      in their turn causes significant memory growth.
                      the fix is to avoid use of get_field().
                    ------------------------------------------------------------
                    revno: 2555.776.15 [merge]
                    committer: Andrei Elkin <aelkin@mysql.com>
                    branch nick: 5.1-bt
                    timestamp: Sun 2010-05-16 20:03:32 +0300
                    message:
                      pushing bug#50942 fixes to 5.1-bt
                        ------------------------------------------------------------
                        revno: 2555.780.1
                        committer: Andrei Elkin <aelkin@mysql.com>
                        branch nick: 5.1-bt-bug50942-mix_innodb_myisam_side_effects-non_det
                        timestamp: Tue 2010-05-04 22:31:49 +0300
                        message:
                          Bug #50942  	mix_innodb_myisam_side_effects.test is not deterministic 
                          
                          The test was used to fail because of 
                           UPDATE t3,t4 SET t3.a=t4.a + bug27417(1);
                          did not prescribe the order of two row operations implied by the update.
                          
                          Fixed with forcing the order with adding a where condition w/o
                          affecting the former bug fixes logics.
                    ------------------------------------------------------------
                    revno: 2555.776.14
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2010-05-16 15:37:44 +0100
                    message:
                      BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed
                      mode
                            
                      Post-push fix after backporting the patch to 5.1-bugteam:
                      
                        1 - changed the name of some variables to be equivalent to pe.
                        2 - fixed that patch to mark a statement as unsafe when both a
                        self-logging eng. and regular eng. are accessed and one of them
                        is updated.
                    ------------------------------------------------------------
                    revno: 2555.776.13
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2010-05-16 12:45:21 +0100
                    message:
                      BUG#50410: rpl_ndb tests should run with binlog_format=row
                      
                      Post-fix: Updated a test case after the patch for BUG#50410,
                      because the patch makes ndb to run in the row format and as
                      such unsafe warning messages are not printed out.
                    ------------------------------------------------------------
                    revno: 2555.776.12
                    committer: Gleb Shchepa <gshchepa@mysql.com>
                    branch nick: 53450-5.1
                    timestamp: Fri 2010-05-14 15:36:27 +0400
                    message:
                      Bug #53450: Crash / assertion "virtual int
                                  ha_myisam::index_first(uchar*)") at assert.c:81
                      
                      Single-table DELETE crash/assertion similar to single-table
                      UPDATE bug 14272.
                      
                      Same resolution as for the bug 14272:
                      Don't run index scan when we should use quick select.
                      This could cause failures because there are table handlers (like federated)
                      that support quick select scanning but do not support index scanning.
                    ------------------------------------------------------------
                    revno: 2555.776.11
                    committer: Ramil Kalimullin <ramil@mysql.com>
                    branch nick: b52051-5.1-bugteam
                    timestamp: Wed 2010-05-12 20:10:33 +0400
                    message:
                            Fix for bug#52051: Aggregate functions incorrectly returns
                            NULL from outer join query
                            
                            Problem: optimising MIN/MAX() queries without GROUP BY clause
                            by replacing the aggregate expression with a constant, we may set it
                            to NULL disregarding the fact that there may be outer joins involved.
                            
                            Fix: don't replace MIN/MAX() with NULL if there're outer joins.
                            
                            Note: the fix itself is just
                            - if (!count)
                            + if (!count && !outer_tables)
                                set to NULL
                            
                            The rest of the patch eliminates repeated code to improve speed
                            and for easy maintenance of the code.
                    ------------------------------------------------------------
                    revno: 2555.776.10
                    committer: Staale Smedseng <staale.smedseng@sun.com>
                    branch nick: 49756-51
                    timestamp: Wed 2010-05-12 13:19:12 +0200
                    message:
                      Bug #49756 Rows_examined is always 0 in the slow query log for
                      update statements
                            
                      Only SELECT statements report any examined rows in the slow
                      log. Slow UPDATE, DELETE and INSERT statements report 0 rows
                      examined, unless the statement has a condition including a
                      SELECT substatement.
                            
                      This patch adds counting of examined rows for the UPDATE and
                      DELETE statements. An INSERT ... VALUES statement will still 
                      not report any rows as examined.
                    ------------------------------------------------------------
                    revno: 2555.776.9
                    committer: Sven Sandberg <sven.sandberg@sun.com>
                    branch nick: 5.1-bugteam
                    timestamp: Wed 2010-05-12 12:29:02 +0200
                    message:
                      BUG#50410: rpl_ndb tests should run with binlog_format=row
                      Problem: The rpl_ndb did not set binlog_format explicitly. Since
                      the default is binlog_format=statement, it means that the suite
                      ran with that. ndb does not support binlog_format=statement,
                      and many tests were skipped because they sourced
                      include/have_binlog_format_row_or_mixed.inc
                      Fix: set binlog_format=row explicitly in the configuration file
                      for the rpl_ndb suite.
                    ------------------------------------------------------------
                    revno: 2555.776.8 [merge]
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt-null_upmerge
                    timestamp: Tue 2010-05-11 16:39:51 +0200
                    message:
                      Null merge: Backport of fix for Bug#48157.
                        ------------------------------------------------------------
                        revno: 1810.3992.2
                        committer: Martin Hansson <martin.hansson@sun.com>
                        branch nick: 5.0bt
                        timestamp: Tue 2010-05-11 16:21:05 +0200
                        message:
                          Bug#48157: crash in Item_field::used_tables
                                
                          MySQL handles the join syntax "JOIN ... USING( field1,
                          ... )" and natural joins by building the same parse tree as
                          a corresponding join with an "ON t1.field1 = t2.field1 ..."
                          expression would produce. This parse tree was not cleaned up
                          properly in the following scenario. If a thread tries to
                          lock some tables and finds that the tables were dropped and
                          re-created while waiting for the lock, it cleans up column
                          references in the statement by means a per-statement free
                          list. But if the statement was part of a stored procedure,
                          column references on the stored procedure's free list
                          weren't cleaned up and thus contained pointers to freed
                          objects.
                                
                          Fixed by adding a call to clean up the current prepared
                          statement's free list.
                          
                          This is a backport from MySQL 5.1
                    ------------------------------------------------------------
                    revno: 2555.776.7 [merge]
                    committer: Mattias Jonsson <mattias.jonsson@sun.com>
                    branch nick: topush-51-bugteam_2
                    timestamp: Mon 2010-05-10 15:17:06 +0200
                    message:
                      merge
                        ------------------------------------------------------------
                        revno: 2555.779.1 [merge]
                        committer: Mattias Jonsson <mattias.jonsson@sun.com>
                        branch nick: topush-51-bugteam
                        timestamp: Tue 2010-05-04 14:26:44 +0200
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.778.2
                            committer: Mattias Jonsson <mattias.jonsson@sun.com>
                            branch nick: b50561-51-bugteam_name_lock_fix
                            timestamp: Thu 2010-03-18 14:04:19 +0100
                            message:
                              Additional fix for DEBUG_SYNC which failed for some rpl-tests,
                              due to DBUG_ASSERT. (added in bug#50561)
                            ------------------------------------------------------------
                            revno: 2555.778.1
                            committer: Mattias Jonsson <mattias.jonsson@sun.com>
                            branch nick: b50561-51-bugteam_name_lock_fix
                            timestamp: Wed 2010-03-17 15:10:41 +0100
                            message:
                              Bug#50561: ALTER PARTITIONS does not have adequate lock, breaks with
                              concurrent I_S query
                              
                              There were two problem:
                              1) MYSQL_LOCK_IGNORE_FLUSH also ignored name locks
                              2) there was a race between abort_and_upgrade_locks and
                                 alter_close_tables
                                 (i.e. remove_table_from_cache and
                                  close_data_files_and_morph_locks)
                              
                              Which allowed the table to be opened with MYSQL_LOCK_IGNORE_FLUSH flag
                              resulting in renaming a partition that was already in use,
                              which could cause the table to be unusable.
                              
                              Solution was to not allow IGNORE_FLUSH to skip waiting for
                              a named locked table.
                              
                              And to not release the LOCK_open mutex between the
                              calls to remove_table_from_cache and
                              close_data_files_and_morph_locks by merging the functions
                              abort_and_upgrade_locks and alter_close_tables.
                    ------------------------------------------------------------
                    revno: 2555.776.6
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt
                    timestamp: Mon 2010-05-10 09:23:23 +0200
                    message:
                      Bug#50939: Loose Index Scan unduly relies on engine to
                      remember range endpoints
                      
                      The Loose Index Scan optimization keeps track of a sequence
                      of intervals. For the current interval it maintains the
                      current interval's endpoints. But the maximum endpoint was
                      not stored in the SQL layer; rather, it relied on the
                      storage engine to retain this value in-between reads. By
                      coincidence this holds for MyISAM and InnoDB. Not for the
                      partitioning engine, however.
                      
                      Fixed by making the key values iterator 
                      (QUICK_RANGE_SELECT) keep track of the current maximum endpoint.
                      This is also more efficient as we save a call through the
                      handler API in case of open-ended intervals.
                      
                      The code to calculate endpoints was extracted into 
                      separate methods in QUICK_RANGE_SELECT, and it was possible to
                      get rid of some code duplication as part of fix.
                    ------------------------------------------------------------
                    revno: 2555.776.5
                    committer: Jim Winstead <jimw@mysql.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2010-05-09 20:02:05 -0700
                    message:
                      Using an initial command with mysql_options(..., MYSQL_INIT_COMMAND, ...)
                      that generated multiple result sets (such as a stored procedure or a
                      multi-statement command) would leave the connection unusable. (Bug #42373)
                      
                      A side-effect of this bug fix is to make MYSQL_INIT_COMMAND settings ignored
                      when connecting from within the server, but none of the existing mechanisms
                      for connecting from within the server use or need to set the initial command.
                    ------------------------------------------------------------
                    revno: 2555.776.4
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2010-05-09 23:45:25 +0100
                    message:
                      BUG#49019 Mixing self-logging eng. and regular eng. does not switch to row in mixed mode
                      
                      Backport of the patch for 5.1-bugteam.
                    ------------------------------------------------------------
                    revno: 2555.776.3
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.1-bugteam
                    timestamp: Sat 2010-05-08 11:25:33 +0800
                    message:
                      Bug#53189 Table map version unused and can be removed
                      
                      MYSQL_BIN_LOG m_table_map_version member and it's associated 
                      functions were not used in the logic of binlogging and replication,
                      this patch removed all related code.
                    ------------------------------------------------------------
                    revno: 2555.776.2 [merge]
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt-upmerge
                    timestamp: Fri 2010-05-07 09:12:16 +0200
                    message:
                      Merge of fix for Bug#52357
                        ------------------------------------------------------------
                        revno: 2555.777.2
                        committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-05-07 10:38:42 +0500
                        message:
                          Bug#53334 Incorrect result for InnoDB in LEFT JOIN with impossible condition
                          The fix actually reverts the change introduced
                          by the patch for bug 51494.
                          The fact is that patches for bugs 52177&48419
                          fix bugs 51194&50575 as well.
                        ------------------------------------------------------------
                        revno: 2555.777.1
                        committer: Gleb Shchepa <gshchepa@mysql.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Fri 2010-05-07 00:41:37 +0400
                        message:
                          Bug #53088: mysqldump with -T & --default-character-set set
                                      truncates text/blob to 766 chars
                          
                          mysqldump and SELECT ... INTO OUTFILE truncated long BLOB/TEXT
                          values to size of 766 bytes (MAX_FIELD_WIDTH or 255 * 3 + 1).
                          
                          The select_export::send_data method has been modified to
                          reallocate a conversion buffer for long field data.
                    ------------------------------------------------------------
                    revno: 2555.776.1 [merge]
                    committer: Martin Hansson <martin.hansson@sun.com>
                    branch nick: 5.1bt-upmerge
                    timestamp: Thu 2010-05-06 10:59:28 +0200
                    message:
                      Merge of fix for Bug#52357
                        ------------------------------------------------------------
                        revno: 1810.3992.1
                        committer: Martin Hansson <martin.hansson@sun.com>
                        branch nick: 5.0bt
                        timestamp: Thu 2010-05-06 10:45:00 +0200
                        message:
                          Bug#52357: Assertion failed: join->best_read in
                          greedy_search optimizer_search_depth=0
                          
                          The algorithm inside restore_prev_nj_state failed to
                          properly update the counters within the NESTED_JOIN
                          tree. The counter was decremented each time a table in the
                          node was removed from the QEP, the correct thing to do being
                          only to decrement it when the last table in the child node
                          was removed from the plan. This lead to node counters
                          getting negative values and the plan thus appeared
                          impossible. An assertion caught this.
                          
                          Fixed by not recursing up the tree unless the last table in
                          the join nest node is removed from the plan
------------------------------------------------------------
revno: 3887 [merge]
committer: Pekka Nousiainen <pekka@mysql.com>
branch nick: ms-bug57396-71
timestamp: Wed 2010-10-13 21:23:18 +0300
message:
  merge
    ------------------------------------------------------------
    revno: 3362.76.68 [merge]
    committer: Pekka Nousiainen <pekka@mysql.com>
    branch nick: ms-bug57396-70
    timestamp: Wed 2010-10-13 21:10:04 +0300
    message:
      merge
        ------------------------------------------------------------
        revno: 2585.162.9
        committer: Pekka Nousiainen <pekka@mysql.com>
        branch nick: ms-bug57396-63
        timestamp: Wed 2010-10-13 20:36:52 +0300
        message:
          bug#57396 a01_patch.diff
          MRR empty range sets wrong index attr id
------------------------------------------------------------
revno: 3886 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-13 19:20:25 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.67
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 19:17:01 +0200
    message:
      ndb - fix windows warnings
------------------------------------------------------------
revno: 3885 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Wed 2010-10-13 17:05:36 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.66
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-13 17:04:06 +0200
    message:
      ndb
       - properly break for loop when the right even type is found
    ------------------------------------------------------------
    revno: 3362.76.65
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-13 15:56:13 +0200
    message:
      ndb - fix the deprecation warning for Id to point at NodeId
    ------------------------------------------------------------
    revno: 3362.76.64
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 14:22:51 +0200
    message:
      ndb - add sh> ndb_mgm -e "all report eventlog" - which dumps a new circular event log inside datanodes
    ------------------------------------------------------------
    revno: 3362.76.63
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 12:49:04 +0200
    message:
      ndb - cmvmi cleanup, use blocks array instead of 1 line per block in dump-state
------------------------------------------------------------
revno: 3884 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-13 12:37:54 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.62
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 12:35:05 +0200
    message:
      ndb - fix result file for ndb_config
    ------------------------------------------------------------
    revno: 3362.76.61
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 12:31:47 +0200
    message:
      ndb - fix randomly failing testcases, as dump/error-insert is not syncronous, by adding an explict SYNC_REQ afterwards, which makes sure that previous signal has reach final destination
------------------------------------------------------------
revno: 3883 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Wed 2010-10-13 11:43:39 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.60
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-13 11:33:02 +0200
    message:
      Bug#57381 typo in ndb_mgmd: "depricated"
       - Fixes all spelling errors of deprecated in storage/ndb to avoid future copy/paste error
       - Fixes the deprecation error message for PortNumber to not say anything about
         another parameter to use.
    ------------------------------------------------------------
    revno: 3362.76.59
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 7.0
    timestamp: Wed 2010-10-13 10:52:53 +0200
    message:
      ndb
       - print extra debug information before crashing while "restoring schema during restart"
         to make it easier to determine exactly which problem was hit.
       - remove the reference to "perror" since that usually does not give any extra
         information in these cases(avoid confusion)
------------------------------------------------------------
revno: 3882 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-13 08:31:44 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.58
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-13 08:15:20 +0200
    message:
      ndb - create struct that keeps node-info in ndbapi, new = trp_node, old = ClusterMgr::Node
------------------------------------------------------------
revno: 3881 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-12 16:14:17 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.57
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-12 16:11:45 +0200
    message:
      ndb - bug#56285 - send ABORT_BACKUP_ORD to correct block (iff using ndbmtd)
------------------------------------------------------------
revno: 3880 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-12 14:06:33 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.56
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-12 14:02:53 +0200
    message:
      ndb - make all callers of TransporterRegistry::pollReceive(), performReceive() use same method, TransporterFacade::external_poll
------------------------------------------------------------
revno: 3879 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-11 13:21:38 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.55
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-11 13:19:57 +0200
    message:
      ndb - bah forgot to commit result file
------------------------------------------------------------
revno: 3878 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-11 09:05:03 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.54
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-11 08:48:37 +0200
    message:
      ndb - bug#57360 - readd max_rows hack
    ------------------------------------------------------------
    revno: 3362.76.53
    committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2010-10-08 15:51:37 +0200
    message:
      clean swig
------------------------------------------------------------
revno: 3877 [merge]
committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
branch nick: mysql-5.1-telco-7.1
timestamp: Fri 2010-10-08 14:45:40 +0200
message:
  remove swig
    ------------------------------------------------------------
    revno: 3362.76.52 [merge]
    committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2010-10-08 14:29:13 +0200
    message:
      remove swig
        ------------------------------------------------------------
        revno: 2585.162.8 [merge]
        committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Fri 2010-10-08 14:16:20 +0200
        message:
          remove swig
            ------------------------------------------------------------
            revno: 2572.82.30
            committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
            branch nick: mysql-5.1-telco-6.2
            timestamp: Fri 2010-10-08 14:07:07 +0200
            message:
              remove swig
    ------------------------------------------------------------
    revno: 3362.76.51
    committer: Bernhard Ocklin <bocklin@peek01.mysql.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Fri 2010-10-08 14:26:32 +0200
    message:
      remove swig files
------------------------------------------------------------
revno: 3876 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-08 14:30:06 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.50
    committer: Maitrayi Sabaratnam <msabaratnam@mysql.com>
    branch nick: mysql-5.1-telco-7.0-dev
    timestamp: Fri 2010-10-08 10:31:34 +0200
    message:
      Bug#57336: Use instance no instead of its index when finding next instance
------------------------------------------------------------
revno: 3875 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-07 13:26:28 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.49
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-07 13:24:22 +0200
    message:
      ndb - bug#57307 - only look at m_scan_frag_conf_status when aborting scans in DBTC
------------------------------------------------------------
revno: 3874 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-07 11:43:22 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.48
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-07 11:36:21 +0200
    message:
      ndb - add method to get node-bitmask out of pollReceive...Change to always use m_has_data_transporter regardless of epoll/poll/select
------------------------------------------------------------
revno: 3873 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-10-07 07:42:29 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.47
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-10-07 07:39:39 +0200
    message:
      ndb - remove unneeded and annoying includes of mysys (can e.g cause conflicting definition of NdbMutex)
------------------------------------------------------------
revno: 3872 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-06 14:43:52 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.46
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-06 14:35:34 +0200
    message:
      ndb - refactor PollGuard by moving poll-queue into TransporterFacade
------------------------------------------------------------
revno: 3871 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-06 11:20:01 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.45
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-06 11:19:14 +0200
    message:
      ndb - bah, broken index-scan when fixing the long/short handling
------------------------------------------------------------
revno: 3870 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-06 11:01:16 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.44 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-06 10:59:33 +0200
    message:
      ndb - merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.7
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2010-10-06 10:54:50 +0200
        message:
          ndb - bug#51775 - Make sure that we don't get woken up if not waiting
------------------------------------------------------------
revno: 3869 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-10-06 09:33:12 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.43
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-10-06 09:14:56 +0200
    message:
      ndb - another fix of sending short scanfragreq (discovered by "testScan -n Bug54945")
------------------------------------------------------------
revno: 3868 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-05 16:28:17 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.42
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-05 16:27:00 +0200
    message:
      ndb - move PollQuard out-of TransporterFacade.*pp
    ------------------------------------------------------------
    revno: 3362.76.41
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-05 15:38:17 +0200
    message:
      ndb - cleanup handlehandleReceivedSignal by setting theWaiter.set_state() from only 1 place
------------------------------------------------------------
revno: 3867 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Tue 2010-10-05 12:12:53 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.40
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Tue 2010-10-05 12:02:43 +0200
    message:
      ndb - fix upgrade bug (introduced by logn-scanfragreq patch)
------------------------------------------------------------
revno: 3866 [merge]
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 7.1
timestamp: Tue 2010-10-05 10:00:03 +0200
message:
  Merge 7.0 -> 7.1
    ------------------------------------------------------------
    revno: 3362.76.39 [merge]
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: mysql-5.1-telco-7.0
    timestamp: Tue 2010-10-05 09:56:47 +0200
    message:
      Merge
        ------------------------------------------------------------
        revno: 3362.77.4 [merge]
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-01 15:34:24 +0200
        message:
          Merge 7.0-seagull-wl2679 -> 7.0
            ------------------------------------------------------------
            revno: 3362.78.1
            committer: Magnus Bl?udd <magnus.blaudd@sun.com>
            branch nick: 7.0-seagull-wl2679
            timestamp: Fri 2010-10-01 15:20:38 +0200
            message:
              ndb
               - Revert addition of the handler::bulk_delete_row function which
                 was added as part of WL#2679 and instead set a ha_ndbcluster
                  flag in start_bulk_delete() which will indicate to
                  ha_ndbcluster::delete_row() that bulk delete is active.
                  Reset the flag and flush any outstanding deletes
                  in ha_ndbcluster::end_bulk_delete()
               - Extend the ndb_bulk_delete test case with a table with more rows
                 and more IN values which triggers ha_nddbcluster to
                 flush the deletes because it runs out of batch memory space.
        ------------------------------------------------------------
        revno: 3362.77.3
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-01 13:58:28 +0200
        message:
          ndb
           - mark ha_ndbcluster::uses_blob_value()  as const
        ------------------------------------------------------------
        revno: 3362.77.2
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-01 13:47:21 +0200
        message:
          ndb
           - Reduce MCP by reverting format changes
        ------------------------------------------------------------
        revno: 3362.77.1
        committer: Magnus Bl?udd <magnus.blaudd@sun.com>
        branch nick: 7.0
        timestamp: Fri 2010-10-01 13:19:52 +0200
        message:
          ndb
           - Reduce MCP by removing unused define SOCKET_ECONNREFUSED
------------------------------------------------------------
revno: 3865 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-04 21:45:27 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.38
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 21:38:02 +0200
    message:
      ndb - change constructor on PollGuard
    ------------------------------------------------------------
    revno: 3362.76.37
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 21:22:21 +0200
    message:
      ndb - remove NdbDictionaryInterface::m_waiter and instead NdbImpl::theWaiter
------------------------------------------------------------
revno: 3864 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-04 13:36:14 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.36
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 13:32:55 +0200
    message:
      ndb - allow ScanFragNextReq to modify batch_size
    ------------------------------------------------------------
    revno: 3362.76.35
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 13:13:48 +0200
    message:
      ndb - improve printout on drop nodegroup
    ------------------------------------------------------------
    revno: 3362.76.34
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 13:13:22 +0200
    message:
      ndb - replace ScanFragNextReq::closeFlag with ScanFragNextReq::requestInfo
    ------------------------------------------------------------
    revno: 3362.76.33
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 13:07:50 +0200
    message:
      ndb - make Backup and Suma send long-scan-fragreq, and not use ScanFragReq::setAttrLen (which is redundant)
------------------------------------------------------------
revno: 3863 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Mon 2010-10-04 10:55:52 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.32
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 10:52:52 +0200
    message:
      ndb - bug#57164 - serialize first SUB_START wrt CREATE/DROP nodegroup by wrapping first SUB_START in schema-transaction
    ------------------------------------------------------------
    revno: 3362.76.31
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Mon 2010-10-04 10:31:18 +0200
    message:
      ndb - fix SUB_GCP_COMPLETE_ACK wrt to API_SIGNAL_LOG
------------------------------------------------------------
revno: 3862 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Sat 2010-10-02 21:53:25 -0700
message:
  crund - cosmetics
    ------------------------------------------------------------
    revno: 3856.1.3
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Sat 2010-10-02 21:52:07 -0700
    message:
      crund - cosmetics
    ------------------------------------------------------------
    revno: 3856.1.2
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Sat 2010-10-02 21:49:10 -0700
    message:
      crund - cosmetics
------------------------------------------------------------
revno: 3861 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Sat 2010-10-02 21:34:04 -0700
message:
  crund - added LockMode property to TWS benchmark
    ------------------------------------------------------------
    revno: 3856.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Sat 2010-10-02 21:32:37 -0700
    message:
      crund - added LockMode property to TWS benchmark
------------------------------------------------------------
revno: 3860 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Fri 2010-10-01 23:09:35 -0700
message:
  ndbjtie - fixed mapping of NdbRecord-related functions.
    ------------------------------------------------------------
    revno: 3858.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-ndbjtie-fixes
    timestamp: Fri 2010-10-01 23:07:43 -0700
    message:
      ndbjtie - fixed mapping of NdbRecord-related functions.
------------------------------------------------------------
revno: 3859 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Sat 2010-10-02 07:17:11 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.30
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 20:49:35 +0200
    message:
      ndb - attempt to fix introduced valgrind warning
------------------------------------------------------------
revno: 3858 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-01 13:52:02 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.29
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 13:43:32 +0200
    message:
      ndb - move ArbitMgr-object from TransporterFacade to ClusterMgr
    ------------------------------------------------------------
    revno: 3362.76.28
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 13:35:36 +0200
    message:
      ndb - make ClusterMgr any other TransporterFacade client using fix-blockno (instead of hardcoded into TF
    ------------------------------------------------------------
    revno: 3362.76.27
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 13:00:38 +0200
    message:
      ndb - replace TransporterFacade::ReportNodeXXX with TransporterFacade::trp_node_status, which reports even to all clients
------------------------------------------------------------
revno: 3857 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-01 12:12:43 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.26 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 12:08:29 +0200
    message:
      ndb merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.6
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-01 11:45:39 +0200
        message:
          ndb - replace mysterious arguments for NodeStatusFunction with an enum
        ------------------------------------------------------------
        revno: 2585.162.5
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-01 11:33:24 +0200
        message:
          ndb - decrease extent size to avoid spurious table-full in ndb_partition_range
        ------------------------------------------------------------
        revno: 2585.162.4
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Fri 2010-10-01 09:50:17 +0200
        message:
          ndb - extend TS size in ndb_dd_dump causing spurious table-full errors
    ------------------------------------------------------------
    revno: 3362.76.25
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 11:47:11 +0200
    message:
      ndb - fix copyright header on new file
------------------------------------------------------------
revno: 3856 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Fri 2010-10-01 02:03:06 -0700
message:
  crund - minor cleanups
    ------------------------------------------------------------
    revno: 3854.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt32
    timestamp: Fri 2010-10-01 01:58:08 -0700
    message:
      crund - minor cleanups
------------------------------------------------------------
revno: 3855 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Fri 2010-10-01 09:47:41 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.24
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 09:44:39 +0200
    message:
      ndb - forgot to add file :-(
    ------------------------------------------------------------
    revno: 3362.76.23
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Fri 2010-10-01 09:38:17 +0200
    message:
      ndb - remove ExecuteFunction/NodeStatusFunction and replace with virtual class instead
------------------------------------------------------------
revno: 3854 [merge]
committer: Martin Zaun <martin.zaun@oracle.com>
branch nick: ndb-7.1
timestamp: Thu 2010-09-30 22:11:47 -0700
message:
  crund - fixes and cleanups
    ------------------------------------------------------------
    revno: 3848.1.1
    committer: Martin Zaun <martin.zaun@oracle.com>
    branch nick: ndb-7.1-opt64
    timestamp: Thu 2010-09-30 21:10:21 -0700
    message:
      crund - fixes and cleanups
------------------------------------------------------------
revno: 3853 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-09-30 17:27:07 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.22
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 17:26:18 +0200
    message:
      ndb - compiler warnings
------------------------------------------------------------
revno: 3852 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-09-30 16:35:38 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.21
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 16:27:18 +0200
    message:
      ndb - rework getRestartGCI, remove NdbTamper
------------------------------------------------------------
revno: 3851 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-09-30 15:00:42 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.20
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 14:52:55 +0200
    message:
      ndb - fix compiler warning
------------------------------------------------------------
revno: 3850 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-09-30 13:56:05 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.19
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 13:52:49 +0200
    message:
      ndb - this patch moves m_trans_id-handling from TransporterFacade to ndb_cluster_connection
    ------------------------------------------------------------
    revno: 3362.76.18
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 12:36:47 +0200
    message:
      ndb - this patch moves ndbapi config parameters (batch size etc) from TransporterFacade to ndb_cluster_connection
    ------------------------------------------------------------
    revno: 3362.76.17
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 11:37:36 +0200
    message:
      ndb - remove unused declaration
    ------------------------------------------------------------
    revno: 3362.76.16
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 11:32:28 +0200
    message:
      ndb - more work on includes in ndbapi, core idea is to reclaim control over TransporterFacade
------------------------------------------------------------
revno: 3849 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Thu 2010-09-30 09:32:49 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.15
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Thu 2010-09-30 09:19:22 +0200
    message:
      ndb - fix incorrect include and a compiler warning
------------------------------------------------------------
revno: 3848 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-09-29 15:31:01 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.14
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-09-29 15:27:36 +0200
    message:
      ndb - change default interpret_exit_nok error code to 626 instead of 899 that is used for something else...
    ------------------------------------------------------------
    revno: 3362.76.13
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-09-29 15:25:19 +0200
    message:
      ndb - make received signal const in ndbapi
------------------------------------------------------------
revno: 3847 [merge]
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-09-29 13:56:15 +0200
message:
  ndb - bump version to 7.1.9
    ------------------------------------------------------------
    revno: 3362.76.12 [merge]
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-09-29 13:53:30 +0200
    message:
      ndb merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.3
        committer: Jonas Oreland <jonas@mysql.com>
        branch nick: telco-6.3
        timestamp: Wed 2010-09-29 13:50:29 +0200
        message:
          ndb - bump version to 6.3.39
    ------------------------------------------------------------
    revno: 3362.76.11
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-09-29 13:51:14 +0200
    message:
      ndb - bump version to 7.0.20
------------------------------------------------------------
revno: 3846
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-09-29 13:51:49 +0200
message:
  ndb - bump version to 7.1.9
------------------------------------------------------------
revno: 3845 [merge]
tags: clone-mysql-5.1.47-ndb-7.1.8-src-build
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-7.1
timestamp: Wed 2010-09-29 13:49:00 +0200
message:
  ndb - merge 70 to 71
    ------------------------------------------------------------
    revno: 3362.76.10 [merge]
    tags: clone-mysql-5.1.47-ndb-7.0.19-src-build
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-7.0
    timestamp: Wed 2010-09-29 13:01:55 +0200
    message:
      ndb merge 63 to 70
        ------------------------------------------------------------
        revno: 2585.162.2 [merge]
        tags: clone-mysql-5.1.47-ndb-6.3.38-src-build
        committer: Martin Skold <Martin.Skold@mysql.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Wed 2010-09-29 12:55:48 +0200
        message:
          Merge
        ------------------------------------------------------------
        revno: 2585.162.1
        committer: Martin Skold <Martin.Skold@mysql.com>
        branch nick: mysql-5.1-telco-6.3
        timestamp: Mon 2010-09-13 10:06:11 +0200
        message:
          Bug#55909 ndb_binlog_index missing entry on normal mysqld shutdown: Added retry during shutdown
