------------------------------------------------------------
revno: 3018
tags: mysql-5.1.35-ndb-6.3.26
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Sat 2009-08-22 21:37:36 +0200
message:
  ndb - fix bug in bug-fix for 46651
    access dyn-mask using uint32* otherwise the result is incorrect for
    big endian (e.g sparc)
------------------------------------------------------------
revno: 3017
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-08-21 15:07:46 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.37
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Fri 2009-08-21 15:05:47 +0200
    message:
      ndb - Bug36702 - forgot to add test-case
------------------------------------------------------------
revno: 3016
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-08-21 12:57:08 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.36
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Fri 2009-08-21 11:39:39 +0200
    message:
      ndb - release sections if parse error during Dbdict::create file{group}
------------------------------------------------------------
revno: 3015
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-08-21 12:55:49 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.35
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Fri 2009-08-21 11:35:23 +0200
    message:
      ndb - bug#36702
        Handle cluster crash during create file{group}
------------------------------------------------------------
revno: 3014
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-08-21 12:22:43 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.34
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Fri 2009-08-21 11:26:34 +0200
    message:
      ndb - 
        complete basepath concept, by forcing sender of FsOpenReq to specify basepath
        (if using v4-filenames)
      
        This unifies Filename.set() and removes hard-coded basepath's in Ndbfs
      
        This is a preparation for fix of bug 36072
------------------------------------------------------------
revno: 3013
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Wed 2009-08-19 12:12:07 +0200
message:
  ndb - bug - 46561
    no fix, just more printouts to hopefully find problem...
------------------------------------------------------------
revno: 3012
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-08-18 15:09:00 +0200
message:
  ndb - bug#44563 - remove obsolete warning message
------------------------------------------------------------
revno: 3011
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-08-18 15:02:20 +0200
message:
  ndb - bug#43139
    Add the option to allow columns to be ignored if there are more
    columns in the backup than in the database
------------------------------------------------------------
revno: 3010
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-08-18 08:57:20 +0200
message:
  ndb - bug#46412
    Fix/handle incorrectly set lcp-bits during system restart
------------------------------------------------------------
revno: 3009
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-08-17 09:25:41 +0200
message:
  ndb - bug#46651 - fix handling of VAR_PART-bit
------------------------------------------------------------
revno: 3008
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Wed 2009-08-12 20:09:07 +0200
message:
  ndb - bug#45899 - disable previous fix as it cause many tsts to fail in autotest
------------------------------------------------------------
revno: 3007
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Wed 2009-08-12 20:05:38 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.33
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Wed 2009-08-12 19:25:43 +0200
    message:
      ndb - bug#45899
        Fix bug in previous patch, causing platforms
        with CLOCK_MONOTONIC but not PTHREAD_CONDATTR_SETCLOCK
        to misbehave (e.g dl145a-c)
------------------------------------------------------------
revno: 3006
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-08-07 13:59:45 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.32
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Fri 2009-08-07 13:54:37 +0200
    message:
      ndb - bug#46069
        Fix crash in ACC caused by assertion fire-ing due to TUX LOCK_REQ
          did not set OP_COMMIT_DELETE_CHECK during setup
------------------------------------------------------------
revno: 3005
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Wed 2009-08-05 11:54:52 +0200
message:
  ndb - bug#46494 - test
    Add ability to do post upgrade verification
    This is done by restarting test-program binary in new version
    with the testcase being altered "X" becomes "X--post-upgrade"
------------------------------------------------------------
revno: 3004
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-08-04 14:09:15 +0200
message:
  merge 63-main
    ------------------------------------------------------------
    revno: 3002.1.1
    committer: Frazer Clement <frazer@mysql.com>
    branch nick: mysql-5.1-telco-6.3
    timestamp: Tue 2009-08-04 12:17:55 +0100
    message:
      Merge 6.2->6.3
    ------------------------------------------------------------
    revno: 2572.59.31
    committer: Frazer Clement <frazer@mysql.com>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Tue 2009-08-04 11:52:04 +0100
    message:
      Bug#46490 : Full table scan hangs with more than 21 fragments
------------------------------------------------------------
revno: 3003
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-08-04 12:01:27 +0200
message:
  ndb - bug#45971 - crash during optimize table, make sure free list are searched correctly
                    reuse get_alloc_page (with size + 1) since index might grow
        bug#43683 - optimize table does not return memory,
                    try to move to page with *least* amount of free space
------------------------------------------------------------
revno: 3002
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-08-03 15:03:32 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.30
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-08-03 14:19:42 +0200
    message:
      ndb - bug#46243
        Fix so that FileSystmPath[DD/DataFiles/UndoFiles] is cleared
        even if they have identical value as FileSystemPath
    ------------------------------------------------------------
    revno: 2572.59.29
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-08-03 13:28:27 +0200
    message:
      ndb - bug#46242
        1) allow stray ";" at end of config values
        2) fix spelling in error message 
    ------------------------------------------------------------
    revno: 2572.59.28
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Thu 2009-07-16 21:04:37 +0200
    message:
      ndb - revert the setting of --parallel=auto, still too unstable under load
    ------------------------------------------------------------
    revno: 2572.59.27
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Wed 2009-07-15 20:14:13 +0200
    message:
      BUG#46183 Cluster query performance regression on Solaris
       - make it possible to control which processes use monotonic timers
         by adding a global variable read by 'ndb_init' that forces it
         to initialize timers and conditions with monotonic timers
         if that is available
       - always set the global variable except on Solaris since it's
         better to use monotonic if possible
       - always set teh global variable in ndbd since it relies on the clock
         to be monotonic in it's scheduler loop
------------------------------------------------------------
revno: 3001
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-08-03 14:54:45 +0200
message:
  ndb - remove blocked/unblocked printout-spam
------------------------------------------------------------
revno: 3000
committer: jack andrews <jack@sun.com>
branch nick: rate-limit-6-3-bug45899
timestamp: Thu 2009-07-23 13:47:32 +0200
message:
  Bug #45899  	api nodes (re-)connecting to starting data nodes too fast ...
          . removed ndbout_c print out
------------------------------------------------------------
revno: 2999
committer: jack andrews <jack@sun.com>
branch nick: rate-limit-6-3-bug45899
timestamp: Fri 2009-07-17 13:56:54 +0200
message:
  Bug #45899  	api nodes (re-)connecting to starting data nodes too fast ...
    . committed on behalf of magnus
  
  
  Delay further connection attempts after 3 disconnects
  during "handshake" phase. Increase the delay with number of
  rejected connects, but limit to max 10 seconds.
  
  3 failed connects -> 1 second "block"
  4                 -> 2
  ..                   ..
  13                -> 10
  
  
  NOTE! Remove printouts
  
   storage/ndb/src/common/transporter/Transporter.cpp         |   54 +++++++++++++
   storage/ndb/src/common/transporter/Transporter.hpp         |    8 +
   storage/ndb/src/common/transporter/TransporterRegistry.cpp |   12 ++
   3 files changed, 73 insertions(+), 1 deletion(-)
------------------------------------------------------------
revno: 2998
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 6.3
timestamp: Thu 2009-07-16 21:10:33 +0200
message:
  Merger 6.2->6.3
------------------------------------------------------------
revno: 2997
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 6.3
timestamp: Wed 2009-07-15 22:04:18 +0200
message:
  Merger 6.2 -> 6.3
    ------------------------------------------------------------
    revno: 2572.59.26
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Tue 2009-07-14 20:39:11 +0200
    message:
      ndb test
       - remove faulty setup of MASTER_MYSOCK, it should come from my.cnf
       - this change appears to have already been done in main 5.1, downporting it
         to fix test failures
------------------------------------------------------------
revno: 2996
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 6.3
timestamp: Tue 2009-07-14 11:25:18 +0200
message:
  Merge 6.2->6.3
    ------------------------------------------------------------
    revno: 2572.59.25
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Tue 2009-07-14 10:39:49 +0200
    message:
      mtr.pl
       - incorporate 'bjorn.munch@sun.com-20090603104604-gcbcxzp3rietgyxm' into 6.2 to
         get faster test runs
    ------------------------------------------------------------
    revno: 2572.59.24
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Tue 2009-07-14 10:26:50 +0200
    message:
      ndb test
       - set MASTER_MYSOCK variable in suite/ndb/my.cnf so that it's properly "windozed"
------------------------------------------------------------
revno: 2995
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Fri 2009-07-03 23:22:18 +0200
message:
  merge 63-main
    ------------------------------------------------------------
    revno: 2993.1.1
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.3
    timestamp: Thu 2009-07-02 22:47:17 +0200
    message:
      ndb - bug#45921 - add possibility to affect reconnect behaviour
------------------------------------------------------------
revno: 2994
committer: Frazer Clement <frazer@mysql.com>
branch nick: mysql-5.1-telco-6.3
timestamp: Fri 2009-07-03 15:15:09 +0100
message:
  WL4675 - improve unique index test coverage and testability
------------------------------------------------------------
revno: 2993
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Thu 2009-07-02 15:58:30 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.23
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Thu 2009-07-02 15:57:30 +0200
    message:
      ndb - testUpgrade
        add read to test (embarrasing to miss) (using pkUpdateRecords which is read+update)
        add interpreted update (if table is T1)
        new testcases Upgrade_Traffic_{FS_}one, which run only only one table instead of all tables
------------------------------------------------------------
revno: 2992
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-06-23 20:43:01 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.22
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Tue 2009-06-23 20:40:35 +0200
    message:
      ndb - skip-grant-tables for autotest upgrade tests (started failing after last 5.1-mainline merge)
------------------------------------------------------------
revno: 2991
committer: Jorgen Austvik <jorgen.austvik@sun.com>
branch nick: mysql-5.1-telco-6.3
timestamp: Tue 2009-06-23 10:00:16 +0200
message:
  merge
    ------------------------------------------------------------
    revno: 2989.1.1
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.3
    timestamp: Mon 2009-06-22 16:09:28 +0200
    message:
      ndb - initial checkin of configure checks for
        java stuff needed for ndb-jtie
------------------------------------------------------------
revno: 2990
committer: Jorgen Austvik <jorgen.austvik@sun.com>
branch nick: mysql-5.1-telco-6.3
timestamp: Mon 2009-06-22 14:23:59 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.21
    author: Magnus.Blaudd@Sun.COM
    committer: Jorgen Austvik <jorgen.austvik@sun.com>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Mon 2009-06-22 14:21:05 +0200
    message:
      Bug#45501: Make MTR shut down NDB processes without killing them.
      
      ) nicely shutting down ndbd's so that they get time to write the gcov data to disk.
      2) fixes the bug we found in the SafeProcess::shutdown function that zapped all remaining processes as sson as the first one has returned.
      3) According to Jorgen's suggestion, multiple the shutdown timeout with number of processes to shutdown. If shutdown timeout is 10 seconds and you have tree process -> max shutdown time 30 seconds. 
      
      Original patch by Magnus Blaaudd.
------------------------------------------------------------
revno: 2989
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-06-22 11:01:05 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.20
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-06-22 10:50:59 +0200
    message:
      ndb - minor bug
        get_node_alive is called wo/ locks, which means that result is unpredictable
        in this case the node could die inbetweem get_node_alive and sendRecSignal
        in which case wrong error code would be returned to callign function.
    ------------------------------------------------------------
    revno: 2572.59.19
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-06-22 10:23:35 +0200
    message:
      ndb - bug#45646
        Add a "has_lock" argument to send_event_report
------------------------------------------------------------
revno: 2988
committer: Martin Zaun <martin.zaun@sun.com>
branch nick: ndb-6.3-ndbjtie
timestamp: Sat 2009-06-20 14:40:43 -0700
message:
  Removed generated and backup files.
------------------------------------------------------------
revno: 2987
committer: Martin Zaun <martin.zaun@sun.com>
branch nick: ndb-6.3
timestamp: Thu 2009-06-18 22:14:44 -0700
message:
  Initial check in of NDB JTie.
    ------------------------------------------------------------
    revno: 2986.1.2
    committer: Martin Zaun <martin.zaun@sun.com>
    branch nick: ndb-6.3-ndbjtie
    timestamp: Thu 2009-06-18 21:56:47 -0700
    message:
      Initial check in of NDB JTie.
    ------------------------------------------------------------
    revno: 2986.1.1
    committer: Martin Zaun <martin.zaun@sun.com>
    branch nick: ndb-6.3-ndbjtie
    timestamp: Thu 2009-06-18 21:54:13 -0700
    message:
      Initial check in of NDB JTie.
------------------------------------------------------------
revno: 2986
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-06-15 09:42:02 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.18
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-06-15 08:15:20 +0200
    message:
      ndb - fix include inconsistencies in public ndbapi
        as reported by martin z
    ------------------------------------------------------------
    revno: 2572.59.17
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-06-15 07:58:15 +0200
    message:
      ndb - run ndb_team suite also in 7.0 and 7.1
------------------------------------------------------------
revno: 2985
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-06-15 09:08:37 +0200
message:
  ndb - merge 5.1.35 into telco-6.3
    ------------------------------------------------------------
    revno: 2572.59.16
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-06-15 07:46:54 +0200
    message:
      merge 5.1.35 into telco-6.2
    ------------------------------------------------------------
    revno: 2555.372.30
    tags: clone-5.1.35-build, mysql-5.1.35
    committer: Gleb Shchepa <gshchepa@mysql.com>
    branch nick: mysql-5.1
    timestamp: Wed 2009-05-13 12:51:39 +0500
    message:
      Bug #44290: explain crashes for subquery with distinct in
                  SQL_SELECT::test_quick_select
      
      The crash was caused by an incomplete cleanup of JOIN_TAB::select
      during the filesort of rows for GROUP BY clause inside a subquery.
      Queries where a quick index access is replaced with filesort was
      was affected. For example:
      
        SELECT 1 FROM
          (SELECT COUNT(DISTINCT c1) FROM t1
             WHERE c2 IN (1, 1) AND c3 = 2 GROUP BY c2) x
      
      Quick index access related data in the SQL_SELECT::test_quick_select
      function was inconsistent after an incomplete cleanup.
      This function has been completed to prevent crashes in the
      SQL_SELECT::test_quick_select function.
    ------------------------------------------------------------
    revno: 2555.372.29
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.1
    timestamp: Fri 2009-05-08 21:04:07 +0200
    message:
      Merge main 5.1 into 5.1-build
      
      165 changesets with 23 conflicts:
      Text conflict in mysql-test/r/lock_multi.result
      Text conflict in mysql-test/t/lock_multi.test
      Text conflict in mysql-test/t/mysqldump.test
      Text conflict in sql/item_strfunc.cc
      Text conflict in sql/log.cc
      Text conflict in sql/log_event.cc
      Text conflict in sql/parse_file.cc
      Text conflict in sql/slave.cc
      Text conflict in sql/sp.cc
      Text conflict in sql/sp_head.cc
      Text conflict in sql/sql_acl.cc
      Text conflict in sql/sql_base.cc
      Text conflict in sql/sql_class.cc
      Text conflict in sql/sql_crypt.cc
      Text conflict in sql/sql_db.cc
      Text conflict in sql/sql_lex.cc
      Text conflict in sql/sql_parse.cc
      Text conflict in sql/sql_select.cc
      Text conflict in sql/sql_table.cc
      Text conflict in sql/sql_view.cc
      Text conflict in storage/innobase/handler/ha_innodb.cc
      Text conflict in storage/myisam/mi_packrec.c
      Text conflict in tests/mysql_client_test.c
      
      Updates to Innobase, taken from main 5.1:
      bzr: ERROR: Some change isn't sane:
      File mysql-test/r/innodb-semi-consistent.result is owned by Innobase and should not be updated.
      File mysql-test/t/innodb-semi-consistent.test is owned by Innobase and should not be updated.
      File storage/innobase/handler/ha_innodb.cc is owned by Innobase and should not be updated.
      File storage/innobase/ibuf/ibuf0ibuf.c is owned by Innobase and should not be updated.
      File storage/innobase/include/row0mysql.h is owned by Innobase and should not be updated.
      File storage/innobase/include/srv0srv.h is owned by Innobase and should not be updated.
      File storage/innobase/include/trx0trx.h is owned by Innobase and should not be updated.
      File storage/innobase/include/trx0trx.ic is owned by Innobase and should not be updated.
      File storage/innobase/lock/lock0lock.c is owned by Innobase and should not be updated.
      File storage/innobase/page/page0cur.c is owned by Innobase and should not be updated.
      File storage/innobase/row/row0mysql.c is owned by Innobase and should not be updated.
      File storage/innobase/row/row0sel.c is owned by Innobase and should not be updated.
      File storage/innobase/srv/srv0srv.c is owned by Innobase and should not be updated.
      File storage/innobase/trx/trx0trx.c is owned by Innobase and should not be updated.
      (Set env var 'ALLOW_UPDATE_INNOBASE_OWNED' to override.)
        ------------------------------------------------------------
        revno: 2555.383.3
        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
        branch nick: mysql-5.1
        timestamp: Tue 2009-05-05 21:02:06 +0200
        message:
          Merge from 5.1-pe-stage into 5.1 main.
            ------------------------------------------------------------
            revno: 2555.384.38
            committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
            branch nick: mysql-5.1-pe-stage
            timestamp: Tue 2009-05-05 20:47:43 +0200
            message:
              Remove unused variable.
            ------------------------------------------------------------
            revno: 2555.384.37
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-pe-stage-40827
            timestamp: Mon 2009-05-04 14:35:16 +0530
            message:
              Additional Fix for BUG#40827 - Killing insert-select to MyISAM can cause
                                             table corruption
              
              Disabling the mysiam_debug.test in embedded mode because of BUG#43733
            ------------------------------------------------------------
            revno: 2555.384.36
            committer: Georgi Kodinov <joro@sun.com>
            branch nick: merge-5.1-bugteam
            timestamp: Thu 2009-04-30 18:00:51 +0300
            message:
              merge
                ------------------------------------------------------------
                revno: 1810.3891.3
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.0-bt-bug38694-race_condition_at_shutdown
                timestamp: Thu 2009-04-30 17:32:46 +0300
                message:
                  merging from 5.0-bt rep to a local branch
            ------------------------------------------------------------
            revno: 2555.384.35
            committer: Sergey Vojtovich <svoj@sun.com>
            branch nick: mysql-5.1-bugteam-push
            timestamp: Thu 2009-04-30 19:41:43 +0500
            message:
              Merge to 5.1-bugteam.
                ------------------------------------------------------------
                revno: 2555.412.1
                committer: Sergey Vojtovich <svoj@sun.com>
                branch nick: mysql-5.1-bugteam-bug42907
                timestamp: Thu 2009-04-23 16:24:08 +0500
                message:
                  BUG#42907 - Multi-term boolean fulltext query containing a
                              single quote fails in 5.1.x
                  
                  Performing fulltext prefix search (a word with truncation
                  operator) may cause a dead-loop.
                  
                  The problem was in smarter index merge algorithm - it was writing
                  record reference to an incorrect memory area.
            ------------------------------------------------------------
            revno: 2555.384.34
            committer: Andrei Elkin <aelkin@mysql.com>
            branch nick: 5.1-bt
            timestamp: Thu 2009-04-30 17:29:57 +0300
            message:
              merge 5.1-bt rep -> local 5.1-bt
                ------------------------------------------------------------
                revno: 2555.411.3
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: merge-5.1-bugteam
                timestamp: Thu 2009-04-30 16:44:13 +0300
                message:
                  merged 5.0-bugteam -> 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3887.12
                    committer: Georgi Kodinov <joro@sun.com>
                    branch nick: merge-5.0-bugteam
                    timestamp: Thu 2009-04-30 16:39:00 +0300
                    message:
                      merged 5.0-main to 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3870.7
                    committer: Georgi Kodinov <joro@sun.com>
                    branch nick: mysql-5.0
                    timestamp: Thu 2009-04-16 16:47:02 +0300
                    message:
                      bumped the version to 5.0.82 (5.0.81-community to be released)
                ------------------------------------------------------------
                revno: 2555.411.2
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: merge-5.1-bugteam
                timestamp: Thu 2009-04-30 16:42:38 +0300
                message:
                  merged 5.1-main to 5.1-bugteam
                ------------------------------------------------------------
                revno: 2555.411.1
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-37631-7
                timestamp: Thu 2009-04-30 18:22:48 +0530
                message:
                  merging with mysql-5.1-bugteam
                ------------------------------------------------------------
                revno: 2555.410.1
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-37631-6
                timestamp: Thu 2009-04-30 18:16:49 +0530
                message:
                  BUG#37631 - Incorrect key file for table after upgrading from 5.0 to 5.1
                  
                  This patch adds corrections to the original patch
                  submitted 2009-04-08 (http://lists.mysql.com/commits/71607):
                  
                  - fixed that the original patch didn't work because of an
                    incorrect condition;
                  - added a test case.
            ------------------------------------------------------------
            revno: 2555.384.33
            committer: Andrei Elkin <aelkin@mysql.com>
            branch nick: 5.1-bt
            timestamp: Thu 2009-04-30 16:20:38 +0300
            message:
              moving bug#38694 test files into rpl suite
            ------------------------------------------------------------
            revno: 2555.384.32
            committer: Andrei Elkin <aelkin@mysql.com>
            branch nick: 5.1-bt
            timestamp: Thu 2009-04-30 16:17:46 +0300
            message:
              merging 5.0-bt to 5.1-bt
                ------------------------------------------------------------
                revno: 1810.3891.2
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.0-bt-bug38694-race_condition_at_shutdown
                timestamp: Thu 2009-04-30 15:41:47 +0300
                message:
                  merging from 5.0-bt rep to a local branch
                ------------------------------------------------------------
                revno: 1810.3891.1
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.0-bt-bug38694-race_condition_at_shutdown
                timestamp: Tue 2009-04-28 14:46:07 +0300
                message:
                  Bug #38694  Race condition in replication thread shutdown 
                  
                  The issue of the current bug is unguarded access to mi->slave_running 
                  by the shutdown thread calling end_slave() that is bug#29968 
                  (alas happened not to be cross-linked with the current bug)
                  
                  Fixed:
                  
                  with removing the unguarded read of the running status
                  and perform reading it in terminate_slave_thread()
                  at time run_lock is taken (mostly bug#29968 backporting, still with some
                  improvements over that patch - see the error reporting from 
                  terminate_slave_thread()).
                  Issue of bug#38716 is fixed here for 5.0 branch as well.
                  
                  Note:
                  
                  There has been a separate artifact identified - 
                  a race condition between init_slave() and  end_slave() - 
                  reported as  Bug#44467.
            ------------------------------------------------------------
            revno: 2555.384.31
            committer: Andrei Elkin <aelkin@mysql.com>
            branch nick: 5.1-bt
            timestamp: Thu 2009-04-30 15:47:09 +0300
            message:
              merge bug#44179 fixes to 5.1-bt
                ------------------------------------------------------------
                revno: 2555.403.5
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.1-bt-bug44179-child_of_41902-reset_logs_error_assert
                timestamp: Thu 2009-04-30 15:28:07 +0300
                message:
                  Bug #44179 reset slave crashes in my_error when reset_logs returns non-zero
                  
                  my_error() was invoked in reset_slave()'s with purge_relay_logs()-failing branch
                  without passing sql_errno to it.
                  
                  Fixed with setting sql_errno= ER_RELAY_LOG_FAIL in the purge_relay_logs()-failing branch.
            ------------------------------------------------------------
            revno: 2555.384.30
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-04-30 15:17:56 +0500
            message:
              automerge
                ------------------------------------------------------------
                revno: 2555.408.2
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-40827
                timestamp: Thu 2009-04-30 16:44:50 +0530
                message:
                  merget to 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 2555.409.1
                    committer: Matthias Leich <Matthias.Leich@sun.com>
                    branch nick: mysql-5.1-bugteam-43546-push
                    timestamp: Thu 2009-04-30 12:29:19 +0200
                    message:
                      Merge 5.0 -> 5.1 of fix for Bug 44522
                      This is a "null" merge because the fix is
                      already in 5.1
                    ------------------------------------------------------------
                    revno: 1810.3887.11
                    committer: Matthias Leich <Matthias.Leich@sun.com>
                    branch nick: mysql-5.0-bugteam-43546-push
                    timestamp: Thu 2009-04-30 12:26:11 +0200
                    message:
                      Merge of fix for Bug#44522 main.not_embedded_server fails with "--check-testcases"
                      into actual tree
                ------------------------------------------------------------
                revno: 2555.408.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-40827
                timestamp: Thu 2009-04-30 16:33:44 +0530
                message:
                  Addition to the fix for BUG#40827 - Killing insert-select to MyISAM can cause
                                                      table corruption
                  
                  
                  Moved the testcase from the file myisam.test to the new testfile 
                  mysiam_debug.test
                   
            ------------------------------------------------------------
            revno: 2555.384.29
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-04-30 14:37:29 +0500
            message:
              Bug#43962 "Packets out of order" calling a SHOW TABLE STATUS
              Error happens because sp_head::MULTI_RESULTS is not set for SP
              which has 'show table status' command.
              The fix is to add a SQLCOM_SHOW_TABLE_STATUS case into
              sp_get_flags_for_command() func.
            ------------------------------------------------------------
            revno: 2555.384.28
            committer: Alexey Botchkov <holyfoot@mysql.com>
            branch nick: 51mrg
            timestamp: Thu 2009-04-30 12:54:45 +0500
            message:
              merging
                ------------------------------------------------------------
                revno: 1810.3887.10
                committer: Alexey Botchkov <holyfoot@mysql.com>
                branch nick: mysql-5.0-test
                timestamp: Thu 2009-04-30 12:52:27 +0500
                message:
                  mysql_client_test fixed.
                  
                  per-file comments:
                    tests/mysql_client_test.c
                  the test for bug 37956 isn't relevant anymore.
                  The query there 'select point(?,?)' doesn't produce an error.
            ------------------------------------------------------------
            revno: 2555.384.27
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-bugteam-40827
            timestamp: Thu 2009-04-30 12:40:12 +0530
            message:
              Fix for BUG#40827 - Killing insert-select to MyISAM can cause table corruption
                                     
              Killing the insert-select statement corrupts the MyISAM table only
              when the destination table is empty and when it has indexes. When 
              we bulk insert huge data and if the destination table is empty we 
              disable the indexes for fast inserts, data is then inserted and 
              indexes are re-enabled after bulk_insert operation
                                      
              Killing the query, aborts the repair table operation during enable
              indexes phase leading to table corruption.
                                    
              We now truncate the table when we detect that enable indexes is
              killed for bulk insert query.As we have an empty table before the 
              operation, we can fix by truncating the table.
                ------------------------------------------------------------
                revno: 2555.407.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-40827-push
                timestamp: Thu 2009-04-16 17:02:56 +0530
                message:
                  BUG#40827 - Killing insert-select to MyISAM can cause table corruption
                                    
                  Killing insert-select statement on MyISAM corrupts the table.
                                    
                  Killing the insert-select statement corrupts the MyISAM table only
                  when the destination table is empty and when it has indexes. When 
                  we bulk insert huge data and if the destination table is empty we 
                  disable the indexes for fast inserts, data is then inserted and 
                  indexes are re-enabled after bulk_insert operation
                                    
                  Killing the query, aborts the repair table operation during enable
                  indexes phase leading to table corruption.
                                  
                  We now truncate the table when we detect that enable indexes is
                  killed for bulk insert query.As we have an empty table before the 
                  operation, we can fix by truncating the table.
            ------------------------------------------------------------
            revno: 2555.384.26
            committer: Martin Hansson <mhansson@mysql.com>
            branch nick: 5.1bt-non-gca
            timestamp: Wed 2009-04-29 20:52:37 +0200
            message:
              merge
                ------------------------------------------------------------
                revno: 2555.404.3
                committer: Vladislav Vaintroub <vvaintroub@mysql.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Wed 2009-04-29 14:29:54 +0200
                message:
                  merge
                    ------------------------------------------------------------
                    revno: 2555.406.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-44337
                    timestamp: Wed 2009-04-29 16:51:14 +0530
                    message:
                      Bug#44337 Select query using index merge fails with MCH3601
                      
                      The storage engine was not correctly handling the case in 
                      which rnd_pos is executed for a handler without a preceding
                      rnd_next or index read operation. As a result, an unitialized
                      file handle was sometimes being passed to the QMY_READ API.
                      
                      The fix clears the rrnAssocHandle at the beginning of each
                      read operation and then checks to see whether it has been
                      set to a valid handle value before attempting to use it
                      in rnd_pos. If rrnAssocHandle has not been set by a previous
                      read operation, rnd_pos instead falls back to the use of the
                      currently active handle.
                ------------------------------------------------------------
                revno: 2555.404.2
                committer: Vladislav Vaintroub <vvaintroub@mysql.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Wed 2009-04-29 13:51:10 +0200
                message:
                  Bug#43932 myisam index corruption with large index and large 
                  key_buffer_size.
                  
                  The cause of corruption was number overflow when multiplying 
                  two ulong values, number of used keycache blocks with size
                  of a single block. The result of multiplication exceeded ulong 
                  range (4G) and this lead to incorrectly calculated  buffer offset
                  in the key cache.
                  
                  The fix is to use size_t for multiplication result.
                  
                  This patch also fixes pointless cast in safemalloc 
                  (size of allocated block to uint), that creates lot of false
                  alarm warnings when using big keycache (> 4GB) in debug mode.
            ------------------------------------------------------------
            revno: 2555.384.25
            committer: Martin Hansson <mhansson@mysql.com>
            branch nick: 5.1bt
            timestamp: Wed 2009-04-29 14:00:34 +0200
            message:
              Bug#43737: Select query return bad result
                    
              A bug in the initialization of key segment information made it point
              to the wrong bit, since a bit index was used when its int value
              was needed. This lead to misinterpretation of bit columns
              read from MyISAM record format when a NULL bit pushed them over
              a byte boundary.
              Fixed by using the int value of the bit instead.
            ------------------------------------------------------------
            revno: 2555.384.24
            committer: Alexey Botchkov <holyfoot@mysql.com>
            branch nick: 51mrg
            timestamp: Wed 2009-04-29 09:41:36 +0500
            message:
              merging
                ------------------------------------------------------------
                revno: 1810.3887.9
                committer: Alexey Botchkov <holyfoot@mysql.com>
                branch nick: 50mrg
                timestamp: Wed 2009-04-29 09:40:50 +0500
                message:
                  merging
            ------------------------------------------------------------
            revno: 2555.384.23
            committer: Alexey Botchkov <holyfoot@mysql.com>
            branch nick: 51mrg
            timestamp: Wed 2009-04-29 09:39:49 +0500
            message:
              merging
                ------------------------------------------------------------
                revno: 2555.403.4
                committer: Alfranio Correia <alfranio.correia@sun.com>
                branch nick: mysql-5.1-bugteam-push
                timestamp: Tue 2009-04-28 23:10:29 +0100
                message:
                  merge 5.1-bugteam (local) --> 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 2555.405.2
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2009-04-26 22:21:01 +0100
                    message:
                      Fixed rpl_innodb_mixed_ddl and rpl_000015.
                      
                      Respectively, replaced "--exec diff" by "--diff_files" which is a mysqltest command to run a
                      non-operating system specific diff. Removed the file rpl_000015-slave.sh as it is not
                      necessary in the new MTR.
                    ------------------------------------------------------------
                    revno: 2555.405.1
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Fri 2009-04-24 02:02:07 +0100
                    message:
                      BUG#44389 rpl_row_mysqlbinlog fails on windows due to operating system
                                specifc command
                      
                      Replaced "--exec rm" by "remove_file" which is a mysqltest command to
                      erase a file.
                ------------------------------------------------------------
                revno: 2555.403.3
                committer: Matthias Leich <Matthias.Leich@sun.com>
                branch nick: mysql-5.1-bugteam-43546-push
                timestamp: Tue 2009-04-28 21:50:55 +0200
                message:
                  Automatic merge, no conflicts, no changes
                    ------------------------------------------------------------
                    revno: 1810.3889.2
                    committer: Matthias Leich <Matthias.Leich@sun.com>
                    branch nick: mysql-5.0-bugteam-43546-push
                    timestamp: Tue 2009-04-28 21:48:10 +0200
                    message:
                      Merge latest changes into local GCA tree
                      no conflicts
                ------------------------------------------------------------
                revno: 2555.403.2
                committer: Matthias Leich <Matthias.Leich@sun.com>
                branch nick: mysql-5.1-bugteam-43546-push
                timestamp: Tue 2009-04-28 21:33:18 +0200
                message:
                  Merge of latest changes into local GCA tree
                  no conflicts
                    ------------------------------------------------------------
                    revno: 2555.404.1
                    committer: Staale Smedseng <staale.smedseng@sun.com>
                    branch nick: 35769-51g
                    timestamp: Tue 2009-04-28 18:19:55 +0200
                    message:
                      Merge from 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3890.1
                    committer: Staale Smedseng <staale.smedseng@sun.com>
                    branch nick: 35769-50g
                    timestamp: Tue 2009-04-28 18:16:17 +0200
                    message:
                      Bug#35769 typo in mysqlhotcopy documentation
                            
                      Fixed a number of typos, and made punctuation and
                      capitalization more consistent in documentation
                      and help.
                ------------------------------------------------------------
                revno: 2555.403.1
                committer: Matthias Leich <Matthias.Leich@sun.com>
                branch nick: mysql-5.1-bugteam-43546x
                timestamp: Tue 2009-04-28 20:42:17 +0200
                message:
                  Merge 5.0 -> 5.1 of fix for Bug 43546
                        Several 5.0 tests do not pass MTR's --check option (moved from Bug 42308)
                ------------------------------------------------------------
                revno: 1810.3889.1
                committer: Matthias Leich <Matthias.Leich@sun.com>
                branch nick: mysql-5.0-bugteam-43546x
                timestamp: Tue 2009-04-28 20:12:18 +0200
                message:
                  Fix for Bug#43546 Several 5.0 tests do not pass MTR's --check option
                                    (moved from Bug 42308)
                  
                  Details:
                  - insert_update
                    Add DROP TABLE which was missing, error numbers -> names
                  - varbinary
                    Add DROP TABLE which was missing
                  - sp_trans_log
                    Add missing DROP function, improved formatting
            ------------------------------------------------------------
            revno: 2555.384.22
            committer: Alexey Botchkov <holyfoot@mysql.com>
            branch nick: 51mrg
            timestamp: Wed 2009-04-29 07:59:10 +0500
            message:
              merging
                ------------------------------------------------------------
                revno: 1810.3887.8
                committer: Alexey Botchkov <holyfoot@mysql.com>
                branch nick: 50mrg
                timestamp: Tue 2009-04-28 14:48:54 +0500
                message:
                  merging
                    ------------------------------------------------------------
                    revno: 1810.3888.1
                    committer: Alexey Botchkov <holyfoot@mysql.com>
                    branch nick: 25058
                    timestamp: Fri 2008-11-21 17:38:42 +0400
                    message:
                      Bug#25058 ignored return codes in memory allocation functions
                         memory allocation error checks added for functions
                         calling insert_dynamic()
                      
                      per-file messages:
                        myisam/mi_delete.c
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        myisam/mi_write.c
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        server-tools/instance-manager/instance_options.cc
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/slave.cc
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sp_head.cc
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sp_head.h
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sp_pcontext.cc
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sp_pcontext.h
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sql_select.cc
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                        sql/sql_yacc.yy
                      Bug#25058 ignored return codes in memory allocation functions
                          out-of-memory errors handled
                ------------------------------------------------------------
                revno: 1810.3887.7
                committer: Alexey Botchkov <holyfoot@mysql.com>
                branch nick: 50mrg
                timestamp: Tue 2009-04-28 14:47:26 +0500
                message:
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                     the Point() and Linestring() functions create WKB representation of an
                     object instead of an real geometry object.
                     That produced bugs when these were inserted into tables.
                  
                     GIS tests fixed accordingly.
                              
                  per-file messages:
                    mysql-test/r/gis-rtree.result
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                      test result
                    mysql-test/r/gis.result
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                      test result
                    mysql-test/t/gis-rtree.test
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                      test fixed - GeomFromWKB invocations removed
                    mysql-test/t/gis.test
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                      test fixed - AsWKB invocations added
                    sql/item_geofunc.cc
                  Bug#38990 Arbitrary data input plus GIS functions causes mysql server crash 
                       Point() and similar functions to create a proper object
            ------------------------------------------------------------
            revno: 2555.384.21
            committer: Gleb Shchepa <gshchepa@mysql.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Tue 2009-04-28 05:27:38 +0500
            message:
              manual merge 5.0-bugteam --> 5.1-bugteam
                ------------------------------------------------------------
                revno: 1810.3887.6
                committer: Gleb Shchepa <gshchepa@mysql.com>
                branch nick: mysql-5.0-bugteam
                timestamp: Tue 2009-04-28 05:19:13 +0500
                message:
                  backport from 6.0:
                  
                  Bug #40925: Equality propagation takes non indexed attribute
                  
                  Query execution plans and execution time of queries like
                  
                    select a, b, c from t1
                      where a > '2008-11-21' and b = a limit 10
                  
                  depended on the order of equality operator parameters:
                  "b = a" and "a = b" are not same. 
                  
                  
                  An equality propagation algorithm has been fixed:
                  the substitute_for_best_equal_field function should not
                  substitute a field for an equal field if both fields belong
                  to the same table.
            ------------------------------------------------------------
            revno: 2555.384.20
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Mon 2009-04-27 15:05:01 +0500
            message:
              ENCRYPT function always returns NULL on windows.
              The fix is to disable result log as we need to
              test valgrind error only.
            ------------------------------------------------------------
            revno: 2555.384.19
            committer: Patrick Crews <patrick.crews@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Fri 2009-04-24 13:00:17 -0400
            message:
              merge 5.0-> 5.1
                ------------------------------------------------------------
                revno: 1810.3887.5
                committer: Patrick Crews <patrick.crews@sun.com>
                branch nick: mysql-5.0-new
                timestamp: Fri 2009-04-24 12:58:23 -0400
                message:
                  Bug#32784: Timeout in test "innodb_charset": InnoDB much slower than other handlers
                  
                  Turned off autocommit at the start of this test per Innobase recommendation.
                  Noted significant reduction in run time for this test w/ a minor increase in other tests' run-times.
            ------------------------------------------------------------
            revno: 2555.384.18
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-bugteam-innodb
            timestamp: Fri 2009-04-24 17:42:51 +0530
            message:
              NULL MERGE of innodb-5.0-ss4900 into 5.1 branch. Note BUG#42279 
              is pushed along with BUG#43309.
              
              Forgot to add BUG#4229 in the first paragraph in the commit 
              message
                ------------------------------------------------------------
                revno: 1810.3887.4
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-innodb
                timestamp: Fri 2009-04-24 17:27:53 +0530
                message:
                  Applying InnoDB snashot 5.0-ss4900, part 2. Fixes BUG#43309
                  
                  1) BUG#43309 - Test main.innodb can't be run twice
                  
                  Detailed revision comments:
                  
                  r4701 | vasil | 2009-04-13 17:03:46 +0300 (Mon, 13 Apr 2009) | 6 lines
                  branches/5.0:
                  
                  Fix Bug#43309 Test main.innodb can't be run twice
                  
                  by making the innodb.test reentrant.
                ------------------------------------------------------------
                revno: 1810.3887.3
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-innodb
                timestamp: Fri 2009-04-24 17:18:20 +0530
                message:
                  Applying InnoDB snashot 5.0-ss4900 part 1, Fixes BUG#42279
                  
                  1) BUG#42279 - Race condition in btr_search_drop_page_hash_when_freed()
                  
                  Detailed revision comments:
                  
                  r4031 | marko | 2009-01-23 15:33:46 +0200 (Fri, 23 Jan 2009) | 8 lines
                  branches/5.0: btr_search_drop_page_hash_when_freed(): Check if
                  buf_page_get_gen() returns NULL.  The page may have been evicted
                  from the buffer pool between buf_page_peek_if_search_hashed() and
                  buf_page_get_gen(), because the buffer pool mutex will be released
                  between these two calls. (Bug #42279)
                  
                  rb://82 approved by Heikki Tuuri
            ------------------------------------------------------------
            revno: 2555.384.17
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-bugteam-innodb
            timestamp: Fri 2009-04-24 16:58:46 +0530
            message:
              
              NULL merge fix for BUG#43660 into 5.1 as the fix for this bug
              is already applied in 5.1
                ------------------------------------------------------------
                revno: 1810.3887.2
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-innodb
                timestamp: Fri 2009-04-24 16:53:56 +0530
                message:
                  merge to latest 5.0-bugteam tree
                ------------------------------------------------------------
                revno: 1810.3887.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-innodb
                timestamp: Fri 2009-04-24 16:33:50 +0530
                message:
                  Fix for BUG#43660- SHOW INDEXES/ANALYZE does NOT update cardinality 
                                     for indexes of InnoDB table
                  
                  Fixes by replacing the PRNG that is used to pick random pages with a 
                  better one. 
                  
                  Also adds a configuration option "innodb_use_legacy_cardinality_algorithm"
                  to enable the fix only when the option is set.
                  
                  This patch is from http://bugs.mysql.com/file.php?id=11789
            ------------------------------------------------------------
            revno: 2555.384.16
            committer: Anurag Shekhar <anurag.shekhar@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Fri 2009-04-24 14:49:07 +0530
            message:
              Bug #44353 build-v9.bat is missing in source archive
              
              Entry for build-vs9.bat and build-vs9_x64.bat was missing in
              win/Makefile.am. Added the entries to fix the problem.
            ------------------------------------------------------------
            revno: 2555.384.15
            committer: Staale Smedseng <staale.smedseng@sun.com>
            branch nick: b33146-51g
            timestamp: Thu 2009-04-23 19:55:32 +0200
            message:
              Merge from 5.0-bugteam
                ------------------------------------------------------------
                revno: 1810.3885.15
                committer: Staale Smedseng <staale.smedseng@sun.com>
                branch nick: b33146-50g
                timestamp: Thu 2009-04-23 19:52:39 +0200
                message:
                  Bug#33146 CHECKSUM TABLE is not interruptable by KILL 
                  QUERY statement
                        
                  Commit 55629 applied to 5.0-bugteam and 5.1-bugteam: 
                  Check for thd->killed in CHECKSUM loop.
            ------------------------------------------------------------
            revno: 2555.384.14
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-04-23 12:50:34 +0500
            message:
              Bug#44367 valgrind warnings with find_in_set() functions
              init 'wc' variable
            ------------------------------------------------------------
            revno: 2555.384.13
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-04-23 12:47:54 +0500
            message:
              Bug#44365 valgrind warnings with encrypt() function
              replaced String->c_ptr() with String->c_ptr_safe()
            ------------------------------------------------------------
            revno: 2555.384.12
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Thu 2009-04-23 12:43:42 +0500
            message:
              Bug#44358 valgrind errors with decode() function
              The warning happens because string argument is not zero ended.
              The fix is to add new parameter 'length' to SQL_CRYPT() and
              use ptr() instead of c_ptr().
            ------------------------------------------------------------
            revno: 2555.384.11
            committer: Alfranio Correia <alfranio.correia@sun.com>
            branch nick: mysql-5.1-bugteam-push
            timestamp: Tue 2009-04-21 15:31:21 +0100
            message:
              BUG#44378 rpl_binlog_corruption fails with warning messages in Valgrind
                    
              The rpl_binlog_corruption test case was inject failures, specifically,
              incidents with invalid numbers to see if the replication was failing
              gracefully. However, this test was causing the following warning message
              in Valgrind: "Conditional jump or move depends on uninitialised value(s)"
                    
              The patch fixes the problem by correctly initializing the m_inicident 
              number.
            ------------------------------------------------------------
            revno: 2555.384.10
            committer: Sergey Vojtovich <svoj@sun.com>
            branch nick: mysql-5.1-bugteam-bug36966
            timestamp: Tue 2009-04-21 15:25:04 +0500
            message:
              Merge 5.0-bugteam to 5.1-bugteam.
                ------------------------------------------------------------
                revno: 1810.3885.14
                committer: Sergey Vojtovich <svoj@sun.com>
                branch nick: mysql-5.0-bugteam-bug36966
                timestamp: Tue 2009-04-21 14:01:13 +0500
                message:
                  BUG#36966 - mysqldump.test fails in pushbuild
                  
                  mysqldump.test is designed to run with concurrent inserts
                  disabled. It is disabling concurrent inserts at the very
                  beginning of the test case, and re-enables them at the
                  bottom of the test. But for some reason (likely incorrect
                  merge) we enable concurrent inserts in the middle of the test.
                  
                  The problem is fixed by enabling concurrent inserts only
                  at the bottom of the test case.
            ------------------------------------------------------------
            revno: 2555.384.9
            committer: Andrei Elkin <aelkin@mysql.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Tue 2009-04-21 11:30:40 +0300
            message:
              merge bug#38205 fixes to 5.1-bt
                ------------------------------------------------------------
                revno: 2555.402.2
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.1-bt-bug38205-stop_slave_trans
                timestamp: Thu 2009-04-09 16:05:41 +0300
                message:
                  Bug #38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUPP_KEY
                  Bug#319  if while a non-transactional slave is replicating a transaction possible problem
                  
                  only testing related: addressing reviewers' comments.
                ------------------------------------------------------------
                revno: 2555.402.1
                committer: Andrei Elkin <aelkin@mysql.com>
                branch nick: 5.1-bt-bug38205-stop_slave_trans
                timestamp: Thu 2009-03-26 10:25:06 +0200
                message:
                  Bug#38205 Row-based Replication (RBR) causes inconsistencies: HA_ERR_FOUND_DUP
                  Bug#319  if while a non-transactional slave is replicating a transaction possible problem 
                  
                  It is impossible to roll back a mixed engines transaction when one of the engine is
                  non-transaction. In replication that fact is crucial because the slave can not safely
                  re-apply a transction that was interrupted with STOP SLAVE.
                  
                  Fixed with making STOP SLAVE not be effective immediately in the case the current
                  group of replication events has modified a non-transaction table. In order for slave to leave
                  either the group needs finishing or the user issues KILL QUERY|CONNECTION slave_thread_id.
            ------------------------------------------------------------
            revno: 2555.384.8
            committer: Satya B <satya.bn@sun.com>
            branch nick: mysql-5.1-bugteam-innodb
            timestamp: Mon 2009-04-20 12:57:41 +0530
            message:
              Applying InnoDB snashot 5.1-ss3603. Fixes BUG#27276
              
              1) BUG#27276 - InnoDB Error: ibuf cursor restoration fails
              
              2) Follow up fix for BUG#27276 which fixes the bug introduced in
                 the previous revision r2924
              
              Detailed revision comments:
              
              r2924 | marko | 2008-10-29 10:07:48 +0200 (Wed, 29 Oct 2008) | 7 lines
              branches/5.1: Merge revision 2866 from branches/zip:
              
              ibuf_delete_rec(): When the cursor to the insert buffer record cannot be
              restored, do not complain if the tablespace does not exist. (Bug #27276)
              
              Approved by Sunny Bains (rb://34)
              
              r3598 | marko | 2008-12-22 15:28:03 +0200 (Mon, 22 Dec 2008) | 6 lines
              branches/5.1: ibuf_delete_rec(): When the record cannot be found and
              the tablespace has been dropped, commit the mini-transaction, so that
              InnoDB will not hold the insert buffer tree latch in exclusive mode,
              causing a potential deadlock.  This bug was introduced in the fix of
              Bug #27276 in r2924.
            ------------------------------------------------------------
            revno: 2555.384.7
            committer: Chad MILLER <chad@mysql.com>
            branch nick: 5.1-bugteam
            timestamp: Fri 2009-04-17 16:40:01 -0400
            message:
              Merge bugteam trunk and local.
                ------------------------------------------------------------
                revno: 2555.399.9
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: B35087-5.1-bugteam
                timestamp: Fri 2009-04-17 19:18:00 +0300
                message:
                  merged bug 35087 to 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.13
                    committer: Georgi Kodinov <joro@sun.com>
                    branch nick: B35087-5.0-bugteam
                    timestamp: Fri 2009-04-17 18:52:57 +0300
                    message:
                      Bug #35087: Inserting duplicate values at one time with DES_ENCRYPT leads 
                        to wrong results
                            
                      3 problems found with DES_ENCRYPT/DES_DECRYPT :
                      
                      1. The max length was not calculated properly. Fixed in fix_length_and_dec()
                      2. DES_ENCRYPT had a side effect of sometimes reallocating and changing 
                      the value of its argument. Fixed by explicitly pre-allocating the necessary
                      space to pad the argument with trailing '*' (stars) when calculating the 
                      DES digest.
                      3. in DES_ENCRYPT the string buffer for the result value was not 
                      reallocated to the correct size and only string length was assigned to it. 
                      Fixed by making sure there's enough space to hold the result.
                ------------------------------------------------------------
                revno: 2555.399.8
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Fri 2009-04-17 13:46:27 +0500
                message:
                  5.0-bugteam->5.1-bugteam merge
                    ------------------------------------------------------------
                    revno: 1810.3885.12
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.0-bugteam
                    timestamp: Fri 2009-04-17 12:41:15 +0500
                    message:
                      Bug#44151 using handler commands on information_schema tables crashes server
                      information schema tables are based on internal tmp tables which are removed
                      after each statement execution. So HANDLER comands can not be used with
                      information schema.
                ------------------------------------------------------------
                revno: 2555.399.7
                committer: Anurag Shekhar <anurag.shekhar@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Fri 2009-04-17 11:23:54 +0530
                message:
                  merging with local bugfix branch.
                    ------------------------------------------------------------
                    revno: 2555.401.1
                    committer: Anurag Shekhar <anurag.shekhar@sun.com>
                    branch nick: mysql-5.1-44040
                    timestamp: Fri 2009-04-17 11:21:51 +0530
                    message:
                      Bug#44040 MySQL allows creating a MERGE table upon VIEWs but crashes when 
                              using it.
                      The crash was due to a null pointer present for select_lex while 
                      processing the view.
                      Adding a check while opening the view to see if its a child of a 
                      merge table fixed this problem.
                ------------------------------------------------------------
                revno: 2555.399.6
                committer: Patrick Crews <patrick.crews@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Thu 2009-04-16 13:50:38 -0400
                message:
                  merge 5.0-> 5.1
                    ------------------------------------------------------------
                    revno: 1810.3885.11
                    committer: Patrick Crews <patrick.crews@sun.com>
                    branch nick: mysql-5.0-bugteam
                    timestamp: Thu 2009-04-16 13:47:44 -0400
                    message:
                      Bug#26887 - main.count_distinct3 fails randomly
                      
                      Streamlined how we increase the size of our test table.
                      The new method shows run time decreased by ~60%.
                      This is not a guarantee that we will not see test timeouts (the random failures noted in the bug),
                      but it should significantly reduce the chances of this occurring.
                ------------------------------------------------------------
                revno: 2555.399.5
                committer: Staale Smedseng <staale.smedseng@sun.com>
                branch nick: b42430-51g
                timestamp: Thu 2009-04-16 11:47:21 +0200
                message:
                  Merge from 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.10
                    committer: Staale Smedseng <staale.smedseng@sun.com>
                    branch nick: b42430-50g
                    timestamp: Thu 2009-04-16 11:40:51 +0200
                    message:
                      Bug#42430 Final commit to 5.0-bugteam
                ------------------------------------------------------------
                revno: 2555.399.4
                committer: Alfranio Correia <alfranio.correia@sun.com>
                branch nick: mysql-5.1-bugteam-push
                timestamp: Wed 2009-04-15 17:06:48 +0100
                message:
                  auto-merge 5.1-bugteam --> 5.1-bugteam (local)
                    ------------------------------------------------------------
                    revno: 2555.400.1
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Wed 2009-04-15 12:43:17 +0100
                    message:
                      BUG#41793 rpl_binlog_corruption disabled in main (needs new mtr)
                      
                      The test case was missing "let $slave_sql_errno= 1594;".
                ------------------------------------------------------------
                revno: 2555.399.3
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-innodb
                timestamp: Wed 2009-04-15 18:11:54 +0530
                message:
                  Applying InnoDB snashot 5.1-ss4699, part 3. Fixes BUG#43660
                  
                  1) BUG#43660 - SHOW INDEXES/ANALYZE does NOT update cardinality 
                                 for indexes of InnoDB table
                  
                  Detailed revision comments:
                  
                  r4699 | vasil | 2009-04-09 14:01:52 +0300 (Thu, 09 Apr 2009) | 15 lines
                  branches/5.1:
                  
                  Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes
                  of InnoDB table
                  
                  by replacing the PRNG that is used to pick random pages with a better
                  one.
                  
                  This is based on r4670 but also adds a new configuration option and
                  enables the fix only if this option is changed. Please skip the present
                  revision when merging.
                  
                  Approved by:	Heikki (via email)
                ------------------------------------------------------------
                revno: 2555.399.2
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-innodb
                timestamp: Wed 2009-04-15 17:58:07 +0530
                message:
                  Applying InnoDB snashot 5.1-ss4699, part 2. Fixes BUG#43309
                  
                  1) BUG#43309 - Test main.innodb can't be run twice
                  
                  2) Follow up fix for BUG#43309, adds explanatory comments.
                  
                  Detailed revision comments:
                  
                  r4575 | vasil | 2009-03-30 15:55:31 +0300 (Mon, 30 Mar 2009) | 8 lines
                  branches/5.1:
                  
                  Fix Bug#43309 Test main.innodb can't be run twice
                  
                  Make the innodb mysql-test more flexible by inspecting how much a
                  variable of interest has changed since the start of the test. Do not
                  assume the variables have zero values at the start of the test.
                  
                  r4659 | vasil | 2009-04-06 15:34:51 +0300 (Mon, 06 Apr 2009) | 6 lines
                  branches/5.1:
                  
                  Followup to r4575 and the fix of Bug#43309 Test main.innodb can't be run twice:
                  
                  Add an explanatory comment, as suggested by Patrick Crews in the bug report.
                ------------------------------------------------------------
                revno: 2555.399.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-innodb
                timestamp: Wed 2009-04-15 17:16:08 +0530
                message:
                  Applying InnoDB snashot 5.1-ss4699, part 1. Fixes BUG#39320 and other
                  problems
                  
                  1) BUG#39320 - innodb crash in file btr/btr0pcur.c line 217 with 
                                 innodb_locks_unsafe_for_binlog
                  
                  2) Fixes bug in multi-table semi consistent reads.
                  
                  3) Fixes email address from dev@innodb.com to innodb_dev_ww@oracle.com
                  
                  4) Fixes warning message generated by main.innodb test
                  
                  
                  Detailed revision comments:
                  
                  r4399 | marko | 2009-03-12 09:38:05 +0200 (Thu, 12 Mar 2009) | 5 lines
                  branches/5.1: row_sel_get_clust_rec_for_mysql(): Store the cursor position
                  also for unlock_row().  (Bug #39320)
                  
                  rb://96 approved by Heikki Tuuri.
                  
                  r4400 | marko | 2009-03-12 10:06:44 +0200 (Thu, 12 Mar 2009) | 8 lines
                  branches/5.1: Fix a bug in multi-table semi-consistent reads.
                  Remember the acquired record locks per table handle (row_prebuilt_t)
                  rather than per transaction (trx_t), so that unlock_row should successfully
                  unlock all non-matching rows in multi-table operations.
                  This deficiency was found while investigating Bug #39320.
                  
                  rb://94 approved by Heikki Tuuri.
                  
                  r4481 | marko | 2009-03-19 15:01:48 +0200 (Thu, 19 Mar 2009) | 6 lines
                  branches/5.1: row_unlock_for_mysql(): Do not unlock records that were
                  modified by the current transaction.  This bug was introduced or unmasked
                  in r4400.
                  
                  rb://97 approved by Heikki Tuuri
                  
                  r4573 | vasil | 2009-03-30 14:17:13 +0300 (Mon, 30 Mar 2009) | 4 lines
                  branches/5.1:
                  
                  Fix email address from dev@innodb.com to innodb_dev_ww@oracle.com
                  
                  r4574 | vasil | 2009-03-30 14:27:08 +0300 (Mon, 30 Mar 2009) | 38 lines
                  branches/5.1:
                  
                  Restore the state of INNODB_THREAD_CONCURRENCY to silence this warning:
                  
                    TEST                                      RESULT   TIME (ms)
                    ------------------------------------------------------------
                    
                    worker[1] Using MTR_BUILD_THREAD 250, with reserved ports 12500..12509
                    main.innodb                              [ pass ]   8803
                    
                    MTR's internal check of the test case 'main.innodb' failed.
                    This means that the test case does not preserve the state that existed
                    before the test case was executed.  Most likely the test case did not
                    do a proper clean-up.
                    This is the diff of the states of the servers before and after the
                    test case was executed:
                    mysqltest: Logging to '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'.
                    mysqltest: Results saved in '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'.
                    mysqltest: Connecting to server localhost:12500 (socket /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ...
                    mysqltest: ... Connected.
                    mysqltest: Start processing test commands from './include/check-testcase.test' ...
                    mysqltest: ... Done processing test commands.
                    --- /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result	2009-03-30 14:12:31.000000000 +0300
                    +++ /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject	2009-03-30 14:12:41.000000000 +0300
                    @@ -99,7 +99,7 @@
                     INNODB_SUPPORT_XA	ON
                     INNODB_SYNC_SPIN_LOOPS	20
                     INNODB_TABLE_LOCKS	ON
                    -INNODB_THREAD_CONCURRENCY	8
                    +INNODB_THREAD_CONCURRENCY	16
                     INNODB_THREAD_SLEEP_DELAY	10000
                     INSERT_ID	0
                     INTERACTIVE_TIMEOUT	28800
                    
                    mysqltest: Result content mismatch
                    
                    not ok
                  
                  r4576 | vasil | 2009-03-30 16:25:10 +0300 (Mon, 30 Mar 2009) | 4 lines
                  branches/5.1:
                  
                  Revert a change to Makefile.am that I committed accidentally in c4574.
            ------------------------------------------------------------
            revno: 2555.384.6
            committer: Chad MILLER <chad@mysql.com>
            branch nick: 5.1-bugteam
            timestamp: Fri 2009-04-17 16:00:53 -0400
            message:
              Move test for bug 39559, which uses command-line mysql client
              to separate test file that doesn't permit mysqld embedded in 
              mysqltest.
              
              Also, fix different comment handling in a incorrect new-to-5.1 
              test.
            ------------------------------------------------------------
            revno: 2555.384.5
            committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
            branch nick: 44164-5.1
            timestamp: Tue 2009-04-14 14:05:32 +0200
            message:
              Bug#44164: TL_WRITE has no description in lock_descriptions[]
              
              The problem was that new lock types were being added without a
              corresponding description. Since the lock types (enum values)
              are used as indices to the description array, the descriptions
              could be shifted depending on the lock type. The solution is to
              ensure that every lock type has a correspondent description.
            ------------------------------------------------------------
            revno: 2555.384.4
            committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
            branch nick: mysql-5.1-bugteam
            timestamp: Tue 2009-04-14 19:17:44 +0500
            message:
              5.0-bugteam->5.1-bugteam merge
                ------------------------------------------------------------
                revno: 1810.3885.9
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.0-bugteam
                timestamp: Tue 2009-04-14 19:16:30 +0500
                message:
                  Bug#41268 Help Text for \c is misleading in client command line interface(addon)
                  fixed message for 'help' command
            ------------------------------------------------------------
            revno: 2555.384.3
            committer: Tatiana A. Nurnberg <azundris@mysql.com>
            branch nick: 51-43835
            timestamp: Tue 2009-04-14 17:09:19 +0200
            message:
              auto-merge
                ------------------------------------------------------------
                revno: 2555.385.23
                committer: Gleb Shchepa <gshchepa@mysql.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Tue 2009-04-14 19:19:15 +0500
                message:
                  Bug #42563: Message tells me to repair table though Storage
                              Engine doesn't allow me to.
                  
                  In case of incompatible changes between old and new table
                  versions, the mysqlcheck program prints error messages like
                  this:
                    error: Table upgrade required. Please do
                           "REPAIR TABLE `table_name`" to fix it!
                  
                  However, InnoDB doesn't support REPAIR TABLE query, so the
                  message is confusing.
                  
                  
                  Error message text has been changed to:
                  
                    Table upgrade required. Please do "REPAIR TABLE `table_name`"
                    or dump/reload to fix it!"
                ------------------------------------------------------------
                revno: 2555.385.22
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-testcases-1
                timestamp: Tue 2009-04-14 16:32:55 +0530
                message:
                  Importing test cases for IBMDB2I
                  
                  The current patch
                  
                  -- Adds the ibmdb2i suite
                  -- related include(.inc) files
                  -- tests for Bug#44020 and Bug#44025
            ------------------------------------------------------------
            revno: 2555.384.2
            committer: Tatiana A. Nurnberg <azundris@mysql.com>
            branch nick: 51-43835
            timestamp: Tue 2009-04-14 16:38:55 +0200
            message:
              auto-merge
                ------------------------------------------------------------
                revno: 2555.385.21
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Mon 2009-04-13 18:09:10 +0500
                message:
                  Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist(addon)
                  mysql_rename_view can not rename view if database is not the same.
                  The fix is to add new argument 'new_db' to mysql_rename_view() and
                  allow rename with different databases
                  (only for ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME).
                ------------------------------------------------------------
                revno: 2555.385.20
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-44025-1
                timestamp: Mon 2009-04-13 17:05:40 +0530
                message:
                  merging with mysql-5.1-bugteam
                    ------------------------------------------------------------
                    revno: 2555.398.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-44025
                    timestamp: Fri 2009-04-10 13:18:07 +0530
                    message:
                      Bug#44025 Some schema names longer than 8 characters not supported  by IBMDB2I
                      
                      On IBM i 5.4, schemas with names that are longer 
                      than 8 characters and contain digits or an underscore
                      cannot contain IBMDB2I tables, even though this should
                      theoritically be possible if all alpha characters
                      are uppercase.
                      
                      THe current patch fixes the IBMDB2I engine to
                      allow digits and the underscore(_) to be used in
                      schema names longer than 8 characters on IBM i 5.4.
                ------------------------------------------------------------
                revno: 2555.385.19
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-44022-1
                timestamp: Mon 2009-04-13 16:51:24 +0530
                message:
                  merging with mysql-5.1-bugteam tree
                    ------------------------------------------------------------
                    revno: 2555.397.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-44022
                    timestamp: Fri 2009-04-10 13:01:15 +0530
                    message:
                      Bug#44022 CREATE TABLE sometimes fails silently for IBMDB2I engine
                      
                      In some circumstances, when a table is created with
                      the IBMDB2I engine, the CREATE TABLE statement will
                      return successfully but the table will not exist.
                      
                      The current patch addresses the above issue and causes
                      CREATE to fail and report and error to the user.
                ------------------------------------------------------------
                revno: 2555.385.18
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-44020-1
                timestamp: Mon 2009-04-13 16:26:21 +0530
                message:
                  merging with mysql-5.1-bugteam tree
                    ------------------------------------------------------------
                    revno: 2555.396.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-44020
                    timestamp: Fri 2009-04-10 11:56:54 +0530
                    message:
                      Bug#44020 Unicode Swedish collations not working with IBMDB2I
                      
                      The utf8_swedish_ci and ucs2_swedish_ci
                      collations do not work with indexes on 
                      IBMDB2I tables.
                      
                      The current patch adds the mapping for
                      ucs2_swedish collation and removes the 
                      ucs2_spanish2 mapping which is not
                      supported by any version of the operating
                      system.
                ------------------------------------------------------------
                revno: 2555.385.17
                committer: Chad MILLER <chad@mysql.com>
                branch nick: 5.1-bugteam
                timestamp: Fri 2009-04-10 10:18:57 -0400
                message:
                  Merge fix for bug 39559 and bugteam trunk.
                    ------------------------------------------------------------
                    revno: 2555.395.1
                    committer: Chad MILLER <chad@mysql.com>
                    branch nick: 5.1-bugteam--bug39559
                    timestamp: Thu 2009-04-09 22:18:18 -0400
                    message:
                      Bug#39559: dump of stored procedures / functions with C-style \
                      	comment can't be read back
                      
                      A change to the lexer in 5.1 caused slash-asterisk-bang-version
                      sections to be terminated early if there exists a slash-asterisk-
                      style comment inside it.  Nesting comments is usually illegal,
                      but we rely on versioned comment blocks in mysqldump, and the
                      contents of those sections must be allowed to have comments.
                      
                      The problem was that when encountering open-comment tokens and
                      consuming -or- passing through the contents, the "in_comment"
                      state at the end was clobbered with the not-in-a-comment value,
                      regardless of whether we were in a comment before this or not.  
                      
                      So, """/*!VER one /* two */ three */""" would lose its in-comment
                      state between "two" and "three".  Save the echo and in-comment
                      state, and restore it at the end of the comment if we consume a 
                      comment.
                ------------------------------------------------------------
                revno: 2555.385.16
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Fri 2009-04-10 14:25:48 +0500
                message:
                  Bug#43385 Cannot ALTER DATABASE ... UPGRADE DATA DIRECTORY NAME when Views exist
                  allow 'rename view' for ALTER ...UPGRADE DATA DIRECTORY NAME command.
                  it's safe because a view has valid internal db&table names in this case.
                ------------------------------------------------------------
                revno: 2555.385.15
                committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                branch nick: 43706-5.1
                timestamp: Thu 2009-04-09 12:25:25 -0300
                message:
                  Bug#43706: libmysqld segfaults when re-intialised
                  Bug#44091: libmysqld gets stuck waiting on mutex on initialization
                  
                  The problem was that libmysqld wasn't enforcing a certain
                  initialization and deinitialization order for the mysys
                  library. Another problem was that the global object used
                  for management of log event handlers (aka LOGGER) wasn't
                  being prepared for a possible reutilization.
                  
                  What leads to the hang/crash reported is that a failure
                  to load the language file triggers a double call of the
                  cleanup functions, causing an already destroyed mutex to
                  be used.
                  
                  The solution is enforce a order on the initialization and
                  deinitialization of the mysys library within the libmysqld
                  library and to ensure that the global LOGGER object reset
                  it's internal state during cleanup.
                ------------------------------------------------------------
                revno: 2555.385.14
                committer: Luis Soares <luis.soares@sun.com>
                branch nick: 5.1-bt-backport
                timestamp: Thu 2009-04-09 12:30:44 +0100
                message:
                  manual merge: 5.0-bugteam --> 5.1-bugteam
                  Note: empty changeset.
                    ------------------------------------------------------------
                    revno: 1810.3885.8
                    committer: Luis Soares <luis.soares@sun.com>
                    branch nick: 5.0-bt
                    timestamp: Thu 2009-04-09 11:40:22 +0100
                    message:
                      BUG#13684: SP: DROP PROCEDURE|FUNCTION IF EXISTS not binlogged if
                      routine does not exist 
                            
                      There is an inconsistency with DROP DATABASE IF EXISTS, DROP TABLE IF
                      EXISTS and DROP VIEW IF EXISTS: those are binlogged even if the DB or
                      TABLE does not exist, whereas DROP PROCEDURE IF EXISTS does not. It
                      would be nice or at least consistent if DROP PROCEDURE/STATEMENT
                      worked the same too.
                            
                      Fixed DROP PROCEDURE|FUNCTION IF EXISTS by adding a call to
                      mysql_bin_log.write in mysql_execute_command. Checked also if all 
                      documented "DROP (...) IF EXISTS" get binlogged.
                            
                      NOTE: This is a 5.0 backport patch as requested by support.
                ------------------------------------------------------------
                revno: 2555.385.13
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-37631-4
                timestamp: Thu 2009-04-09 16:04:28 +0530
                message:
                  merging with mysql-5.1-bugteam
                    ------------------------------------------------------------
                    revno: 2555.394.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-37631-3
                    timestamp: Thu 2009-04-09 14:04:34 +0530
                    message:
                      merging with mysql-5.1-bugteam tree
                    ------------------------------------------------------------
                    revno: 2555.393.1
                    committer: Narayanan V <v.narayanan@sun.com>
                    branch nick: mysql-5.1-bugteam-37631-2
                    timestamp: Wed 2009-04-08 12:25:19 +0530
                    message:
                      Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1
                      
                      The conformance checker was not taking into
                      account, and, making concessions for acceptable
                      incompatibilites in tables created by
                      versions earlier than 4.1.
                      
                      The current patch relaxes the conformance
                      checker to ignore differences in key_alg
                      and language for tables created by versions
                      earlier than 4.1.
                ------------------------------------------------------------
                revno: 2555.385.12
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Thu 2009-04-09 14:58:23 +0500
                message:
                  null merge
                    ------------------------------------------------------------
                    revno: 1810.3885.7
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.0-bugteam
                    timestamp: Thu 2009-04-09 14:55:23 +0500
                    message:
                      auotmerge
                ------------------------------------------------------------
                revno: 2555.385.11
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Thu 2009-04-09 14:57:30 +0500
                message:
                  null merge
                    ------------------------------------------------------------
                    revno: 2555.392.1
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.1-bugteam
                    timestamp: Thu 2009-04-09 17:24:36 +0800
                    message:
                      Null merge the fix only for 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3886.1
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.0-bugteam
                    timestamp: Thu 2009-04-09 16:58:18 +0800
                    message:
                      Fix compile error on windows for BUG#37145 on 5.0-bugteam
                ------------------------------------------------------------
                revno: 2555.385.10
                committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Thu 2009-04-09 14:38:50 +0500
                message:
                  5.0-bugteam->5.1-bugteam merge
                    ------------------------------------------------------------
                    revno: 1810.3885.6
                    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
                    branch nick: mysql-5.0-bugteam
                    timestamp: Thu 2009-04-09 14:19:31 +0500
                    message:
                      Bug#43833 Simple INSERT crashes the server
                      The crash happens due to wrong 'digits' variable value(0),
                      'digits' can not be 0, so the fix is use 1 as min allowed value.
                ------------------------------------------------------------
                revno: 2555.385.9
                committer: Narayanan V <v.narayanan@sun.com>
                branch nick: mysql-5.1-bugteam-38848
                timestamp: Thu 2009-04-09 13:48:23 +0530
                message:
                  Bug#38848 myisam_use_mmap causes widespread myisam corruption on windows
                              
                  Currently the memory map is being created
                  with a size that is greater than the size 
                  of the underlying datafile. This can cause
                  varying behaviour,
                  
                  e.g. 
                  
                  In windows the size of the datafile
                  is increased, while on linux it remains
                  the same.
                  
                  This fix removes the increment margin to
                  the size that is used while creating the
                  memory map.
                ------------------------------------------------------------
                revno: 2555.385.8
                committer: Anurag Shekhar <anurag.shekhar@sun.com>
                branch nick: mysql-5.1-bugteam
                timestamp: Thu 2009-04-09 13:36:47 +0530
                message:
                  merging with 5.0 bugteam tree
                    ------------------------------------------------------------
                    revno: 1810.3885.5
                    committer: Anurag Shekhar <anurag.shekhar@sun.com>
                    branch nick: mysql-5.0-bugteam-fresh
                    timestamp: Thu 2009-04-09 13:30:04 +0530
                    message:
                      merging with 5.0-bugteam tree.
                    ------------------------------------------------------------
                    revno: 1810.3883.4
                    committer: Anurag Shekhar <anurag.shekhar@sun.com>
                    branch nick: mysql-5.0-43950
                    timestamp: Wed 2009-04-08 16:45:43 +0530
                    message:
                      Bug #43950 myisamchk shows negative value for 'Max keyfile length'  
                      While printing the Max keyfile length 'llstr' call was used which 
                      was treating the max_key_file_length as negative.
                      
                      Changing this to ullstr fixes the problem. 
                      myisamchk output will differ in 32 bit and 64 bit Operating systems 
                      so its not possible to have test case for this bug.
                ------------------------------------------------------------
                revno: 2555.385.7
                committer: He Zhenxing <zhenxing.he@sun.com>
                branch nick: 5.1-bugteam
                timestamp: Thu 2009-04-09 15:47:06 +0800
                message:
                  Null merge from 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.4
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.0-bugteam
                    timestamp: Thu 2009-04-09 15:42:59 +0800
                    message:
                      post fix compiling problem after push BUG#37145 to 5.0-bugteam
                ------------------------------------------------------------
                revno: 2555.385.6
                committer: He Zhenxing <zhenxing.he@sun.com>
                branch nick: 5.1-bugteam
                timestamp: Thu 2009-04-09 14:31:09 +0800
                message:
                  Auto merge
                    ------------------------------------------------------------
                    revno: 2555.391.2
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam-push
                    timestamp: Wed 2009-04-08 22:02:19 +0100
                    message:
                      BUG#39393. Post-fix for test rpl_skip_error.
                      
                      The result set for multi-row statements is not the same between STMT and
                      RBR and among different versions. Thus to avoid test failures, we are not
                      printing out such result sets. Note, however, that this does not have
                      impact on coverage and accuracy since the execution is able to continue
                      without further issues when an error is found on the master and such error
                      is set to be skipped.
                    ------------------------------------------------------------
                    revno: 2555.391.1
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam-push
                    timestamp: Wed 2009-04-08 11:07:24 +0100
                    message:
                      merge 5.1-bugteam --> 5.1-bugteam (local)
                    ------------------------------------------------------------
                    revno: 2555.390.1
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Sun 2009-04-05 13:03:04 +0100
                    message:
                      BUG#39393 slave-skip-errors does not work when using ROW based replication
                                                    
                      RBR was not considering the option --slave-skip-errors.
                                                    
                      To fix the problem, we are reporting the ignored ERROR(s) as warnings thus avoiding 
                      stopping the SQL Thread. Besides, it fixes the output of "SHOW VARIABLES LIKE 
                      'slave_skip_errors'" which was showing nothing when the value "all" was assigned 
                      to --slave-skip-errors.
                                        
                      @sql/log_event.cc
                        skipped rbr errors when the option skip-slave-errors is set.
                      @sql/slave.cc
                        fixed the output of for SHOW VARIABLES LIKE 'slave_skip_errors'"
                      @test-cases
                        fixed the output of rpl.rpl_idempotency
                        updated the test case rpl_skip_error
                ------------------------------------------------------------
                revno: 2555.385.5
                committer: He Zhenxing <zhenxing.he@sun.com>
                branch nick: 5.1-bugteam
                timestamp: Thu 2009-04-09 14:22:06 +0800
                message:
                  Post fix of BUG#37145
                  
                  Binlog the CREATE EVENT unless the created event been successfully dropped
                  
                  Modified Query_log_event constructor to make sure that error_code
                  is not set to ER_SERVER_SHUTDOWN or ER_QUERY_INTERRUPTED errors
                  when NOT_KILLED
                ------------------------------------------------------------
                revno: 2555.385.4
                committer: He Zhenxing <zhenxing.he@sun.com>
                branch nick: 5.1-bugteam
                timestamp: Thu 2009-04-09 07:58:57 +0800
                message:
                  auto merge from 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.3
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.0-bugteam
                    timestamp: Thu 2009-04-09 07:53:21 +0800
                    message:
                      auto merge
                        ------------------------------------------------------------
                        revno: 1810.3883.3
                        committer: Satya B <satya.bn@sun.com>
                        branch nick: mysql-5.0-bugteam-41330
                        timestamp: Tue 2009-04-07 18:42:51 +0530
                        message:
                          merge to latest 5.0-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.2
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.0-bugteam
                    timestamp: Wed 2009-04-08 16:17:26 +0800
                    message:
                      Auto merge
                ------------------------------------------------------------
                revno: 2555.385.3
                committer: He Zhenxing <zhenxing.he@sun.com>
                branch nick: 5.1-bugteam
                timestamp: Thu 2009-04-09 07:42:51 +0800
                message:
                  Manually merge BUG#37145 to 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3885.1
                    committer: He Zhenxing <zhenxing.he@sun.com>
                    branch nick: 5.0-bugteam
                    timestamp: Fri 2009-03-27 13:19:50 +0800
                    message:
                      BUG#37145 Killing a statement doing DDL may log binlog event with error code 1053
                      
                      When the thread executing a DDL was killed after finished its
                      execution but before writing the binlog event, the error code in
                      the binlog event could be set wrongly to ER_SERVER_SHUTDOWN or
                      ER_QUERY_INTERRUPTED.
                      
                      This patch fixed the problem by ignoring the kill status when
                      constructing the event for DDL statements.
                      
                      This patch also included the following changes in order to
                      provide the test case.
                      
                       1) modified mysqltest to support variable for connection command
                      
                       2) modified mysql-test-run.pl, add new variable MYSQL_SLAVE to
                          run mysql client against the slave mysqld.
                ------------------------------------------------------------
                revno: 2555.385.2
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-41330
                timestamp: Tue 2009-04-07 18:44:37 +0530
                message:
                  merge to latest 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 2555.386.7
                    committer: Satya B <satya.bn@sun.com>
                    branch nick: mysql-5.1-bugteam-43973
                    timestamp: Tue 2009-04-07 17:06:15 +0530
                    message:
                      merge 5.0-bugteam to 5.1-bugteam
                        ------------------------------------------------------------
                        revno: 1810.3884.3
                        committer: Satya B <satya.bn@sun.com>
                        branch nick: mysql-5.0-bugteam-43973
                        timestamp: Tue 2009-04-07 16:54:32 +0530
                        message:
                          Fix for Bug #43973 - backup_myisam.test fails on 6.0-bugteam
                                
                          The test started failing following the push for BUG#41541.
                          Some of the algorithms access bytes beyond the input data
                          and this can affect up to one byte less than "word size"
                          which is BITS_SAVED / 8. 
                                
                          Fixed by adding (BITS_SAVED / 8) -1 bytes to buffer size
                          (i.e. Memory Segment #2) to avoid accessing un-allocated data.
                    ------------------------------------------------------------
                    revno: 2555.386.6
                    committer: Alexander Barkov <bar@mysql.com>
                    branch nick: mysql-5.1-bugteam
                    timestamp: Tue 2009-04-07 11:48:38 +0500
                    message:
                      Bug#42649 THR_LOCK_charset global mutex abused by InnoDB
                      The patch was originally proposed by Mikael and reviewed by Bar.
                    ------------------------------------------------------------
                    revno: 2555.386.5
                    committer: Alfranio Correia <alfranio.correia@sun.com>
                    branch nick: mysql-5.1-bugteam-push
                    timestamp: Mon 2009-04-06 01:22:34 +0100
                    message:
                      merge 5.1-bugteam --> 5.1-bugteam (local)
                        ------------------------------------------------------------
                        revno: 2555.389.1
                        committer: Alfranio Correia <alfranio.correia@sun.com>
                        branch nick: mysql-5.1-bugteam
                        timestamp: Wed 2009-02-11 11:56:25 +0000
                        message:
                          BUG#38197 Errors in @@init_slave not visible in 'show slave status'
                                
                          Some errors that cause the slave SQL thread to stop are not shown in the
                          Slave_SQL_Error column of "SHOW SLAVE STATUS". Instead, the error is only 
                          in the server's error log.
                                
                          That makes it difficult to analyze the error for the user. One example of an error
                          that stops the slave but is not shown by "SHOW SLAVE STATUS" is when @@global.init_slave
                          is set incorrectly (e.g., it contains something that is not valid SQL).
                                
                          Three failures were not correctly reported:
                                
                          1 - Failures during slave thread initialization
                          2 - Failures while initializing the relay log position right after
                          starting the slave thread.
                          3 - Failures while processing queries passed through the init_slave
                          option.
                                
                          This patch fixes the issues by reporting the errors through relay-info->report.
                    ------------------------------------------------------------
                    revno: 2555.386.4
                    committer: Serge Kozlov <Serge.Kozlov@sun.com>
                    branch nick: push-5.1-bugteam
                    timestamp: Sat 2009-04-04 01:33:13 +0400
                    message:
                       Bug#37716.
                      1. Test case was rewritten completely.
                      2. Test covers 3 cases:
                       a) do deadlock on slave, wait retries of transaction, unlock slave before lock
                      timeout;
                       b) do deadlock on slave and wait error 'lock timeout exceed' on slave;
                       c) same as b) but if of max relay log size = 0;
                      3. Added comments inline.
                      4. Updated result file.
                    ------------------------------------------------------------
                    revno: 2555.386.3
                    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                    branch nick: 43230-5.1
                    timestamp: Fri 2009-04-03 16:46:00 -0300
                    message:
                      Merge Bug#43230 into mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 1810.3884.2
                        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
                        branch nick: 43230-5.0
                        timestamp: Fri 2009-04-03 16:11:54 -0300
                        message:
                          Bug#43230: SELECT ... FOR UPDATE can hang with FLUSH TABLES WITH READ LOCK indefinitely
                          
                          The problem is that a SELECT .. FOR UPDATE statement might open
                          a table and later wait for a impeding global read lock without
                          noticing whether it is holding a table that is being waited upon
                          the the flush phase of the process that took the global read
                          lock.
                          
                          The same problem also affected the following statements:
                          
                          LOCK TABLES .. WRITE
                          UPDATE .. SET (update and multi-table update)
                          TRUNCATE TABLE ..
                          LOAD DATA ..
                          
                          The solution is to make the above statements wait for a impending
                          global read lock before opening the tables. If there is no
                          impending global read lock, the statement raises a temporary
                          protection against global read locks and progresses smoothly
                          towards completion.
                          
                          Important notice: the patch does not try to address all possible
                          cases, only those which are common and can be fixed unintrusively
                          enough for 5.0.
                    ------------------------------------------------------------
                    revno: 2555.386.2
                    committer: Guangbao Ni <gni@mysql.com>
                    branch nick: bugteam-5.1-bug42640
                    timestamp: Fri 2009-04-03 18:42:00 +0000
                    message:
                      AutoMerged from pushbuild mysql-5.1-bugteam
                        ------------------------------------------------------------
                        revno: 2555.387.3
                        committer: Horst Hunger <horst@mysql.com>
                        branch nick: mysql-5.1-42838
                        timestamp: Fri 2009-04-03 11:37:48 +0200
                        message:
                          Fix belonging to bug#42838: Though this bug is only for 6.0 I put in some updated result files for 6.0 and this are the corrsponding resul files for 5.1, so that sys_vars should then run successfully also in 5.1.
                        ------------------------------------------------------------
                        revno: 2555.387.2
                        committer: Patrick Crews <patrick.crews@sun.com>
                        branch nick: mysql-5.1-new
                        timestamp: Thu 2009-04-02 18:41:01 -0400
                        message:
                          merge
                            ------------------------------------------------------------
                            revno: 2555.388.1
                            committer: Chad MILLER <chad@mysql.com>
                            branch nick: mysql-5.1-bugteam
                            timestamp: Thu 2009-04-02 15:42:29 -0400
                            message:
                              Merge revert of bug32136 into 5.1.
                            ------------------------------------------------------------
                            revno: 1810.3884.1
                            committer: Chad MILLER <chad@mysql.com>
                            branch nick: mysql-5.0-bugteam--bug32136
                            timestamp: Thu 2009-04-02 11:29:28 -0400
                            message:
                              Bug#43876: mysqld_multi introduces --no-defaults which screws up my system
                              Bug#32136: mysqld_multi --defaults-file not respected while using \
                              	--mysqld=mysqld_safe
                              
                              Revert change that adds "--no-defaults" to mysqld_multi.
                              
                              This closes Bug#43508 and re-opens Bug#32136.
                        ------------------------------------------------------------
                        revno: 2555.387.1
                        committer: Patrick Crews <patrick.crews@sun.com>
                        branch nick: mysql-5.1-new
                        timestamp: Thu 2009-04-02 18:34:18 -0400
                        message:
                          Bug#43716: Test mysqlbinlog_row_big is failing, needs to be updated
                          
                          Altered the test to accommodate the new behavior of max_allowed_packet.
                          Had to disconnect / reconnect the default connection for the new value to register.
                          Re-enabled certain parts of the test that were commented out and added
                          some setup / cleanup code to ensure proper reset of max_allowed_packet at the end of the test.
                          
                          Re-recorded the .result file to account for changes to the test.
                    ------------------------------------------------------------
                    revno: 2555.386.1
                    committer: Guangbao Ni <gni@mysql.com>
                    branch nick: bugteam-5.1-bug42640
                    timestamp: Fri 2009-04-03 18:21:57 +0000
                    message:
                      BUG#42640 mysqld crashes when unsafe statements are executed (STRICT_TRANS_TABLESmode)
                      
                      Mysql server crashes because unsafe statements warning is wrongly elevated to error,
                      which is set the error status of Diagnostics_area of the thread in THD::binlog_query().
                      Yet the caller believes that binary logging shouldn't touch the status, so it will
                      set the status also later by my_ok(), my_error() or my_message() seperately
                      according to the execution result of the statement or transaction.
                      But the status of Diagnostics_area of the thread is allowed to set only once.
                      
                      Fixed to clear the error wrongly set by binary logging, but keep the warning message.
                ------------------------------------------------------------
                revno: 2555.385.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.1-bugteam-41330
                timestamp: Mon 2009-04-06 12:31:17 +0530
                message:
                  merge 5.0-bugteam to 5.1-bugteam
                ------------------------------------------------------------
                revno: 1810.3883.2
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-41330
                timestamp: Thu 2009-04-02 14:30:44 +0530
                message:
                  merge to 5.0-bugteam
                ------------------------------------------------------------
                revno: 1810.3883.1
                committer: Satya B <satya.bn@sun.com>
                branch nick: mysql-5.0-bugteam-41330
                timestamp: Fri 2009-03-20 14:48:14 +0530
                message:
                  Fix for BUG#41330 -Myisam table open count set to zero before index blocks 
                                     are written.
                        
                  When we have a myisam table with DELAY_KEY_WRITE option, index updates
                  are not applied until the flush tables command is issued or until the
                  server is shutdown. If server gets killed before the index updates are 
                  written to disk, the index file is corrupted as expected but the table 
                  is not marked as crashed. So when we start server with myisam-recover,
                  table is not repaired leaving the table unusable.
                        
                  The problem is when we try to write the index updates to index file,
                  we decrement the open_count even before the flushing the keys to index
                  file.
                        
                  Fixed by moving the decrement operation after flushing the keys to the
                  index file. So we always have non zero open count if the flush table
                  operation is killed and when the server is started with mysiam-recover
                  option, it marks the table as crashed and repairs it.
                        
                  Note: No testcase for added as we need to kill the server and start the 
                        server with different set of options and other non trivial
                        operations involved.
            ------------------------------------------------------------
            revno: 2555.384.1
            committer: Tatiana A. Nurnberg <azundris@mysql.com>
            branch nick: 51-43835
            timestamp: Mon 2009-04-06 13:42:33 +0200
            message:
              Bug#43835: SHOW VARIABLES does not include 0 for slave_skip_errors
              
              We didn't expect "error: no error", although this is
              in fact a legitimate state (if something is erroneous
              on the master, but not on the slave, e.g. INSERT fails
              on master due to UNIQUE constraint which does not exist
              on slave).
              
              We now list the ignore for "0: no error" the same way
              as any other ignore; moreover, if no or an empty
              --slave-skip-errors is passed at start-up, we show
              "OFF" instead of empty list, as intended. (The code
              for that was there, but was only run for the empty-
              argument case, even if it subsequently tested for
              both conditions.) 
        ------------------------------------------------------------
        revno: 2555.383.2
        author: kent.boort@sun.com
        committer: Kent Boortz <kent@kent-amd64>
        branch nick: mysql-5.1
        timestamp: Tue 2009-05-05 16:27:35 +0200
        message:
          Added clarification about GPL v2, changed to Sun Microsystems, Inc.
        ------------------------------------------------------------
        revno: 2555.383.1
        committer: Jonathan Perkin <jperkin@sun.com>
        branch nick: mysql-5.1
        timestamp: Thu 2009-04-16 20:43:24 +0200
        message:
          Merge from mysql-5.1.34-release
    ------------------------------------------------------------
    revno: 2555.372.28
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.1
    timestamp: Tue 2009-04-14 21:53:00 +0200
    message:
      Upmerge the fix of an error message typo
      (in "scripts/make_win_bin_dist")
      from 5.0 into 5.1
        ------------------------------------------------------------
        revno: 1810.3857.16
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: push-5.0
        timestamp: Tue 2009-04-14 21:46:56 +0200
        message:
          Just fix a silly typo in an error message ...
    ------------------------------------------------------------
    revno: 2555.372.27
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.1
    timestamp: Tue 2009-04-14 20:26:22 +0200
    message:
      Merge some merge changesets from 5.0 up into 5.1-build
      (code changes have already been merged separately).
      
      Use this occasion to fix the branch name in the configuration file.
        ------------------------------------------------------------
        revno: 1810.3857.15
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: push-5.0
        timestamp: Tue 2009-04-14 18:56:02 +0200
        message:
          Merge main 5.0 -> 5.0-build
        ------------------------------------------------------------
        revno: 1810.3870.6
        committer: MySQL Build Team <build@mysql.com>
        branch nick: mysql-5.0
        timestamp: Mon 2009-04-13 20:53:32 +0200
        message:
          Merge in changes from mysql-5.0.79-release branch
        ------------------------------------------------------------
        revno: 1810.3870.5
        author: karen.langford@sun.com
        committer: MySQL Build Team <build@mysql.com>
        branch nick: mysql-5.0
        timestamp: Mon 2009-04-13 19:50:28 +0200
        message:
          Raise version number after cloning 5.0.80
    ------------------------------------------------------------
    revno: 2555.372.26
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.1
    timestamp: Tue 2009-04-14 12:29:59 +0200
    message:
      Merge a tool change needed for cluster ("CGE") builds 
      to achieve the correct package names ("scripts/make_binary_distribution.sh").
        ------------------------------------------------------------
        revno: 2555.382.1
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: cluster642-5.1
        timestamp: Tue 2009-03-31 17:31:17 +0200
        message:
          Handle the two part version number of cluster builds
          (general server part + NDB part)
          automatically when creating a binary package,
          include only the NDBpart in the package (file) name.
    ------------------------------------------------------------
    revno: 2555.372.25
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.1
    timestamp: Sat 2009-04-11 11:46:14 +0200
    message:
      Merge the 5.1.31sp1 release back into the mainline.
      
      True to our way of doing QSP versions, this doesn't include any new changes
      but just backports of some important bug fixes that were also contained
      in version 5.1.32.
        ------------------------------------------------------------
        revno: 2555.215.29
        tags: mysql-5.1.31sp1
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Tue 2009-03-24 22:10:22 +0100
        message:
          More portability fixes in "libedit",
          backported from 5.1.32 into 5.1.31sp1,
          originally done by Jonathan and Kent.
          
          Fixing issues for AIX, HP-UX, i5os, and FreeBSD.
        ------------------------------------------------------------
        revno: 2555.215.28
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Thu 2009-03-19 21:06:15 +0100
        message:
          Fix "libedit" to use the proper symbols when checking
          for Sun or HP (no <sys/ttydefaults.h> there),
          and include AIX in that exception list.
          
          Originally done by Kent Boortz for 5.1.32 on 2009-02-11 + 12
          and now backported into 5.1.31sp1
        ------------------------------------------------------------
        revno: 2555.215.27
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Thu 2009-03-19 18:19:23 +0100
        message:
          Set the version number for the SP build.
        ------------------------------------------------------------
        revno: 2555.215.26
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Thu 2009-03-19 18:09:47 +0100
        message:
          This is a backport from 5.1.32 into 5.1.31sp1.
          The original fix was done by Davi Arnaut on 2009-02-03
          All comments are copied from the original fix:
          
          
          Bug#42524: Function pthread_setschedprio() is defined but seems broken on i5/OS PASE
          
          The problem is that MySQL use of pthread_setschedprio is not
          supported i5/OS and the default system behavior for unsupported
          calls is to emit a SIGILL signal which causes the server to
          abort.
          
          The solution is to treat the pthread_setschedprio as inexistent
          when compiling binaries to i5/OS. This also does not invalidate
          the fix for bug 38477 as the only supported dispatch class is
          SCHED_OTHER (which is passed to pthread_setschedparam).
        ------------------------------------------------------------
        revno: 2555.215.25
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Thu 2009-03-19 17:37:58 +0100
        message:
          This is a backport from 5.1.32 into 5.1.31sp1.
          The original fix was done by Ramil Kalimullin on 2009-02-05
          All comments are copied from the original fix:
          
          
          Fix for bug#42014: Crash, name_const with collate
          
          Problem: some queries using NAME_CONST(.. COLLATE ...)
          lead to server crash due to failed type cast.
          
          Fix: return the underlying item's type in case of
          NAME_CONST(.. COLLATE ...) to avoid wrong casting.
        ------------------------------------------------------------
        revno: 2555.215.24
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Thu 2009-03-19 12:08:50 +0100
        message:
          This is a backport of a fix applied in 5.1.32 into 5.1.31sp1
          The original fix was done by Jonathan Perkin and committed by Georgi Kodinov
          on 2009-02-10.
          The same day, Georgi added a compilation fix which is already included here.
          
          
          Original comment:
            Merge libedit 2.11 and related files,
            based on NetBSD CVS as of 2009/02/06 20:09:00.
        ------------------------------------------------------------
        revno: 2555.215.23
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Wed 2009-03-18 22:23:21 +0100
        message:
          This is a backport from 5.1.32 into 5.1.31sp1.
          The original fix was done by Sergey Glukhov on 2009-02-04
          All comments are copied from the original fix:
          
          
          Bug#42495 updatexml: Assertion failed: xpath->context,
                               file .\item_xmlfunc.cc, line 2507
          Problem:
             RelativeLocationPath can appear only after a node-set expression
             in the third and the fourth branches of this rule:
               PathExpr :: =  LocationPath
                              | FilterExpr
                              | FilterExpr '/' RelativeLocationPath
                              | FilterExpr '//' RelativeLocationPath
             XPatch code didn't check the type of FilterExpr and crashed.
          Fix:
             If FilterExpr is a scalar expression
             (variable reference, literal, number, scalar function call)
             return error.
        ------------------------------------------------------------
        revno: 2555.215.22
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Wed 2009-03-18 15:48:07 +0100
        message:
          This is a backport from 5.1.32 into 5.1.31sp1.
          The original fix was done by Gleb Shchepa on 2009-01-21
          All comments are copied from the original fix:
          
          
          Bug#42188: crash and/or memory corruption with user variables 
                     in trigger
          
          Interchangeable calls to the mysql_change_user client function 
          and invocations of a trigger changing some user variable caused 
          a memory corruption and a crash.
          
          The mysql_change_user API call forces TDH::cleanup() on a server 
          that frees user variable entries.
          However it didn't reset Item_func_set_user_var::entry to NULL 
          because Item_func_set_user_var::cleanup() was not overloaded.
          So, Item_func_set_user_var::entry held a pointer to freed memory,
          that caused a crash.
          
          The Item_func_set_user_var::cleanup method has been overloaded
          to cleanup the Item_func_set_user_var::entry field.
        ------------------------------------------------------------
        revno: 2555.215.21
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: qsp-5.1
        timestamp: Wed 2009-03-18 13:36:23 +0100
        message:
          This is a backport from 5.1.32 into 5.1.31sp1.
          The original fix was done by Georgi Kodinov on 2009-01-28
          All comments are copied from the original fix:
          
          
          Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"
          
          Re-generated the PKI files needed.
          Removed the ones that are not needed.
          Updated the tests to reference the correct SSL subject.
    ------------------------------------------------------------
    revno: 2555.372.24
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Thu 2009-04-02 02:37:20 -0600
    message:
      auto-merge
        ------------------------------------------------------------
        revno: 2555.381.1
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: 5.1-bugteam-bug38741
        timestamp: Thu 2009-04-02 12:21:51 +0400
        message:
          Patch for Bug#38741: main.innodb_mysql crashes randomly (2).
          
          It was a test case problem: one 'reap' statement was forgotten.
    ------------------------------------------------------------
    revno: 2555.372.23
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Wed 2009-04-01 23:19:04 -0600
    message:
      merge -5.0 into -5.1 (minor conflicts resolved)
        ------------------------------------------------------------
        revno: 1810.3857.14
        committer: Timothy Smith <timothy.smith@sun.com>
        branch nick: 50
        timestamp: Wed 2009-04-01 22:02:04 -0600
        message:
          auto-merge -build into -bugteam
            ------------------------------------------------------------
            revno: 1810.3882.4
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: push-5.0
            timestamp: Mon 2009-03-30 16:09:37 +0200
            message:
              Merge a polishing of an old bug fix,
              more for completeness than for relevance.
              
              Also, update copyright notices.
            ------------------------------------------------------------
            revno: 1810.3882.3
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: push-5.0
            timestamp: Mon 2009-03-30 15:42:04 +0200
            message:
              Merge the main tree into 5.0-build
            ------------------------------------------------------------
            revno: 1810.3882.2
            author: kent.boortz@sun.com
            committer: MySQL Build Team <build@mysql.com>
            branch nick: mysql-5.0-build
            timestamp: Thu 2009-03-19 16:40:54 +0100
            message:
              cmd-line-utils/libedit/readline/readline.h
               - Header <sys/ttydefaults.h> missing or not usable on QNX and OpenServer 6
              
              include/my_global.h
               - Moved down definition of function rint(), as for some platforms (in
                 this case Netware) 'longlong' is not defined until later in
                 "my_global.h"
            ------------------------------------------------------------
            revno: 1810.3882.1
            author: kent.boortz@sun.com
            committer: MySQL Build Team <build@mysql.com>
            branch nick: mysql-5.0-build
            timestamp: Thu 2009-03-19 16:22:14 +0100
            message:
              Merge from mysql-5.0.79-release
            ------------------------------------------------------------
            revno: 1810.3881.2
            tags: mysql-5.0.79
            author: kent.boortz@sun.com
            committer: MySQL Build Team <build@mysql.com>
            branch nick: mysql-5.0.79-release
            timestamp: Mon 2009-03-09 22:16:24 +0100
            message:
              Back patched libedit portability changes from 5.1.32
            ------------------------------------------------------------
            revno: 1810.3881.1
            author: Patrick.Crews@Sun.COM
            committer: MySQL Build Team <build@mysql.com>
            branch nick: mysql-5.0.79-release
            timestamp: Mon 2009-03-09 22:14:52 +0100
            message:
              Test cases adjusted, precision changes "error Corrupt" changed to "status  Operation failed"
        ------------------------------------------------------------
        revno: 1810.3857.13
        committer: Ignacio Galarza <ignacio.galarza@sun.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Wed 2009-04-01 12:06:29 -0400
        message:
          Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
          - Link against setargv.obj for wild-card expansion.
        ------------------------------------------------------------
        revno: 1810.3857.12
        committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
        branch nick: 5.0-bugteam
        timestamp: Wed 2009-04-01 14:45:04 +0200
        message:
          Bug 43355 merged from 5.1 gca
    ------------------------------------------------------------
    revno: 2555.372.22
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Wed 2009-04-01 22:02:46 -0600
    message:
      auto-merge -build into -bugteam
        ------------------------------------------------------------
        revno: 2555.377.2
        committer: Daniel Fischer <df@sun.com>
        branch nick: mysql-5.1-build
        timestamp: Wed 2009-04-01 14:19:42 +0200
        message:
          merge
        ------------------------------------------------------------
        revno: 2555.289.18
        committer: Daniel Fischer <df@sun.com>
        branch nick: mysql-5.1-build-34521
        timestamp: Tue 2009-03-31 16:04:01 +0200
        message:
          Bug#34521, removed a bunch of deprecated options from template my.cnf files.
          Merged from 5.0 version of this patch:
          - Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
          - Replaced key_buffer with key_buffer_size (correct spelling).
          - Removed skip-bdb, as BDB is no longer included in 5.0 and above.
          - Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
          - Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
          - Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
          - Removed log_long_format, deprecated in 4.1.
          - Replaced default_table_type with default-storage-engine.
          New in 5.1:
          - Replaced table_cache with table_open_cache.
          - Removed skip-federated, should have been in 5.0 only.
          - Replaced log_slow_queries with slow_query_log, deprecated in 5.1.29.
        ------------------------------------------------------------
        revno: 1810.3880.1
        committer: Daniel Fischer <df@sun.com>
        branch nick: mysql-5.0-build-34521
        timestamp: Tue 2009-03-31 11:54:48 +0200
        message:
          Bug#34521, removed a bunch of deprecated options from template my.cnf files:
          - Removed entire isamchk section. Support for ISAM tables was removed in 5.0.
          - Replaced key_buffer with key_buffer_size (correct spelling).
          - Removed skip-bdb, as BDB is no longer included in 5.0 and above.
          - Removed commented-out bdb_cache_size and bdb_max_lock for the same reason.
          - Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24.
          - Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. 
          - Removed log_long_format, deprecated in 4.1.
          - Replaced default_table_type with default-storage-engine.
    ------------------------------------------------------------
    revno: 2555.372.21
    committer: Ignacio Galarza <ignacio.galarza@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-04-01 12:03:45 -0400
    message:
      Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
      - Link against setargv.obj for wild-card expansion.
        ------------------------------------------------------------
        revno: 2555.380.1
        committer: Ignacio Galarza <ignacio.galarza@sun.com>
        branch nick: mysql-5.1-bugteam_29248
        timestamp: Tue 2009-03-31 18:17:42 -0400
        message:
          Bug#29248 MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
        ------------------------------------------------------------
        revno: 1810.3879.1
        committer: Ignacio Galarza <ignacio.galarza@sun.com>
        branch nick: mysql-5.0-bugteam_29248
        timestamp: Tue 2009-03-31 17:48:45 -0400
        message:
          Bug#29248 - MyISAMchk & MyISAMpack failing with * wildcard on Windows platform
          - Link against setargv.obj for wild-card expansion.
    ------------------------------------------------------------
    revno: 2555.372.20
    committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
    branch nick: 5.1-bugteam
    timestamp: Wed 2009-04-01 14:42:43 +0200
    message:
      bookkeeping
    ------------------------------------------------------------
    revno: 2555.372.19
    committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
    branch nick: 5.1-bugteam
    timestamp: Wed 2009-04-01 14:41:46 +0200
    message:
      bookkeeping
    ------------------------------------------------------------
    revno: 2555.372.18
    committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
    branch nick: 5.1-bugteam
    timestamp: Wed 2009-04-01 14:39:36 +0200
    message:
      Bug 43355 merged from 5.1 gca
        ------------------------------------------------------------
        revno: 2555.379.1
        committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
        branch nick: 5.1-gca
        timestamp: Wed 2009-04-01 10:58:55 +0200
        message:
          Bug 43355 Prepared for commit on 5.1 gca
        ------------------------------------------------------------
        revno: 1810.3878.1
        committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
        branch nick: 5.0-gca
        timestamp: Tue 2009-03-31 10:38:33 +0200
        message:
          Bug 43355 Prepared for commit on 5.0 gca 
    ------------------------------------------------------------
    revno: 2555.372.17
    committer: Gleb Shchepa <gshchepa@mysql.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-04-01 16:10:03 +0500
    message:
      null-merge 5.0-bugteam --> 5.1-bugteam (backport of bug 37348 fix to 5.0)
        ------------------------------------------------------------
        revno: 1810.3857.11
        committer: Gleb Shchepa <gshchepa@mysql.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Wed 2009-04-01 16:02:26 +0500
        message:
          Backport bug #37348 fix 5.1 --> 5.0.
          
          Original commentary:
          
          Bug #37348: Crash in or immediately after JOIN::make_sum_func_list
                      
          The optimizer pulls up aggregate functions which should be aggregated in
          an outer select. At some point it may substitute such a function for a field
          in the temporary table. The setup_copy_fields function doesn't take this
          into account and may overrun the copy_field buffer.
                      
          Fixed by filtering out the fields referenced through the specialized
          reference for aggregates (Item_aggregate_ref).
          Added an assertion to make sure bugs that cause similar discrepancy 
          don't go undetected.
    ------------------------------------------------------------
    revno: 2555.372.16
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.1-bugteam
    timestamp: Wed 2009-04-01 13:03:53 +0300
    message:
      auto merge
        ------------------------------------------------------------
        revno: 2555.378.1
        committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-04-01 13:40:33 +0500
        message:
          Bug#43183 ExctractValue() brings result list in missorder
          The problem is that XML functions(items) do not reset null_value
          before their execution and further item excution may use
          null_value value of the previous result.
          The fix is to reset null_value.
    ------------------------------------------------------------
    revno: 2555.372.15
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.1-bugteam
    timestamp: Wed 2009-04-01 13:00:21 +0300
    message:
      auto merge
        ------------------------------------------------------------
        revno: 1810.3857.10
        committer: Georgi Kodinov <joro@sun.com>
        branch nick: merge-5.0-bugteam
        timestamp: Wed 2009-04-01 12:50:27 +0300
        message:
          merged 5.0-main ->  5.0-bugteam
    ------------------------------------------------------------
    revno: 2555.372.14
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.1-bugteam
    timestamp: Wed 2009-04-01 12:57:34 +0300
    message:
      merged 5.1-main -> 5.1-bugteam
        ------------------------------------------------------------
        revno: 2555.377.1
        committer: Jonathan Perkin <jperkin@sun.com>
        branch nick: mysql-5.1
        timestamp: Mon 2009-03-30 13:27:23 +0200
        message:
          Raise version number after cloning 5.1.34
    ------------------------------------------------------------
    revno: 2555.372.13
    committer: Ramil Kalimullin <ramil@mysql.com>
    branch nick: b42944-5.1-bugteam
    timestamp: Wed 2009-04-01 10:34:59 +0500
    message:
      Fix for bug#42944: partition not pruned correctly
      
      Problem: we don't prune a LESS THAN partition if MAXVALUE is given and
      given value is equal to a LESS THAN value.
      
      Fix: prune partitions in such cases.
    ------------------------------------------------------------
    revno: 2555.372.12
    committer: Staale Smedseng <staale.smedseng@sun.com>
    branch nick: b39852-51g
    timestamp: Tue 2009-03-31 12:59:22 +0200
    message:
      Bug #39852 bug in mysql_setpermission
      
      mysql_setpermission is modified to honor the $db 
      variable as suggested when doing a REVOKE ALL for 
      menu option 7.
    ------------------------------------------------------------
    revno: 2555.372.11
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.1-bugteam-43383-push
    timestamp: Mon 2009-03-30 16:21:30 +0200
    message:
      AUtomatic merge, no conflicts, no modifications of files
        ------------------------------------------------------------
        revno: 1810.3857.9
        committer: Matthias Leich <Matthias.Leich@sun.com>
        branch nick: mysql-5.0-bugteam-43383-push
        timestamp: Mon 2009-03-30 16:12:27 +0200
        message:
          merge of fix for bug 43383 into actual tree
        ------------------------------------------------------------
        revno: 1810.3857.8
        committer: Staale Smedseng <staale.smedseng@sun.com>
        branch nick: b39953-50g
        timestamp: Fri 2009-03-27 14:11:52 +0100
        message:
          Merge from 5.0-bugteam
    ------------------------------------------------------------
    revno: 2555.372.10
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.1-bugteam-43383-push
    timestamp: Mon 2009-03-30 15:36:10 +0200
    message:
      Merge of fix for bug 43383 into actual tree
        ------------------------------------------------------------
        revno: 2555.376.1
        committer: Matthias Leich <Matthias.Leich@sun.com>
        branch nick: mysql-5.1-bugteam-43383
        timestamp: Mon 2009-03-30 12:03:25 +0200
        message:
          Merge 5.0 -> 5.1 of fix for bug 43383
          + disable the funcs_1.charset_collation_* tests which are broken because
            of bug 38346, 40209, 40545, 40618
            ------------------------------------------------------------
            revno: 1810.3877.1
            committer: Matthias Leich <Matthias.Leich@sun.com>
            branch nick: mysql-5.0-bugteam-43383
            timestamp: Thu 2009-03-26 19:12:19 +0100
            message:
              Fix for Bug#43383 main.variables-big : Weak testing code and result
              including modifications according to code review
              + backport of the fix for
                Bug 41932 funcs_1: is_collation_character_set_applicability path
                                   too long for tar
                which was missing in 5.0 (just a renaming of two files)
        ------------------------------------------------------------
        revno: 1810.3876.1
        committer: Matthias Leich <Matthias.Leich@sun.com>
        branch nick: mysql-5.0-bugteam-43383
        timestamp: Wed 2009-03-25 19:30:43 +0100
        message:
          Fix for Bug#43383 main.variables-big : Weak testing code and result
          including modifications according to code review
          + backport of the fix for
            Bug 41932 funcs_1: is_collation_character_set_applicability path
                               too long for tar
            which was missing in 5.0 (just a renaming of two files)
    ------------------------------------------------------------
    revno: 2555.372.9
    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Mon 2009-03-30 10:44:17 +0200
    message:
      Automerge
        ------------------------------------------------------------
        revno: 2555.375.1
        committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
        branch nick: 51-bug40127
        timestamp: Fri 2009-03-27 17:08:14 +0100
        message:
          Bug#40127 Multiple table DELETE IGNORE hangs on foreign key constraint violation
                    on 5.0            
          The server crashes on an assert in net_end_statement indicating that the
          Diagnostics area wasn't set properly during execution.
          This happened on a multi table DELETE operation using the IGNORE keyword.
          The keyword is suppose to allow for execution to continue on a best effort
          despite some non-fatal errors. Instead execution stopped and no client
          response was sent which would have led to a protocol error if it hadn't been
          for the assert.
          This patch corrects this issue by checking for the existence of an IGNORE
          option before setting an error state during row-by-row delete iteration.
    ------------------------------------------------------------
    revno: 2555.372.8
    committer: Staale Smedseng <staale.smedseng@sun.com>
    branch nick: b39953-51g
    timestamp: Fri 2009-03-27 14:10:28 +0100
    message:
      Merge from 5.1-bugteam
        ------------------------------------------------------------
        revno: 2555.374.2
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Fri 2009-03-27 16:00:20 +0300
        message:
          Automerge.
            ------------------------------------------------------------
            revno: 1810.3875.1
            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
            branch nick: mysql-5.0-bugteam
            timestamp: Fri 2009-03-27 15:58:34 +0300
            message:
              Automerge.
        ------------------------------------------------------------
        revno: 2555.374.1
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Fri 2009-03-27 15:59:09 +0300
        message:
          Automerge.
        ------------------------------------------------------------
        revno: 2555.347.6
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: my51-bug43432
        timestamp: Fri 2009-03-27 13:40:35 +0300
        message:
          Manual merge.
        ------------------------------------------------------------
        revno: 1810.3874.1
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: my50-bug43432
        timestamp: Fri 2009-03-27 13:12:50 +0300
        message:
          Fix for bug #43432:  Union on floats does unnecessary rounding  
            
          UNION could convert fixed-point FLOAT(M,D)/DOUBLE(M,D) columns  
          to FLOAT/DOUBLE when aggregating data types from the SELECT  
          substatements. While there is nothing particularly wrong with  
          this behavior, especially when M is greater than the hardware  
          precision limits, it could be confusing in cases when all  
          SELECT statements in a union have the same  
          FLOAT(M,D)/DOUBLE(M,D) columns with equal precision  
          specifications listed in the same position.  
            
          Since the manual is quite vague on what data type should be  
          returned in such cases, the bug was fixed by implementing the  
          most 'expected' behavior: do not convert FLOAT(M,D)/DOUBLE(M,D)  
          to anything else if all SELECT statements in a UNION have the  
          same precision for that column.  
    ------------------------------------------------------------
    revno: 2555.372.7
    committer: Staale Smedseng <staale.smedseng@sun.com>
    branch nick: b39953-51g
    timestamp: Fri 2009-03-27 13:55:14 +0100
    message:
      Merge from 5.0-bugteam
        ------------------------------------------------------------
        revno: 1810.3857.7
        committer: Staale Smedseng <staale.smedseng@sun.com>
        branch nick: b39953-50g
        timestamp: Fri 2009-03-27 12:09:15 +0100
        message:
          Bug#39953 Triggers are not working properly with multi table
          updates
          
          Attempt to execute trigger or stored function with multi-UPDATE
          which used - but didn't update - a table that was also used by
          the calling statement led to an error. Read-only reference to
          tables used in the calling statement should be allowed.
           
          This problem was caused by the fact that check for conflicting
          use of tables in SP/triggers was performed in open_tables(),
          and in case of multi-UPDATE we didn't know exact lock type at
          this stage.
          
          We solve the problem by moving this check to lock_tables(), so
          it can be performed after exact lock types for tables used by
          multi-UPDATE are determined.
    ------------------------------------------------------------
    revno: 2555.372.6
    committer: Ramil Kalimullin <ramil@mysql.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Fri 2009-03-27 13:34:24 +0400
    message:
      Merge
        ------------------------------------------------------------
        revno: 1810.3857.6
        committer: Ramil Kalimullin <ramil@mysql.com>
        branch nick: b26288-5.0-bugteam
        timestamp: Fri 2009-03-27 10:24:32 +0400
        message:
          Fix for bug #26288: savepoint not deleted, comit on empty transaction
          
          Problem: commit doesn't delete savepoints if there are no changes 
          in the transaction.
          
          Fix: delete them in such cases.
    ------------------------------------------------------------
    revno: 2555.372.5
    committer: Leonard Zhou <zhou.li@sun.com>
    branch nick: bugs
    timestamp: Fri 2009-03-27 15:06:39 +0800
    message:
      Merge
        ------------------------------------------------------------
        revno: 1810.3857.5
        committer: Leonard Zhou <zhou.li@sun.com>
        branch nick: bug35515
        timestamp: Fri 2009-03-27 11:19:48 +0800
        message:
          Merge
    ------------------------------------------------------------
    revno: 2555.372.4
    committer: Leonard Zhou <zhou.li@sun.com>
    branch nick: bug35515
    timestamp: Fri 2009-03-27 10:18:06 +0800
    message:
      Merge 5.0 to 5.1
        ------------------------------------------------------------
        revno: 1810.3857.4
        committer: Leonard Zhou <zhou.li@sun.com>
        branch nick: bug35515
        timestamp: Thu 2009-03-26 15:38:17 +0800
        message:
          BUG#35515 Aliases of variables in binary log are ignored with NAME_CONST.
                
          When add an aliase name after NAME_CONST, the aliase name will be overwrite.
                
          NAME_CONST will re-set the field's name only if there isn't an aliase in the
          function fix-fields().
          If there is an aliase, NAME_CONST doesn't re-set the field's name and keeps the old
          name.
    ------------------------------------------------------------
    revno: 2555.372.3
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2009-03-26 20:25:10 -0300
    message:
      Bug#33899: Deadlock in mysql_real_query with shared memory connections
      
      The problem is that the read and write methods of the shared
      memory transport (protocol) didn't react to asynchornous close
      events, which could lead to a lock up as the client would wait
      (until time out) for a server response that will never come.
      
      The solution is to also wait for close events while waiting
      for I/O from or to the server.
      
      Bug report and patch submitted by: Armin Sch?ffmann
        ------------------------------------------------------------
        revno: 1810.3873.4
        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
        branch nick: 33899-5.0
        timestamp: Thu 2009-03-26 20:17:27 -0300
        message:
          Bug#33899: Deadlock in mysql_real_query with shared memory connections
          
          The problem is that the read and write methods of the shared
          memory transport (protocol) didn't react to asynchronous close
          events, which could lead to a lock up as the client would wait
          (until time out) for a server response that will never come.
          
          The solution is to also wait for close events while waiting
          for I/O from or to the server.
    ------------------------------------------------------------
    revno: 2555.372.2
    committer: Leonard Zhou <zhou.li@sun.com>
    branch nick: bug43440
    timestamp: Thu 2009-03-26 12:37:24 +0800
    message:
      Merge
        ------------------------------------------------------------
        revno: 2555.369.7
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-03-25 15:14:50 -0400
        message:
          auto-merge
            ------------------------------------------------------------
            revno: 2555.373.1
            committer: Ignacio Galarza <iggy@mysql.com>
            branch nick: mysql-5.1-bugteam_fix
            timestamp: Wed 2009-03-25 14:59:48 -0400
            message:
              Correct failing archive test.
        ------------------------------------------------------------
        revno: 2555.369.6
        committer: Alexander Nozdrin <alik@sun.com>
        branch nick: 5.1-bugteam
        timestamp: Wed 2009-03-25 19:00:04 +0300
        message:
          Disable query_cache_28249 due to Bug#43861.
        ------------------------------------------------------------
        revno: 2555.369.5
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-03-25 16:23:47 +0300
        message:
          Automerge
            ------------------------------------------------------------
            revno: 1810.3873.3
            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
            branch nick: mysql-5.0-bugteam
            timestamp: Wed 2009-03-25 16:19:53 +0300
            message:
              Automerge.
            ------------------------------------------------------------
            revno: 1810.3873.2
            committer: Chad MILLER <chad@mysql.com>
            branch nick: 5.0-bugteam
            timestamp: Wed 2009-03-25 07:54:33 -0400
            message:
              Merge wide-char curses test and bugteam trunk.
            ------------------------------------------------------------
            revno: 1810.3873.1
            committer: Chad MILLER <cmiller@hypatia>
            branch nick: 5.0-bugteam
            timestamp: Wed 2009-03-11 11:46:21 -0400
            message:
              Accept wide-character version of libncurses also.
        ------------------------------------------------------------
        revno: 2555.369.4
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-03-25 16:20:38 +0300
        message:
          Automerge
            ------------------------------------------------------------
            revno: 2555.363.3
            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
            branch nick: my51-bug42965
            timestamp: Wed 2009-03-25 15:48:29 +0300
            message:
              Manual merge.
            ------------------------------------------------------------
            revno: 1810.3872.1
            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
            branch nick: my50-bug42965
            timestamp: Tue 2009-03-24 11:26:22 +0300
            message:
              Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can    
                                  produce incorrect results for ROUND() 
              
              Added a workaround and a configure check to test whether 
              isinf() is affected by the GCC bug #39228. 
                     
              Since no code in MySQL server is currently affected by that 
              bug, the patch is actually a safeguard for possible future 
              code modifications. No test cases or changelog entries are 
              needed. 
        ------------------------------------------------------------
        revno: 2555.369.3
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.1-bugteam-41541
        timestamp: Wed 2009-03-25 16:12:16 +0530
        message:
          merge to latest 5.1-bugteam
        ------------------------------------------------------------
        revno: 2555.369.2
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.1-bugteam-41541
        timestamp: Wed 2009-03-25 15:43:49 +0530
        message:
          merge 5.0-bugteam to 5.1-bugteam
        ------------------------------------------------------------
        revno: 1810.3871.2
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.0-bugteam-41541
        timestamp: Wed 2009-03-25 15:02:57 +0530
        message:
          merge to 5.0-bugteam
        ------------------------------------------------------------
        revno: 1810.3871.1
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.0-bugteam-41541
        timestamp: Wed 2009-03-25 14:45:53 +0530
        message:
          Fix for BUG#41541 - Valgrind warnings on packed MyISAM table
                      
          After the table is compressed by the myisampack utility,
          opening the table by the server produces valgrind warnings.
                
          This happens because when we try to read a record into the buffer
          we alway assume that the remaining buffer to read is always equal 
          to word size(4 or 8 or 2 bytes) we read. Sometimes we have 
          remaining buffer size less than word size and trying to read the 
          entire word size will end up in valgrind errors.
                      
          Fixed by reading byte by byte when we detect the remaining buffer 
          size is less than the word size.
    ------------------------------------------------------------
    revno: 2555.372.1
    committer: Leonard Zhou <zhou.li@sun.com>
    branch nick: bug43440
    timestamp: Tue 2009-03-24 16:55:03 +0800
    message:
      Bug#43440 rpl.rpl_temp_table_mix_row fails sporadicly
            
      The problem is that after disconnect, the DOPR TEMPORARY TABLE event didn't been
      written into binlog. So after syncing with slave, the TEMPORARY table on slave 
      is not removed.
            
      Waiting DROP TEMPORARY TABLE event to be written into binlog before sync slave with
      master.
------------------------------------------------------------
revno: 2984
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Sat 2009-06-13 21:06:06 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.15
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Sat 2009-06-13 20:56:08 +0200
    message:
      ndb - add private not implemented copy constructor/operator=
        on public object in ndbapi to prevent users from
        accidently copying them
------------------------------------------------------------
revno: 2983
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Wed 2009-06-03 08:24:27 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.14
    committer: Pekka Nousiainen <pekka@mysql.com>
    branch nick: my51-bug45053
    timestamp: Mon 2009-06-01 11:52:20 +0300
    message:
      bug#45053 01_buf.diff
      Increase data buffers to handle any xfrm-ed string.
    ------------------------------------------------------------
    revno: 2572.59.13
    committer: Bernhard Ocklin <bocklin@bernhard-ocklins-macbook-pro.local>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Fri 2009-05-29 10:34:53 +0200
    message:
      version bump to 6.2.19
------------------------------------------------------------
revno: 2982
committer: Magnus Bl?udd <magnus.blaudd@sun.com>
branch nick: 6.3
timestamp: Thu 2009-05-28 21:07:22 +0200
message:
  Merge 6.2 to 6.3
    ------------------------------------------------------------
    revno: 2572.59.12
    tags: mysql-5.1.34-ndb-6.2.18
    committer: Magnus Bl?udd <magnus.blaudd@sun.com>
    branch nick: 6.2
    timestamp: Thu 2009-05-28 21:05:54 +0200
    message:
      Cherry pick the fix for BUG#44775 to MySQL Cluster 6.2 and up
------------------------------------------------------------
revno: 2981
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Thu 2009-05-28 14:54:13 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.11
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Thu 2009-05-28 14:53:33 +0200
    message:
      ndb - bug#45154 - add testcase to autotest
------------------------------------------------------------
revno: 2980
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Thu 2009-05-28 14:51:47 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.10
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Thu 2009-05-28 14:43:04 +0200
    message:
      ndb - bug#45154 - check frag existance before trying to access it in Dbtup::restart_alloc_extent
------------------------------------------------------------
revno: 2979
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Thu 2009-05-28 11:09:21 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.9
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Thu 2009-05-28 11:06:19 +0200
    message:
      fix race conditions in "testNodeRestart -n RestartAllNodesError9999"
------------------------------------------------------------
revno: 2978
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Thu 2009-05-28 08:03:13 +0200
message:
  ndb - fix bug#25984 - that broke
------------------------------------------------------------
revno: 2977
committer: Bernhard Ocklin <bocklin@bernhard-ocklins-macbook-pro.local>
branch nick: mysql-5.1-telco-6.3
timestamp: Wed 2009-05-27 14:11:46 +0200
message:
  adopting new GPL license
    ------------------------------------------------------------
    revno: 2572.59.8
    committer: Bernhard Ocklin <bocklin@bernhard-ocklins-macbook-pro.local>
    branch nick: mysql-5.1-telco-6.2
    timestamp: Tue 2009-05-26 20:53:34 +0200
    message:
      adopting to new GPL license text
------------------------------------------------------------
revno: 2976
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Tue 2009-05-26 06:26:02 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.7
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Tue 2009-05-26 06:14:03 +0200
    message:
      ndb - bug#41915 - fix spurious crash in recovery of DD tables
------------------------------------------------------------
revno: 2975
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-05-25 21:53:36 +0200
message:
  merge 62 to 63
    ------------------------------------------------------------
    revno: 2572.59.6
    committer: Jonas Oreland <jonas@mysql.com>
    branch nick: telco-6.2
    timestamp: Mon 2009-05-25 21:53:07 +0200
    message:
      ndb - increase timeout on upgrade tests
        with traffic
------------------------------------------------------------
revno: 2974
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-05-25 14:35:03 +0200
message:
  ndb - fix mtr "check" for rpl_heartbeat, where slave_net_timeout is not properly reset
    at end of test
------------------------------------------------------------
revno: 2973
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-05-25 11:21:03 +0200
message:
  ndb - re re re re bump version to 6.3.26
------------------------------------------------------------
revno: 2972
tags: mysql-5.1.34-ndb-6.3.25
committer: Jonas Oreland <jonas@mysql.com>
branch nick: telco-6.3
timestamp: Mon 2009-05-25 11:17:51 +0200
message:
  ndb - re re re bump version
