------------------------------------------------------------
revno: 2761
author: kent.boortz@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Sat 2009-02-14 01:43:21 +0100
message:
  Disabled libedit use of '__weak_reference' on FreeBSD, doesn't compile
------------------------------------------------------------
revno: 2760
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Fri 2009-02-13 10:42:27 +0100
message:
  Added to source package the file "mysql-test/suite/bugs/combinations"
  and the directory "mysql-test/suite/jp/include"
------------------------------------------------------------
revno: 2759
author: magnus.svensson@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Fri 2009-02-13 10:38:53 +0100
message:
  Work around for bug in some versions of the File::Temp Perl module
------------------------------------------------------------
revno: 2758
author: jperkin@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Thu 2009-02-12 16:01:38 +0100
message:
  More portability fixes.
------------------------------------------------------------
revno: 2757
author: kent.boortz@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Thu 2009-02-12 03:31:31 +0100
message:
  Exclude libedit inclusion of <sys/ttydefaults.h> on AIX as well
------------------------------------------------------------
revno: 2756
author: kent.boortz@sun.com
committer: MySQL Build Team <build@mysql.com>
branch nick: mysql-5.1.32-release
timestamp: Wed 2009-02-11 21:33:46 +0100
message:
  Changed to use the correct "__sun" and "__hpux" predefined
  preprocessor symbols in libedit
------------------------------------------------------------
revno: 2755
tags: clone-5.1.32-build
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Wed 2009-02-11 12:07:22 +0200
message:
  merged 5.0-bugteam -> 5.1-bugteam
    ------------------------------------------------------------
    revno: 1810.3826.6
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.0-bugteam
    timestamp: Wed 2009-02-11 12:04:40 +0200
    message:
      changed the tree id pending a merge of 5.0-bugteam -> 5.0-main
------------------------------------------------------------
revno: 2754
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Wed 2009-02-11 12:05:06 +0200
message:
  merged 5.1-main -> 5.1-bugteam
    ------------------------------------------------------------
    revno: 2728.25.3
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.1
    timestamp: Tue 2009-02-10 01:00:11 -0200
    message:
      Post-merge fix: Complete reversal of bug 33699.
    ------------------------------------------------------------
    revno: 2728.25.2
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.1
    timestamp: Mon 2009-02-09 19:41:02 -0200
    message:
      Merge 5.1-bugteam into main.
    ------------------------------------------------------------
    revno: 2728.25.1
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: merge-5.1-bugteam
    timestamp: Tue 2009-02-03 11:05:49 +0200
    message:
      merged 5.0-bugteam -> 5.1-bugteam
------------------------------------------------------------
revno: 2753
committer: Mats Kindahl <mats@sun.com>
branch nick: b36763-mysql-5.1-bugteam
timestamp: Tue 2009-02-10 22:39:59 +0100
message:
  Merging with 5.1-bugteam
    ------------------------------------------------------------
    revno: 2751.1.1
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: B42433-5.1-bugteam
    timestamp: Tue 2009-02-10 20:22:34 +0200
    message:
      merged 5.0-bugteam to 5.1-bugteam
    ------------------------------------------------------------
    revno: 1810.3826.5
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: B42433-5.0-bugteam
    timestamp: Tue 2009-02-10 20:19:03 +0200
    message:
      fixed a libedit compilation problem
------------------------------------------------------------
revno: 2752
committer: Mats Kindahl <mats@sun.com>
branch nick: b36763-mysql-5.1-bugteam
timestamp: Tue 2009-02-10 22:26:37 +0100
message:
  Bug #36763
  TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
  
  Correcting some tests that was failing in pushbuild as well as fixing result
  file for some tests that are not executed in the default MTR run.
------------------------------------------------------------
revno: 2751
committer: Mats Kindahl <mats@sun.com>
branch nick: b36763-mysql-5.1-bugteam
timestamp: Tue 2009-02-10 16:13:44 +0100
message:
  Merging with 5.1-bugteam
    ------------------------------------------------------------
    revno: 2749.1.2
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: B42433-5.1-bugteam
    timestamp: Tue 2009-02-10 16:26:18 +0200
    message:
      merged 5.0-bugteam -> 5.1-bugteam
        ------------------------------------------------------------
        revno: 1810.3826.4
        committer: Georgi Kodinov <joro@sun.com>
        branch nick: B42433-5.0-bugteam
        timestamp: Tue 2009-02-10 14:39:14 +0200
        message:
          From jperkin :  Merge libedit 2.11 and related files, 
          based on NetBSD CVS as of 2009/02/06 20:09:00.
    ------------------------------------------------------------
    revno: 2749.1.1
    committer: Bjorn Munch <Bjorn.Munch@sun.com>
    branch nick: 5.1-bt
    timestamp: Tue 2009-02-10 11:00:16 +0100
    message:
      Bug #42590 MTR v1 crashes under Active State Perl
      Perl crashes when MTR 2 tries to start v1
      Replaced require with system()
------------------------------------------------------------
revno: 2750
committer: Mats Kindahl <mats@sun.com>
branch nick: b36763-mysql-5.1-bugteam
timestamp: Tue 2009-02-10 15:44:58 +0100
message:
  BUG#36763: TRUNCATE TABLE fails to replicate when stmt-based binlogging is not supported.
  
  Post-merge fixes. Changes to some result sets.
------------------------------------------------------------
revno: 2749
committer: Mats Kindahl <mats@sun.com>
branch nick: b36763-mysql-5.1-bugteam
timestamp: Mon 2009-02-09 23:51:59 +0100
message:
  Merging with 5.1-bugteam.
    ------------------------------------------------------------
    revno: 2728.5.53
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: 42634-5.1
    timestamp: Mon 2009-02-09 16:27:45 -0200
    message:
      Merge from upstream 5.1-bugteam.
        ------------------------------------------------------------
        revno: 2728.24.1
        committer: Sergey Glukhov <gluh@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Mon 2009-02-09 19:03:52 +0400
        message:
          Bug#42610 Dynamic plugin broken in 5.1.31
          added ignore-builtin-innodb option which disabled
          initialization of builtin InnoDB plugin
    ------------------------------------------------------------
    revno: 2728.5.52
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: 42634-5.1
    timestamp: Mon 2009-02-09 16:17:58 -0200
    message:
      Bug#42634: % character in query can cause mysqld signal 11 segfault
      
      The problem is that a unfiltered user query was being passed as
      the format string parameter of sql_print_warning which later
      performs printf-like formatting, leading to crashes if the user
      query contains formatting instructions (ie: %s). Also, it was
      using THD::query as the source of the user query, but this
      variable is not meaningful in some situations -- in a delayed
      insert, it points to the table name.
      
      The solution is to pass the user query as a parameter for the
      format string and use the function parameter query_arg as the
      source of the user query.
    ------------------------------------------------------------
    revno: 2728.5.51
    committer: Vladislav Vaintroub <vvaintroub@mysql.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Mon 2009-02-09 13:10:34 +0100
    message:
      Bug#42427 : MTR v2 fails with "can't write to /tmp/mysql-test-ports.sem" on Windows
      
      - /tmp directory is not guaranteed to exist on Windows. 
      Use the value of environment variable TEMP here
    ------------------------------------------------------------
    revno: 2728.5.50
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Sat 2009-02-07 16:50:31 +0100
    message:
      Auto-merge up from 5.0
        ------------------------------------------------------------
        revno: 1810.3826.3
        committer: Timothy Smith <timothy.smith@sun.com>
        branch nick: 50
        timestamp: Sat 2009-02-07 16:24:16 +0100
        message:
          Auto-merge 5.0-build -> 5.0-bugteam
            ------------------------------------------------------------
            revno: 1810.3818.9
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: push-5.0
            timestamp: Sat 2009-02-07 09:42:51 +0100
            message:
              Merge main 5.0 -> 5.0-build
                ------------------------------------------------------------
                revno: 1810.3828.4
                author: 
                committer: MySQL Build Team <build@mysql.com>
                branch nick: mysql-5.0
                timestamp: Sat 2009-02-07 05:47:21 +0100
                message:
                  Raise version number after cloning 5.0.78
                ------------------------------------------------------------
                revno: 1810.3828.3
                tags: clone-5.0.78-build
                committer: Timothy Smith <timothy.smith@sun.com>
                branch nick: 50
                timestamp: Fri 2009-02-06 19:38:39 +0100
                message:
                  Auto merge fix for Bug 42525 from 5.0-bugteam
                ------------------------------------------------------------
                revno: 1810.3828.2
                committer: Timothy Smith <timothy.smith@sun.com>
                branch nick: 50
                timestamp: Fri 2009-02-06 15:51:36 +0100
                message:
                  Auto merge from main 5.0
                ------------------------------------------------------------
                revno: 1810.3828.1
                committer: Timothy Smith <timothy.smith@sun.com>
                branch nick: 50
                timestamp: Fri 2009-02-06 15:07:45 +0100
                message:
                  Handle renamed nwbootstrap -> nwbuild
            ------------------------------------------------------------
            revno: 1810.3818.8
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: push-5.0
            timestamp: Fri 2009-02-06 21:58:08 +0100
            message:
              Merge main 5.0 into 5.0-build
                ------------------------------------------------------------
                revno: 1810.3820.15
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: merge-5.0-bugteam
                timestamp: Fri 2009-02-06 15:39:29 +0200
                message:
                  merged 5.0-main -> 5.0-bugteam
                ------------------------------------------------------------
                revno: 1810.3827.1
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: merge-5.0-bugteam
                timestamp: Tue 2009-02-03 11:04:22 +0200
                message:
                  changed the version in .bzr-mysql/default.conf
            ------------------------------------------------------------
            revno: 1810.3818.7
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: push-5.0
            timestamp: Fri 2009-02-06 21:25:04 +0100
            message:
              Final merge of 5.0.72sp1 into 5.0-build
              This involves just the tag, no file changes - they were all present before.
            ------------------------------------------------------------
            revno: 1810.3797.9
            tags: mysql-5.0.72sp1
            committer: Joerg Bruehe <joerg@mysql.com>
            branch nick: clone-5.0.72sp1
            timestamp: Mon 2009-01-26 22:06:42 +0100
            message:
              Backport of a fix done by Kent for bug#42278
              into the 5.0.72sp1 branch.
              
              Original changeset (in the main 5.0 branch):
              > committer: Kent Boortz <kent@kent-amd64>
              > branch nick: mysql-5.0-build-bug42278
              > timestamp: Fri 2009-01-23 02:59:03 +0100
        ------------------------------------------------------------
        revno: 1810.3826.2
        committer: Tatiana A. Nurnberg <azundris@mysql.com>
        branch nick: 50-42525
        timestamp: Fri 2009-02-06 18:47:54 +0100
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 1810.3826.1
        committer: Tatiana A. Nurnberg <azundris@mysql.com>
        branch nick: 50-42525
        timestamp: Fri 2009-02-06 18:25:08 +0100
        message:
          Bug#42525: TIMEDIFF function
          
          In 37553 we declared longlong results for
          class Item_str_timefunc as per comments/docs,
          but didn't add a method for that. And the
          default just wasn't good enough for some
          cases.
          
          Changeset adds dedicated val_int() to class.
    ------------------------------------------------------------
    revno: 2728.5.49
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 51
    timestamp: Sat 2009-02-07 16:29:37 +0100
    message:
      Auto-merge 5.1-build -> 5.1-bugteam
        ------------------------------------------------------------
        revno: 2646.31.18
        author: kent.boortz@sun.com
        committer: MySQL Build Team <build@mysql.com>
        branch nick: mysql-5.1-build
        timestamp: Thu 2009-02-05 20:34:22 +0100
        message:
          Merge from mysql-5.1.31-release
            ------------------------------------------------------------
            revno: 2728.22.4
            tags: mysql-5.1.31
            committer: MySQL Build Team <build@mysql.com>
            branch nick: mysql-5.1.31-release
            timestamp: Mon 2009-01-19 17:48:05 +0100
            message:
              Incorrect test if "--short-product-tag=" was given or not
