------------------------------------------------------------
revno: 2852
committer: Jonathan Perkin <jperkin@sun.com>
branch nick: mysql-5.1.34-release
timestamp: Tue 2009-03-31 16:04:02 +0200
message:
  Apply 64-bit fix from Azundris.
------------------------------------------------------------
revno: 2851
tags: clone-5.1.34-build
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Fri 2009-03-27 16:34:48 +0200
message:
  merged tree name change
    ------------------------------------------------------------
    revno: 1810.3868.4
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: fix-5.0-pe-stage
    timestamp: Fri 2009-03-27 16:29:56 +0200
    message:
      tree name changed
------------------------------------------------------------
revno: 2850
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Fri 2009-03-27 16:27:35 +0200
message:
  null-merged 5.0 specific compilation warning
    ------------------------------------------------------------
    revno: 1810.3868.3
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: fix-5.0-pe-stage
    timestamp: Fri 2009-03-27 16:25:16 +0200
    message:
      fixed a compilation warning
------------------------------------------------------------
revno: 2849
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Fri 2009-03-27 14:15:50 +0200
message:
  auto-merge
    ------------------------------------------------------------
    revno: 2843.1.2
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.1-pe-stage
    timestamp: Fri 2009-03-27 12:40:53 +0100
    message:
      auto-merge
    ------------------------------------------------------------
    revno: 2843.1.1
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.1-pe-stage
    timestamp: Fri 2009-03-27 12:20:37 +0100
    message:
      Bug#43748: crash when non-super user tries to kill the replication threads
      
      Test was flakey on some machines and showed spurious
      reds for races.
      
      New-and-improved test makes do with fewer statements,
      no mysqltest-variables, and no backticks. Should hope-
      fully be more robust. Heck, it's debatable whether we
      should have a test for this, anyway.
------------------------------------------------------------
revno: 2848
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Fri 2009-03-27 14:12:33 +0200
message:
  disabled a failing test suite due to bug #42311
------------------------------------------------------------
revno: 2847
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Fri 2009-03-27 12:59:31 +0200
message:
  Worked around the problem described in bug #43884.
------------------------------------------------------------
revno: 2846
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Thu 2009-03-26 17:49:06 +0200
message:
  fixed unupdated test suites.
------------------------------------------------------------
revno: 2845
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-pe-stagee
timestamp: Thu 2009-03-26 16:47:58 +0200
message:
  removed an unix-ism in a test
------------------------------------------------------------
revno: 2844
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.1-pe-stage
timestamp: Thu 2009-03-26 18:27:34 +0400
message:
  fixed archive test. It might be OOM error on boxes with low amount of memory.
  It leads to crash because there is no OOM check in ha_archive::unpack_row().
  The fix:
  added OOM error check
------------------------------------------------------------
revno: 2843
committer: Andrei Elkin <aelkin@mysql.com>
branch nick: mysql-5.1-pe-stage
timestamp: Thu 2009-03-26 11:28:07 +0200
message:
  merge from 5.1-pe-stage to a local tree
    ------------------------------------------------------------
    revno: 2841.1.2
    committer: Ramil Kalimullin <ramil@mysql.com>
    branch nick: mysql-5.1-pe-stage
    timestamp: Wed 2009-03-25 23:41:16 +0400
    message:
      Manual merge.
        ------------------------------------------------------------
        revno: 1810.3868.2
        committer: Ramil Kalimullin <ramil@mysql.com>
        branch nick: mysql-5.0-pe-stage
        timestamp: Wed 2009-03-25 21:50:42 +0400
        message:
          Auto-merge
        ------------------------------------------------------------
        revno: 1810.3868.1
        committer: Ramil Kalimullin <ramil@mysql.com>
        branch nick: mysql-5.0-pe-stage
        timestamp: Wed 2009-03-25 20:48:10 +0400
        message:
          Fix for bug#35383: binlog playback and replication breaks
          due to name_const substitution
          
          Problem:
          "In general, statements executed within a stored procedure
          are written to the binary log using the same rules that
          would apply were the statements to be executed in standalone
          fashion. Some special care is taken when logging procedure
          statements because statement execution within procedures
          is not quite the same as in non-procedure context".
          
          For example, each reference to a local variable in SP's
          statements is replaced by NAME_CONST(var_name, var_value).
          Queries like
          "CREATE TABLE ... SELECT FUNC(local_var ..."
          are logged as
          "CREATE TABLE ... SELECT FUNC(NAME_CONST("local_var", var_value) ..."
          that leads to differrent field names and
          might result in "Incorrect column name" if var_value is long enough.
          
          Fix: in 5.x we'll issue a warning in such a case.
          In 6.0 we should get rid of NAME_CONST().
          
          Note: this issue and change should be described in the documentation
          ("Binary Logging of Stored Programs").
    ------------------------------------------------------------
    revno: 2841.1.1
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.1-pe-stage
    timestamp: Wed 2009-03-25 17:42:34 +0100
    message:
      Bug#43748: crash when non-super user tries to kill the replication threads
      
      manual merge. also adds test specific to 5.1+
    ------------------------------------------------------------
    revno: 1810.3850.13
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.0-pe-stage
    timestamp: Wed 2009-03-25 17:10:27 +0100
    message:
      Bug#43748: crash when non-super user tries to kill the replication threads
      
      Fine-tuning. Broke out comparison into method by
      suggestion of Davi. Clarified comments. Reverting
      test-case which I find too brittle; proper test
      case in 5.1+.
    ------------------------------------------------------------
    revno: 1810.3850.12
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: B43748-5.0-pe-stage
    timestamp: Wed 2009-03-25 15:37:21 +0200
    message:
      Bug#43748: crash when non-super user tries to kill the replication threads
      
      (Pushing for Azundris)
            
      We allow security-contexts with NULL users (for
      system-threads and for unauthenticated users).
      If a non-SUPER-user tried to KILL such a thread,
      we tried to compare the user-fields to see whether
      they owned that thread. Comparing against NULL was
      not a good idea.
            
      If KILLer does not have SUPER-privilege, we
      specifically check whether both KILLer and KILLee
      have a non-NULL user before testing for string-
      equality. If either is NULL, we reject the KILL.
------------------------------------------------------------
revno: 2842
committer: Andrei Elkin <aelkin@mysql.com>
branch nick: mysql-5.1-pe-stage
timestamp: Thu 2009-03-26 11:25:43 +0200
message:
  bug#42977
  compilation warning fixed
------------------------------------------------------------
revno: 2841
committer: Andrei Elkin <aelkin@mysql.com>
branch nick: mysql-5.1-pe-stage
timestamp: Wed 2009-03-25 12:53:56 +0200
message:
  Bug#42977 RBR logs for rows with more than 250 column results in corrupt binlog
              
  The issue happened to be two-fold.
  The table map event was recorded into binlog having
  an incorrect size when number of columns exceeded 251. 
  The Row-based event had incorrect recording and restoring m_width member within
  the same as above conditions.
  
  Fixed with correcting m_data_size and m_width.
------------------------------------------------------------
revno: 2840
committer: Leonard Zhou <zhou.li@sun.com>
branch nick: bugs
timestamp: Wed 2009-03-25 17:37:29 +0800
message:
  Merge
    ------------------------------------------------------------
    revno: 2838.1.1
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-25 11:47:41 +0300
    message:
      Disabled embedded server in the test case for bug #41486.
------------------------------------------------------------
revno: 2839
committer: Leonard Zhou <zhou.li@sun.com>
branch nick: bugs
timestamp: Wed 2009-03-25 16:34:40 +0800
message:
  Empty merge for fixing only in 5.0
    ------------------------------------------------------------
    revno: 1810.3850.11
    committer: Leonard Zhou <zhou.li@sun.com>
    branch nick: bugs
    timestamp: Wed 2009-03-25 16:19:09 +0800
    message:
      Fix the test case error in PB.
------------------------------------------------------------
revno: 2838
committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Wed 2009-03-25 10:32:01 +0300
message:
  Fix for bug #43801: mysql.test takes too long, fails due to 
                      expired timeout on debx86-b in PB
  
  Turned off general log when importing DB dump in the test 
  case for bug #41486 due to the bug in CSV engine code that 
  makes logging long SQL query too slow.
------------------------------------------------------------
revno: 2837
committer: Leonard Zhou <zhou.li@sun.com>
branch nick: bugs
timestamp: Wed 2009-03-25 14:19:42 +0800
message:
  Fix test case erro in sles10-ia64-a. 
  
  Reset master before next test.
------------------------------------------------------------
revno: 2836
committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-03-24 23:53:25 +0300
message:
  Automerge.
    ------------------------------------------------------------
    revno: 1810.3850.10
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Tue 2009-03-24 23:50:59 +0300
    message:
      Automerge.
------------------------------------------------------------
revno: 2835
committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Tue 2009-03-24 23:52:08 +0300
message:
  Automerge.
    ------------------------------------------------------------
    revno: 2806.34.3
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: my51-bug41486
    timestamp: Tue 2009-03-24 23:48:31 +0300
    message:
      Manuel merge.
    ------------------------------------------------------------
    revno: 1810.3863.3
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: my50-bug41486
    timestamp: Tue 2009-03-24 23:44:38 +0300
    message:
      Fix for bug #43801: mysql.test takes too long, fails due to 
                          expired timeout on debx86-b in PB 
      
      Moved the resource-intensive test case for bug #41486 into 
      a separate test file to reduce execution time for mysql.test. 
------------------------------------------------------------
revno: 2834
committer: Luis Soares <luis.soares@sun.com>
branch nick: 5.1-bt
timestamp: Tue 2009-03-24 18:27:33 +0000
message:
  BUG#39701: Mixed binlog format does not switch to row mode on
  LOAD_FILE
              
  LOAD_FILE is not safe to replicate in STATEMENT mode, because it
  depends on a file (which is loaded on master and may not exist in
  slave(s)). This leads to scenarios on which the slave replicates the
  statement with 'load_file' and it will try to load the file from local
  file system. Given that the file may not exist in the slave filesystem
  the operation will not succeed (probably returning NULL), causing
  master and slave(s) to diverge. However, when using MIXED mode
  replication, this can be made to work, if the statement including
  LOAD_FILE is marked as unsafe, triggering a switch to ROW mode,
  meaning that the contents of the file are written to binlog as row
  events. Consequently, the contents from the file in the master will
  reach the slave via the binlog.
             
  This patch addresses this bug by marking the load_file function as
  unsafe. When in mixed mode and when LOAD_FILE is issued, there will be
  a switch to row mode. Furthermore, when in statement mode, the
  LOAD_FILE will raise a warning that the statement is unsafe in that
  mode.
------------------------------------------------------------
revno: 2833
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2009-03-24 16:52:35 +0200
message:
  Fixed initialization order warining.
------------------------------------------------------------
revno: 2832
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Tue 2009-03-24 15:58:52 +0200
message:
  merged 5.0-bugteam -> 5.1-bugteam
    ------------------------------------------------------------
    revno: 1810.3850.9
    committer: Leonard Zhou <leonard@mysql.com>
    branch nick: bug41719
    timestamp: Tue 2009-03-24 15:29:04 +0800
    message:
      Merge
    ------------------------------------------------------------
    revno: 1810.3865.4
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.0-bugteam-lockmulti-push
    timestamp: Mon 2009-03-23 21:19:41 +0100
    message:
      Merge of fixes into actual tree
    ------------------------------------------------------------
    revno: 1810.3865.3
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Mon 2009-03-23 16:51:39 +0400
    message:
      remove compiler warnings
    ------------------------------------------------------------
    revno: 1810.3865.2
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Mon 2009-03-23 05:21:45 +0100
    message:
      auto-merge
    ------------------------------------------------------------
    revno: 1810.3864.5
    committer: Narayanan V <v.narayanan@sun.com>
    branch nick: mysql-5.0-bugteam-42937-2
    timestamp: Fri 2009-03-20 11:42:55 +0530
    message:
      merging with mysql-5.0-bugteam
        ------------------------------------------------------------
        revno: 1810.3867.1
        committer: Narayanan V <v.narayanan@sun.com>
        branch nick: mysql-5.0-bugteam-42937-1
        timestamp: Wed 2009-03-11 12:41:59 +0530
        message:
          Bug#42937 strings/CHARSET_INFO.txt not included in source distributions
          
          The reference manual has instructions for adding new character
          sets, and refers to the string/CHARSET_INFO.txt file. This file
          is currently not present in the distribution.
          
          Modify the build to include this file in the distribution.
    ------------------------------------------------------------
    revno: 1810.3864.4
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: 43461-5.0
    timestamp: Thu 2009-03-19 17:20:15 -0300
    message:
      Bug#43461: invalid comparison with string literal in default.c
      
      Don't compare string literals as it results in unspecified behavior.
    ------------------------------------------------------------
    revno: 1810.3864.3
    committer: Ignacio Galarza <iggy@mysql.com>
    branch nick: mysql-5.0-bugteam-bug29125
    timestamp: Thu 2009-03-19 09:58:56 -0400
    message:
      auto-merge
        ------------------------------------------------------------
        revno: 1810.3862.9
        committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
        branch nick: 5.0-bugteam
        timestamp: Thu 2009-03-19 14:52:35 +0100
        message:
          Bug#43329 merge from 5.0 GCA-branch
    ------------------------------------------------------------
    revno: 1810.3864.2
    committer: Ignacio Galarza <iggy@mysql.com>
    branch nick: mysql-5.0-bugteam-bug29125
    timestamp: Thu 2009-03-19 09:44:58 -0400
    message:
      auto-merge
------------------------------------------------------------
revno: 2831
committer: Leonard Zhou <leonard@mysql.com>
branch nick: bug41719
timestamp: Tue 2009-03-24 15:19:46 +0800
message:
  Merge
    ------------------------------------------------------------
    revno: 2815.2.2
    committer: Horst Hunger <horst@mysql.com>
    branch nick: mysql-5.1-37962
    timestamp: Tue 2009-03-24 11:48:38 +0100
    message:
      Merge to be able to push.
    ------------------------------------------------------------
    revno: 2815.2.1
    committer: Horst Hunger <horst@mysql.com>
    branch nick: mysql-5.1-37962
    timestamp: Fri 2009-03-20 18:11:22 +0100
    message:
      Reviewed fix for bug#37962 also including the revised result files for failing system variable tests.
------------------------------------------------------------
revno: 2830
committer: Leonard Zhou <leonard@mysql.com>
branch nick: bug41719
timestamp: Tue 2009-03-24 15:10:40 +0800
message:
  Merge
    ------------------------------------------------------------
    revno: 2828.1.1
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Tue 2009-03-24 13:02:01 +0400
    message:
      compiler warning fix
------------------------------------------------------------
revno: 2829
committer: Leonard Zhou <leonard@mysql.com>
branch nick: bug41719
timestamp: Tue 2009-03-24 14:24:27 +0800
message:
  Merge
    ------------------------------------------------------------
    revno: 1810.3850.8
    committer: Leonard Zhou <leonard@mysql.com>
    branch nick: bug41719
    timestamp: Tue 2009-03-24 08:45:05 +0800
    message:
      BUG#41719 delayed INSERT into timestamp col needs set time_zone for concurrent binlogging
      
      When do 'insert delayed' operation, the time_zone info doesn't be keeped in the row info.
      So when we do insert sometime later, time_zone didn't write into binlog.
      This will cause wrong result for timestamp column in slave.
      
      Our solution is that adding time_zone info with the delayed-row and
      restoring time_zone from row-info when execute that row in the furture by another thread.
      So we can write correct time_zone info into binlog and got correct result in slave.
------------------------------------------------------------
revno: 2828
committer: Matthias Leich <Matthias.Leich@sun.com>
branch nick: mysql-5.1-bugteam-lockmulti
timestamp: Mon 2009-03-23 17:08:48 +0100
message:
  Merge 5.0 -> 5.1 of fix for the bugs 43015 and 43065
    ------------------------------------------------------------
    revno: 1810.3866.1
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.0-bugteam-lockmulti
    timestamp: Mon 2009-03-23 15:22:31 +0100
    message:
      Fix for Bug#43015 and Bug#43065
      
         Details for Bug#43015 main.lock_multi: Weak code (sleeps etc.)
         -------------------------------------------------------------
         - The fix for bug 42003 already removed a lot of the weaknesses mentioned.
         - Tests showed that there are unfortunately no improvements of this tests
           in MySQL 5.1 which could be ported back to 5.0.
         - Remove a superfluous "--sleep 1" around line 195
      
         Details for Bug#43065 main.lock_multi: This test is too big if the disk is slow
         -------------------------------------------------------------------------------
         - move the subtests for the bugs 38499 and 36691 into separate scripts
         - runtime under excessive parallel I/O load after applying the fix
           lock_multi           [ pass ]          22887
           lock_multi_bug38499  [ pass ]         536926
           lock_multi_bug38691  [ pass ]         258498
------------------------------------------------------------
revno: 2827
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Mon 2009-03-23 11:38:54 +0200
message:
  Disabled the failing test case until bug #43440 is resolved
------------------------------------------------------------
revno: 2826
committer: Georgi Kodinov <joro@sun.com>
branch nick: merge-5.1-bugteam
timestamp: Mon 2009-03-23 11:36:39 +0200
message:
  merged 5.1-main -> 5.1-bugteam
    ------------------------------------------------------------
    revno: 2728.12.17
    committer: Alexander Nozdrin <alik@sun.com>
    branch nick: 5.1
    timestamp: Thu 2009-03-19 15:19:53 +0300
    message:
      Fix default.conf
    ------------------------------------------------------------
    revno: 2728.12.16
    committer: Magnus Svensson <msvensson@mysql.com>
    branch nick: 43361
    timestamp: Thu 2009-03-19 12:42:55 +0100
    message:
      Merge
        ------------------------------------------------------------
        revno: 2728.16.1
        committer: Magnus Svensson <msvensson@mysql.com>
        branch nick: 5.1-bug43361
        timestamp: Fri 2009-03-13 16:06:50 +0100
        message:
          Bug#43361 msyql_client_test output lost
           - Print the output(if any) from the command that failed, in many 
             cases this will make it possible to immediately see what went wrong.
    ------------------------------------------------------------
    revno: 2728.12.15
    committer: Bjorn Munch <Bjorn.Munch@sun.com>
    branch nick: merge-51
    timestamp: Wed 2009-03-18 13:44:05 +0100
    message:
      merge from main
    ------------------------------------------------------------
    revno: 2728.12.14
    committer: Bjorn Munch <Bjorn.Munch@sun.com>
    branch nick: mac-51
    timestamp: Thu 2009-03-12 16:07:13 +0100
    message:
      Bug #43597 Fix for Bug 43410 breaks build on Power Mac due to incomplete sys/resource.h
      Added include of sys/time.h
    ------------------------------------------------------------
    revno: 2728.12.13
    committer: Bjorn Munch <Bjorn.Munch@sun.com>
    branch nick: diff-51
    timestamp: Wed 2009-03-11 14:56:52 +0100
    message:
      back-merge of merge to main
    ------------------------------------------------------------
    revno: 2728.12.12
    committer: Bjorn Munch <Bjorn.Munch@sun.com>
    branch nick: diff-51
    timestamp: Wed 2009-03-11 14:52:50 +0100
    message:
      Bug #43532 mtr should not rely on diff to report test results
      mtr on Windows does not give decent diff due to missing diff install
      Modified to look for 'mtrdiff' if diff not available.
------------------------------------------------------------
revno: 2825
committer: Tatiana A. Nurnberg <azundris@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Mon 2009-03-23 05:21:02 +0100
message:
  auto-merge
    ------------------------------------------------------------
    revno: 2823.1.2
    committer: Alfranio Correia <alfranio.correia@sun.com>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Mon 2009-03-23 01:07:25 +0000
    message:
      Post-fix BUG#42861.
    ------------------------------------------------------------
    revno: 2823.1.1
    committer: Alfranio Correia <alfranio.correia@sun.com>
    branch nick: mysql-5.1-bugteam-push
    timestamp: Sun 2009-03-22 19:46:57 +0000
    message:
      auto-merge 5.1-bugteam (local) --> 5.1-bugteam
    ------------------------------------------------------------
    revno: 2806.42.1
    committer: Alfranio Correia <alfranio.correia@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-18 10:31:17 +0000
    message:
      Bug #42861 Assigning invalid directories to --slave-load-tmpdir crashes the slave
      
      Compiling with debug and assigning an invalid directory to --slave-load-tmpdir
      was crashing the slave due to the following assertion DBUG_ASSERT(! is_set() ||
      can_overwrite_status). This assertion assumes that a thread can change its
      state once (i.e. ok,error, etc) before aborting, cleaning/resuming or completing
      its execution unless the overwrite flag (i.e. can_overwrite_status) is true.
      
      The Append_block_log_event::do_apply_event which is responsible for creating
      temporary file(s) was not cleaning the thread state. Thus a failure while
      trying to create a file in an invalid temporary directory was causing the crash.
      
      To fix the problem we check if the temporary directory is valid before starting
      the SQL Thread and reset the thread state before creating a file in
      Append_block_log_event::do_apply_event.
------------------------------------------------------------
revno: 2824
committer: Tatiana A. Nurnberg <azundris@mysql.com>
branch nick: mysql-5.1-bugteam
timestamp: Mon 2009-03-23 05:09:51 +0100
message:
  auto-merge
    ------------------------------------------------------------
    revno: 1810.3865.1
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Mon 2009-03-23 05:08:32 +0100
    message:
      Bug#43254: SQL_SELECT_LIMIT=0 crashes command line client
      
      When asking what database is selected, client expected
      to *always* get an answer from the server.
      
      We now handle failure more gracefully.
      
      See comments in ticket for a discussion of what happens,
      and how things interlock.
------------------------------------------------------------
revno: 2823
committer: Tatiana A. Nurnberg <azundris@mysql.com>
branch nick: 51-43153_
timestamp: Fri 2009-03-20 19:10:12 +0100
message:
  auto-merge
    ------------------------------------------------------------
    revno: 2728.10.6
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 51-43153
    timestamp: Thu 2009-03-19 18:42:43 +0100
    message:
      Bug#43153: Version comment is too long
      
      mysql-client used static buffer to concatenate server-
      version and version_comment. Sufficiently long comments
      could get cut off. This was harmless, but looked daft.
      
      Now using a dynamic buffer instead.
------------------------------------------------------------
revno: 2822
committer: Tatiana A. Nurnberg <azundris@mysql.com>
branch nick: 51-43153_
timestamp: Fri 2009-03-20 19:09:00 +0100
message:
  auto-merge
    ------------------------------------------------------------
    revno: 2821.1.2
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: fix-5.1-bugteam
    timestamp: Fri 2009-03-20 16:49:43 +0200
    message:
      Fixed the failing tests. Addendum to the fix for bug #22504.
    ------------------------------------------------------------
    revno: 2821.1.1
    committer: Georgi Kodinov <joro@sun.com>
    branch nick: fix-5.1-bugteam
    timestamp: Fri 2009-03-20 16:27:53 +0200
    message:
      fixed compilation warnings. addendum to the fix for bug 29125
------------------------------------------------------------
revno: 2821
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-bugteam
timestamp: Fri 2009-03-20 13:35:00 +0200
message:
  Fixed a prototype to match the actual function signature (addendum to the
  fix for 29125).
------------------------------------------------------------
revno: 2820
committer: Georgi Kodinov <joro@sun.com>
branch nick: fix-5.1-bugteam
timestamp: Fri 2009-03-20 13:18:29 +0200
message:
  reverting a bogus fix into 5.1-bugteam
------------------------------------------------------------
revno: 2819
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.1-bugteam
timestamp: Thu 2009-03-19 16:18:10 -0400
message:
  Merge contributed automake changes, and 5.1 upstream.
    ------------------------------------------------------------
    revno: 2793.2.25
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Thu 2009-03-19 17:43:01 +0300
    message:
      Merge
        ------------------------------------------------------------
        revno: 2728.10.5
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.1-bugteam-bug29125
        timestamp: Thu 2009-03-19 09:59:10 -0400
        message:
          auto-merge
            ------------------------------------------------------------
            revno: 2817.1.1
            committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
            branch nick: 5.1-bugteam
            timestamp: Thu 2009-03-19 14:48:57 +0100
            message:
              Bug#43329 merge from 5.1 GCA branch
            ------------------------------------------------------------
            revno: 2806.41.1
            committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
            branch nick: 5.1-gca
            timestamp: Thu 2009-03-19 11:18:52 +0100
            message:
              Bug#43329 Prepared for push on 5.1
            ------------------------------------------------------------
            revno: 1810.3853.13
            committer: Bernt M. Johnsen <bernt.johnsen@sun.com>
            branch nick: 5.0-gca
            timestamp: Wed 2009-03-18 15:07:13 +0100
            message:
              Bug#43329 prepared for commit on 5.0
        ------------------------------------------------------------
        revno: 2728.10.4
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.1-bugteam-bug29125
        timestamp: Thu 2009-03-19 09:42:36 -0400
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 2728.10.3
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.1-bugteam-bug29125
        timestamp: Tue 2009-03-17 16:29:24 -0400
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 2728.10.2
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.1-bugteam-bug29125
        timestamp: Fri 2009-02-13 11:41:47 -0500
        message:
          Bug#29125 Windows Server X64: so many compiler warnings
          - Remove bothersome warning messages.  This change focuses on the warnings 
          that are covered by the ignore file: support-files/compiler_warnings.supp.
          - Strings are guaranteed to be max uint in length
        ------------------------------------------------------------
        revno: 1810.3864.1
        committer: Ignacio Galarza <iggy@mysql.com>
        branch nick: mysql-5.0-bugteam-bug29125
        timestamp: Tue 2009-02-10 17:47:54 -0500
        message:
          Bug#29125 Windows Server X64: so many compiler warnings
          - Remove bothersome warning messages.  This change focuses on the warnings 
          that are covered by the ignore file: support-files/compiler_warnings.supp.
          - Strings are guaranteed to be max uint in length
    ------------------------------------------------------------
    revno: 2793.2.24
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Thu 2009-03-19 15:22:08 +0300
    message:
      Merge @@optimizer_switch no_xxx -> xxx=off change to 6.0
    ------------------------------------------------------------
    revno: 2793.2.23
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Wed 2009-03-18 19:08:54 +0300
    message:
      Merge
    ------------------------------------------------------------
    revno: 2793.2.22
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Wed 2009-03-18 14:32:32 +0300
    message:
      Merge
    ------------------------------------------------------------
    revno: 2793.2.21
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Mon 2009-03-16 20:45:03 +0300
    message:
      Fix wrong parameter name which caused compile failure on windows
    ------------------------------------------------------------
    revno: 2793.2.20
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Mon 2009-03-16 20:10:03 +0300
    message:
      Merge
    ------------------------------------------------------------
    revno: 2793.2.19
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Mon 2009-03-16 20:02:55 +0300
    message:
      @@optimizer_switch switch from no_xxx to xxx={on|off} syntax:
      - Fix valgrind warning on attempt to run a "SET optimizer_switch=number" statement.
        Need to call c_ptr_safe() as strings returned by non-string items are not 
        necessarily null-terminated.
    ------------------------------------------------------------
    revno: 2793.2.18
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Sat 2009-03-14 22:04:31 +0300
    message:
      Merge 
    ------------------------------------------------------------
    revno: 2793.2.17
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Sat 2009-03-14 21:58:23 +0300
    message:
      @@optimizer_switch backport and change from no_xxx to xx=on|off: post-review fixes
    ------------------------------------------------------------
    revno: 2793.2.16
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Wed 2009-03-11 23:52:22 +0300
    message:
      Merge
    ------------------------------------------------------------
    revno: 2793.2.15
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Wed 2009-03-11 23:13:39 +0300
    message:
      Change optimizer_switch from no_xxx to xxx=on/xx=off.
    ------------------------------------------------------------
    revno: 2793.2.14
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Tue 2009-03-10 11:49:30 +0300
    message:
      Post-merge fixes
    ------------------------------------------------------------
    revno: 2793.2.13
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Tue 2009-03-10 00:53:38 +0300
    message:
      Merge
    ------------------------------------------------------------
    revno: 2793.2.12
    committer: Sergey Petrunia <sergefp@mysql.com>
    branch nick: mysql-5.1-imerge-disable
    timestamp: Mon 2009-02-23 19:16:48 +0300
    message:
      - Backport @@optimizer_switch support from 6.0
      - Add support for setting it as a server commandline argument
      - Add support for those switches:
        = no_index_merge
        = no_index_merge_union
        = no_index_merge_sort_union
        = no_index_merge_intersection
------------------------------------------------------------
revno: 2818
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.1-bugteam
timestamp: Thu 2009-03-19 09:53:54 -0400
message:
  Merge bugteam and contributed two patches from 
  Antony Dovgal <tony @ daylessday.org> .  SCA signed and faxed to
  tel:+1-408-715-2540.  Patches tweaked by Chad.
    ------------------------------------------------------------
    revno: 2806.40.2
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.1-bugteam--antonyplugin
    timestamp: Thu 2009-03-19 09:37:30 -0400
    message:
      Copy include/config.h to include/my_config.h at configure-time.  Also,
      continue to update it at make-time.
      
      One shouldn't need to run "make" on server source to get the stuff we say
      plugins should use.
    ------------------------------------------------------------
    revno: 2806.40.1
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.1-bugteam--antonyplugin
    timestamp: Wed 2009-03-18 08:49:05 -0400
    message:
      Using autoconf definitions instead of manually appending to CFLAGS is 
      smarter, and according to a contributer, it is necessary for plugin authors
      using "--with-debug".
------------------------------------------------------------
revno: 2817
committer: Horst Hunger <horst@mysql.com>
branch nick: mysql-5.1-39862
timestamp: Thu 2009-03-19 12:30:25 +0100
message:
  due to merge.
    ------------------------------------------------------------
    revno: 2815.1.1
    committer: Staale Smedseng <staale.smedseng@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2009-03-19 11:44:57 +0100
    message:
      Merge from 5.0-bugteam
    ------------------------------------------------------------
    revno: 1810.3862.8
    committer: Staale Smedseng <staale.smedseng@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2009-03-19 11:27:45 +0100
    message:
      Bug #42502 huge memory leak possible with timezone 
      functions
            
      Unknown timezone specifications are properly rejected
      by the server, but are copied into tz_storage before
      rejection, and hence is retained until end of server 
      life. With sufficiently large bogus timezone specs, 
      it is easy to exhaust system memory.
            
      Allocation of memory for a copy of the timezone
      name is delayed until after verification of validity,
      at the cost of a memcpy of the timezone info. This 
      only happens once, future lookups will hit the cached
      structure.
------------------------------------------------------------
revno: 2816
committer: Horst Hunger <horst@mysql.com>
branch nick: mysql-5.1-39862
timestamp: Thu 2009-03-19 12:21:38 +0100
message:
  Reviewed patch for Bug#39862.
------------------------------------------------------------
revno: 2815
committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-03-19 13:09:34 +0300
message:
  Automerge.
    ------------------------------------------------------------
    revno: 1810.3862.7
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2009-03-19 13:07:30 +0300
    message:
      Automerge.
------------------------------------------------------------
revno: 2814
committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-03-19 13:08:15 +0300
message:
  Automerge.
    ------------------------------------------------------------
    revno: 2806.34.2
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: my51-bug41486
    timestamp: Thu 2009-03-19 13:04:20 +0300
    message:
      Automerge.
    ------------------------------------------------------------
    revno: 1810.3863.2
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: my50-bug41486
    timestamp: Thu 2009-03-19 13:02:23 +0300
    message:
      Fixed test failures in 5.1/6.0 introduced by the patch
      for bug #41486. Session max_allowed_packet is read-only
      as of MySQL 5.1.31. In addition, the global variable
      now has no effect on the current session.
------------------------------------------------------------
revno: 2813
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2009-03-19 13:26:12 +0400
message:
  5.0-bugteam->5.1-bugteam merge
    ------------------------------------------------------------
    revno: 1810.3862.6
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2009-03-19 12:42:26 +0400
    message:
      automerge
    ------------------------------------------------------------
    revno: 1810.3862.5
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2009-03-19 12:37:34 +0400
    message:
      Bug#41268 Help Text for \c is misleading in client command line interface
      fixed help message
    ------------------------------------------------------------
    revno: 1810.3862.4
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2009-03-19 12:20:28 +0400
    message:
      Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE
      Don't throw an error after checking the first and the second arguments.
      Continue with checking the third and higher arguments and if some of
      them is stronger according to coercibility rules,
      then this argument's collation is set as result collation.
------------------------------------------------------------
revno: 2812
committer: Satya B <satya.bn@sun.com>
branch nick: mysql-5.1-bugteam-21360
timestamp: Thu 2009-03-19 14:19:51 +0530
message:
  Merge 5.0-bugteam to 5.1-bugteam
    ------------------------------------------------------------
    revno: 1810.3861.5
    committer: Satya B <satya.bn@sun.com>
    branch nick: mysql-5.0-bugteam-21360
    timestamp: Thu 2009-03-19 13:53:24 +0530
    message:
      merge to 5.0-bugteam
    ------------------------------------------------------------
    revno: 1810.3861.4
    committer: Satya B <satya.bn@sun.com>
    branch nick: mysql-5.0-bugteam-21360
    timestamp: Thu 2009-03-19 11:36:37 +0530
    message:
      Fix for BUG#21360 - mysqldump error on federated tables
                              
      When loading dump created by mysqldump tool an error is
      thrown saying storage engine for the table doesn't have 
      an option.
                              
      mysqldump tries to re-insert the data into the federated
      table which causes the error. Since the data is already
      available on the remote server, mysqldump shouldn't try
      to dump the data again for FEDERATED tables.
                              
      As stated in the bug page, it can be considered similar
      to the MERGE ENGINE with "view only" nature.
                              
      Fixed by adding the "FEDERATED ENGINE" to the exception
      list to ignore the data.
------------------------------------------------------------
revno: 2811
committer: Leonard Zhou <leonard@mysql.com>
branch nick: bug22504
timestamp: Mon 2009-03-16 17:06:22 +0800
message:
  Merge
    ------------------------------------------------------------
    revno: 2806.2.40
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Thu 2009-03-19 10:15:08 +0300
    message:
      Automerge.
        ------------------------------------------------------------
        revno: 2806.32.5
        committer: Chad MILLER <chad@mysql.com>
        branch nick: 5.1-bugteam
        timestamp: Wed 2009-03-18 18:38:30 -0400
        message:
          Merge bugteam and fix for 42675.
            ------------------------------------------------------------
            revno: 2806.39.2
            committer: Chad MILLER <chad@mysql.com>
            branch nick: 5.1-bugteam--bug42675
            timestamp: Tue 2009-03-17 15:43:00 -0400
            message:
              Fix indentation.  tab -> spaces
            ------------------------------------------------------------
            revno: 2806.39.1
            committer: Chad MILLER <chad@mysql.com>
            branch nick: 5.1-bugteam--bug42675
            timestamp: Tue 2009-03-17 15:31:07 -0400
            message:
              Bug#42675: Dangling pointer leads to a client crash (mysys/my_error.c \
              	patch enclosed)
                
              One call to my_error_unregister_all() would free pointers, but leave one
              pointer to just-freed memory still assigned.  That's the bug.  Subsequent
              calls of this function would try to follow pointers into deallocated, 
              garbage memory and almost certainly SEGV.
              
              Now, after freeing a linked list, unset the initial pointer.
        ------------------------------------------------------------
        revno: 2806.32.4
        committer: Chad MILLER <chad@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-03-18 15:16:48 -0400
        message:
          Merge fix for 39326 and bugteam tree.
            ------------------------------------------------------------
            revno: 2806.38.2
            committer: Chad MILLER <chad@mysql.com>
            branch nick: mysql-5.1-bugteam--bug39326
            timestamp: Mon 2009-03-16 15:28:06 -0400
            message:
              Fix several quoting problems, and clean up IFS on failure in my_which().
            ------------------------------------------------------------
            revno: 2806.38.1
            committer: Chad MILLER <chad@mysql.com>
            branch nick: mysql-5.1-bugteam--bug39326
            timestamp: Mon 2009-03-16 14:54:28 -0400
            message:
              Bug#39326: mysqld_safe doesn't use --basedir value in search of \
              	my_print_defaults
              
              Now use basedir to set an unset ledir and to find the location of
              my_print_defaults .
        ------------------------------------------------------------
        revno: 2806.32.3
        committer: Horst Hunger <horst@mysql.com>
        branch nick: mysql-5.1-39484
        timestamp: Wed 2009-03-18 17:36:49 +0100
        message:
          due to merge (pull)
        ------------------------------------------------------------
        revno: 2806.32.2
        committer: Horst Hunger <horst@mysql.com>
        branch nick: mysql-5.1-39484
        timestamp: Wed 2009-03-18 17:23:39 +0100
        message:
          Due to bug#43733 I disabled "concurrent_innodb_(un)safelog.test" for embedded server.
    ------------------------------------------------------------
    revno: 2806.2.39
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-18 16:43:42 +0300
    message:
      Automerge.
        ------------------------------------------------------------
        revno: 2806.37.3
        committer: Tatiana A. Nurnberg <azundris@mysql.com>
        branch nick: 51-36751
        timestamp: Wed 2009-03-18 14:19:58 +0100
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 2806.37.2
        committer: Tatiana A. Nurnberg <azundris@mysql.com>
        branch nick: 51-36751
        timestamp: Wed 2009-03-18 13:31:35 +0100
        message:
          auto-merge
        ------------------------------------------------------------
        revno: 2806.37.1
        committer: Tatiana A. Nurnberg <azundris@mysql.com>
        branch nick: 51-36751
        timestamp: Wed 2009-03-11 19:09:56 +0100
        message:
          Bug#36751: Segmentation fault in ctype-bin.c:308; Linux 86_64, with-max-indexes=128
          
          mysqld is optimized for the default
          case (up to 64-indices); for a greater
          number of indices it goes through a
          different code path. As that code-path
          is a compile-time option and can not
          easily be covered in standard tests,
          bitrot occurred. key-fields need an
          explicit initialization in the non-
          optimized case; this setup was
          presumably not added when a new key-
          vector was added.
          
          Changeset adds the necessary
          initialisations.
          
          No test case added due to dependence
          on compile-time option.
    ------------------------------------------------------------
    revno: 2806.2.38
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-18 16:32:43 +0300
    message:
      Automerge.
        ------------------------------------------------------------
        revno: 2806.31.4
        committer: Vladislav Vaintroub <vvaintroub@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Wed 2009-03-18 14:20:01 +0100
        message:
          merge
            ------------------------------------------------------------
            revno: 2806.36.2
            committer: Georgi Kodinov <joro@sun.com>
            branch nick: merge-5.1-bugteam
            timestamp: Wed 2009-03-18 14:52:31 +0200
            message:
              addendum to the 22047 fix : updated funcs_1 test suite
            ------------------------------------------------------------
            revno: 2806.36.1
            committer: Georgi Kodinov <joro@sun.com>
            branch nick: merge-5.1-bugteam
            timestamp: Wed 2009-03-18 14:34:03 +0200
            message:
              merged 5.1-main -> 5.1-bugteam
            ------------------------------------------------------------
            revno: 2806.35.1
            committer: Jonathan Perkin <jperkin@sun.com>
            branch nick: mysql-5.1
            timestamp: Fri 2009-03-13 21:01:19 +0100
            message:
              Raise version number after cloning 5.1.33
        ------------------------------------------------------------
        revno: 2806.31.3
        committer: Vladislav Vaintroub <vvaintroub@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Tue 2009-03-17 23:28:24 +0100
        message:
          Bug #43715 Link errors when trying to link mysql_embedded.exe
          
          The reason for the error is incorrectly specified link dependencies
          for mysql_embedded, mysqltest_embedded and mysql_client_test_embedded
          in CMakeLists.txt (ADD_DEPENDENCIES should be TARGET_LINK_LIBRARIES)
    ------------------------------------------------------------
    revno: 2806.2.37
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-18 11:38:34 +0300
    message:
      Automerge.
        ------------------------------------------------------------
        revno: 1810.3862.3
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Wed 2009-03-18 11:35:52 +0300
        message:
          Automerge.
    ------------------------------------------------------------
    revno: 2806.2.36
    committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
    branch nick: mysql-5.1-bugteam
    timestamp: Wed 2009-03-18 11:36:48 +0300
    message:
      Automerge.
        ------------------------------------------------------------
        revno: 2806.34.1
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: my51-bug41486
        timestamp: Wed 2009-03-18 11:27:49 +0300
        message:
          Manual merge.
        ------------------------------------------------------------
        revno: 1810.3863.1
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: my50-bug41486
        timestamp: Wed 2009-03-18 11:18:24 +0300
        message:
          Fix for bug#41486: extra character appears in BLOB for every 
                             ~40Mb after mysqldump/import 
                  
          When the input string exceeds the maximum allowed size for the 
          internal buffer, batch_readline() returns a truncated string. 
          Since there was no way for a caller to determine whether the 
          string was truncated or not, the command line client assumed 
          batch_readline() to always return the whole input string and 
          appended a newline character. This resulted in garbled data 
          when importing dumps containing strings longer than the 
          maximum input buffer size. 
            
          Fixed by adding a flag to the batch_readline() interface to 
          signal a truncated string to the caller. 
            
          Other minor problems fixed during patch implementation: 
           
          - The maximum allowed buffer size for batch_readline() was set 
          up depending on the client's max_allowed_packet value. It does 
          not actully make any sense, as those variables are not 
          related. The input buffer size limit is now always set to 1 
          MB. 
            
          - fill_buffer() did not always set the EOF flag. 
           
          - The input buffer could actually grow twice as the specified 
          limit due to insufficient checks in intern_read_line(). 
    ------------------------------------------------------------
    revno: 2806.2.35
    committer: Guangbao Ni <gni@mysql.com>
    branch nick: bug42217-5.1
    timestamp: Wed 2009-03-18 15:19:28 +0000
    message:
      Auto-merged from 5.1-bugteam
        ------------------------------------------------------------
        revno: 2806.33.2
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.1-bugteam-32880
        timestamp: Wed 2009-03-18 12:39:44 +0530
        message:
          merge to  5.1-bugteam branch
        ------------------------------------------------------------
        revno: 2806.33.1
        committer: Satya B <satya.bn@sun.com>
        branch nick: mysql-5.1-bugteam-32880
        timestamp: Wed 2009-03-18 11:16:21 +0530
        message:
          Fix for BUG#32880 - Repairing Archive table fails with internal error 144
          
          Any statement reading corrupt archive data file
          (CHECK/REPAIR/SELECT/UPDATE/DELETE) may cause assertion
          failure in debug builds. This assertion has been removed
          and an error is returned instead.
          
          Also fixed that CHECK/REPAIR returns vague error message
          when it mets corruption in archive data file. This is
          fixed by returning proper error code.
    ------------------------------------------------------------
    revno: 2806.2.34
    committer: Guangbao Ni <gni@mysql.com>
    branch nick: bug42217-5.1
    timestamp: Wed 2009-03-18 15:02:06 +0000
    message:
      Auto-merge from 5.1-bugteam
        ------------------------------------------------------------
        revno: 2806.23.9
        committer: Leonard Zhou <zhou.li@sun.com>
        branch nick: bug39858
        timestamp: Wed 2009-03-18 11:05:48 +0800
        message:
          Merge
            ------------------------------------------------------------
            revno: 2806.31.2
            committer: Tatiana A. Nurnberg <azundris@mysql.com>
            branch nick: 51-36446
            timestamp: Tue 2009-03-17 18:38:04 +0100
            message:
              auto-merge
                ------------------------------------------------------------
                revno: 2806.27.7
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: B22047-5.1-bugteam
                timestamp: Tue 2009-03-17 16:33:54 +0200
                message:
                  merge 5.0-bugteam -> 5.1-bugteam
                    ------------------------------------------------------------
                    revno: 1810.3862.2
                    committer: Georgi Kodinov <joro@sun.com>
                    branch nick: B22047-5.0-bugteam
                    timestamp: Tue 2009-03-17 16:28:05 +0200
                    message:
                      merged 5.0-bugteam -> bug 22047
                ------------------------------------------------------------
                revno: 2806.27.6
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: B22047-5.1-bugteam
                timestamp: Tue 2009-03-17 16:32:44 +0200
                message:
                  auto-merge
                    ------------------------------------------------------------
                    revno: 2806.32.1
                    committer: Horst Hunger <horst@mysql.com>
                    branch nick: mysql-5.1-39484
                    timestamp: Tue 2009-03-17 14:43:43 +0100
                    message:
                      Fix for bug 39484 after review. I inserted the review results (also including the patches itself):
                      "Release_lock("hello")" is now also successful when delivering NULL, replaced two sleeps by wait_condition. The last two "sleep 1" have not been replaced as all tried wait conditions leaded to nondeterministic results, especially to succeeding concurrent updates. To replace the sleeps there should be some time planned (or internal knowledge of the server may help).
                       
                ------------------------------------------------------------
                revno: 2806.27.5
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: B22047-5.1-bugteam
                timestamp: Tue 2009-03-17 16:29:16 +0200
                message:
                  Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to 
                  become negative
                  
                  - merged the fix to 5.1
                  - extended to cover I_S.PROCESSLIST.TIME
                  - Changed the column type of I_S.PROCESSLIST.TIME from LOGNLONG
                    UNSIGNED
                    to LONG (to match the SHOW PROCESSLIST type)
                  - Added a test case
                ------------------------------------------------------------
                revno: 1810.3862.1
                committer: Georgi Kodinov <joro@sun.com>
                branch nick: B22047-5.0-bugteam
                timestamp: Fri 2009-03-13 15:51:25 +0200
                message:
                  Bug #22047 : Time in SHOW PROCESSLIST for SQL thread in replication 
                  seems to become negative
                  
                  THD::start_time has a dual meaning : it's either the time since the process
                  entered a given state or is the transaction time returned by e.g. NOW().
                  This causes problems, as sometimes THD::start_time may be set to a value
                  that is correct and needed when used as a base for NOW(), but these times
                  may be arbitrary (SET @@timestamp) or non-local (coming from the master 
                  through the replication feed).
                  If one such non-local time is set there's no way to return a correct value
                  for e.g. SHOW PROCESSLIST or SELECT ... FROM INFORMATION_SCHEMA.PROCESSLIST.
                  Fixed by making the Time column in SHOW PROCESSLIST SIGNED LONG instead of 
                  UNSIGNED LONG and doing the correct conversions.
                        
                  Note that no reliable test suite can be constructed, since it would require
                  knowing the local time and can't be achieved by the means of the current test
                  suite.
            ------------------------------------------------------------
            revno: 2806.31.1
            committer: Tatiana A. Nurnberg <azundris@mysql.com>
            branch nick: 51-36446
            timestamp: Tue 2009-03-17 18:24:35 +0100
            message:
              36446: fix Windows warning
        ------------------------------------------------------------
        revno: 2806.23.8
        committer: Leonard Zhou <zhou.li@sun.com>
        branch nick: bug39858
        timestamp: Thu 2009-03-12 17:48:41 +0800
        message:
          BUG#39858 rpl.rpl_rotate (rpl.rpl_rotate_logs) failed on pushbuild: result mismatch
          
          The method to purge binary log files produces different results in some platforms.
          The reason is that the purge time is calculated based on table modified time and
          that can't guarantee to purge master-bin.000002 in all platforms.(eg. windows)
          
          Use a new way that sets the time to purge binlog file 1 second after the last
          modified time of master-bin.000002.
          That can be sure that the file is always deleted in any platform.
    ------------------------------------------------------------
    revno: 2806.2.33
    committer: Guangbao Ni <gni@mysql.com>
    branch nick: bug42217-5.1
    timestamp: Wed 2009-03-18 13:48:23 +0000
    message:
      Bug #42217      mysql.procs_priv does not get replicated
      
      mysql.procs_priv table itself does not get replicated.
      Inserting routine privilege record into mysql.procs_priv table
      is triggered by creating function/procedure statements
      according to current user's privileges.
      Because the current user of SQL thread has GLOBAL_ACL,
      which doesn't need any check mysql.procs_priv privilege
      when create/alter/execute routines.
      Corresponding GLOBAL_ACL privilege user
      doesn't insert routine privilege record into
      mysql.procs_priv when creating a routine.
      
      Fixed by switching the current user of SQL thread to definer user if
      the definer user exists on slave.
      That populates procs_priv, otherwise to keep the SQL thread
      user and procs_priv remains unchanged.
    ------------------------------------------------------------
    revno: 2806.2.32
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 51-36446
    timestamp: Tue 2009-03-17 08:59:07 +0100
    message:
      auto-merge
        ------------------------------------------------------------
        revno: 2806.30.4
        committer: Ramil Kalimullin <ramil@mysql.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Tue 2009-03-17 11:04:15 +0400
        message:
          Code clean-up.
        ------------------------------------------------------------
        revno: 2806.30.3
        committer: Patrick Crews <patrick.crews@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Mon 2009-03-16 17:36:14 -0400
        message:
          Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
          
          Re-recording of .result files for additional tests that use this include file.
    ------------------------------------------------------------
    revno: 2806.2.31
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 51-36446
    timestamp: Mon 2009-03-16 21:21:10 +0100
    message:
      automerge
        ------------------------------------------------------------
        revno: 2806.30.2
        committer: Patrick Crews <patrick.crews@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Mon 2009-03-16 12:35:32 -0400
        message:
          merge
        ------------------------------------------------------------
        revno: 2806.30.1
        committer: Patrick Crews <patrick.crews@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Sun 2009-03-15 18:39:48 -0400
        message:
          merge 5.0 -> 5.1
        ------------------------------------------------------------
        revno: 1810.3861.3
        committer: Patrick Crews <patrick.crews@sun.com>
        branch nick: mysql-5.0-bugteam
        timestamp: Sun 2009-03-15 12:25:14 -0400
        message:
          Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
          
          Revised patch incorporating cleaner test code brought up during review.
          Removed the use of grep and accomplished same actions via SQL / use of the server.
          
          Runs as before on *nix systems and now runs on Windows without Cygwin as well.
    ------------------------------------------------------------
    revno: 2806.2.30
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 51-36446
    timestamp: Mon 2009-03-16 20:54:50 +0100
    message:
      manual merge
        ------------------------------------------------------------
        revno: 2806.26.5
        committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
        branch nick: mysql-5.1-bugteam
        timestamp: Mon 2009-03-16 13:37:13 +0300
        message:
          Manual merge of patch for bug #40552 into the team tree.
          Replaced a call to load_defaults() in sql_plugin.cc with 
          its thread-safe version.
            ------------------------------------------------------------
            revno: 2806.29.1
            committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
            branch nick: my51-bug40552
            timestamp: Fri 2009-02-27 11:26:06 +0200
            message:
              Fix for bug #40552: Race condition around default_directories  
                                  in load_defaults() 
              
              load_defaults(), my_search_option_files() and 
              my_print_default_files()  utilized a global variable 
              containing  a pointer to thread local memory. This could lead 
              to race conditions when those functions were called with high 
              concurrency. 
              
              Fixed by changing the interface of the said functions to avoid 
              the necessity for using a global variable.
              
              Since we cannot change load_defaults() prototype for API
              compatibility reasons, it was renamed my_load_defaults().
              Now load_defaults() is a thread-unsafe wrapper around
              a thread-safe version, my_load_defaults().
        ------------------------------------------------------------
        revno: 2806.26.4
        committer: Ramil Kalimullin <ramil@mysql.com>
        branch nick: b42957-5.1-bugteam
        timestamp: Mon 2009-03-16 09:02:10 +0400
        message:
          Fix for bug #42957: no results from 
          select where .. (col=col and col=col) or ... (false expression)
          
          Problem: optimizer didn't take into account a singular case 
          when we eliminated all the predicates at the AND level of WHERE.
          That may lead to wrong results.
          
          Fix: replace (a=a AND a=a...) with TRUE if we eliminated all the
          predicates.
        ------------------------------------------------------------
        revno: 2806.26.3
        committer: Andrei Elkin <aelkin@mysql.com>
        branch nick: 5.1-bt-bug40559-check_bl_magic
        timestamp: Fri 2009-03-13 22:02:16 +0200
        message:
          merge from 5.1-bt to a local branch
            ------------------------------------------------------------
            revno: 2806.27.4
            tags: clone-5.1.33-build, mysql-5.1.33
            committer: Georgi Kodinov <joro@sun.com>
            branch nick: mysql-5.1-merge
            timestamp: Fri 2009-03-13 13:13:55 +0200
            message:
              Bug #43614: make distcheck failure (ndb/Makefile is made, but not subdirs of ndb)
                    
              There are some recursive targets that automake generates which reference
              DIST_SUBDIRS.  It's critical, then, for such subdirs to exist even if they
              won't be built as part of SUBDIRS.
              
              During a VPATH build, it is the configure script which creates the subdirs
              (when it processes the AC_CONFIG_FILES() for each subdir's Makefile).  If
              autoconf doesn't create a subdir's Makefile, then the recursive make will fail
              when it is unable to cd into that subdir.
              
              This isn't a problem in non-VPATH builds, because the subdirs are all present
              in the source tarball.  So the problem only shows up during 'make distcheck',
              which does a VPATH build.
              
              The fix is to look, when configure is being created by autoconf, for any
              plugin subdirectories.  These are the dynamic subdirectories which need to be
              handled specially.  It's enough to tell autoconf to generate a Makefile for
              any Makefile.am found in the plugin directory - all plugin subdirectories
              using automake (i.e., listed in the plugin's DIST_SUBDIRS) will have a
              Makefile.am.
              
              This is done by calling 'find'.  This means that 'find' must be in the PATH on
              the host that is running autoconf.  'find' is NOT needed when calling
              configure, so it is not an additional dependency for the user.
              
              Finally, ha_ndbcluster.m4 had called AC_CONFIG_FILES() on all those subdir
              Makefiles, but only when the plugin was actually being built.  So it didn't
              work in the case that NDB was not being built.  All of those Makefiles have to
              be removed from this static list, since the plugin machinery is now adding
              them automatically.  autoconf fails if a file is duplicated in
              AC_CONFIG_FILES().
