------------------------------------------------------------
revno: 2677
committer: Timothy Smith <timothy.smith@sun.com>
branch nick: 5.0-bugteam
timestamp: Wed 2008-09-10 19:34:17 -0600
message:
  Auto merge 5.0-build -> 5.0-bugteam
    ------------------------------------------------------------
    revno: 2646.3.1
    committer: Daniel Fischer <df@sun.com>
    branch nick: mysql-5.0-build
    timestamp: Wed 2008-08-13 18:44:05 +0200
    message:
      let's try to avoid re-defining _vsnprintf on Windows
    ------------------------------------------------------------
    revno: 2646.3.2
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.0
    timestamp: Fri 2008-08-15 12:49:31 +0200
    message:
      Merge from main branch.
    ------------------------------------------------------------
    revno: 2646.3.3
    committer: Timothy Smith <timothy.smith@sun.com>
    branch nick: 5.0-build
    timestamp: Fri 2008-08-22 13:04:38 -0600
    message:
      Merge 5.0 main to 5.0-build
    ------------------------------------------------------------
    revno: 2646.3.4
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.0
    timestamp: Wed 2008-08-27 16:25:24 +0200
    message:
      Merge the bug fix development (37098: "unpackaged files")
      into the 5.0 team tree.
        ------------------------------------------------------------
        revno: 2648.3.1
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: bug37098-5.0
        timestamp: Mon 2008-08-25 21:07:41 +0200
        message:
          Bug#37098  Get rid of "Installed (but unpackaged)" files in the RPM build
          
          Mostly, this affected files (programs, scripts, and manual pages)
          which got built during a RPM build but were not listed in the
          appropriate "%files" section of the "spec" file.
          This is fixed now, they are added.
          
          To make this consistent, this patch also makes the build of "innochecksum"
          (and its inclusion in a tar.gz or other package) depend on whether InnoDB
          is configured in the build.
          
          Also, some tools to create Windows packages are irrelevant in any binary
          Unix package (not the sources !), and so they are deleted before packaging.
    ------------------------------------------------------------
    revno: 2646.3.5
    committer: Kent Boortz <kent@kent-amd64>
    branch nick: mysql-5.0-build
    timestamp: Fri 2008-08-29 17:30:41 +0200
    message:
      Handle that version "level" might contain "sp1", "a".....
    ------------------------------------------------------------
    revno: 2646.3.6
    author: timothy.smith@sun.com
    committer: mysqldev <mysqldev@production.mysql.com>
    branch nick: mysql-5.0-build
    timestamp: Fri 2008-09-05 21:36:31 +0200
    message:
      Merge from mysql-5.0.68-release
    ------------------------------------------------------------
    revno: 2646.3.7
    committer: Joerg Bruehe <joerg@mysql.com>
    branch nick: push-5.0
    timestamp: Wed 2008-09-10 21:11:22 +0200
    message:
      Merge main 5.0 into 5.0-build.
------------------------------------------------------------
revno: 2678
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Mon 2008-09-15 14:58:32 +0200
message:
  Bug#35987 - crash report on windows doesn't resolve stack traces.
  The problem here is that symbols can not be loaded, because symbol
  path is not set and  default path does not include the directory
  where PDB is located.
  
  The problem is _not_ reproducible on the same machine where
  mysqld.exe is built - if PDB is not found in the symbol path,
  dbghelp would fallback to fully qualified PDB path as given in the
  executable header and on the build host this will succeed.
  
  The solution is to calculate symbol path and pass it to SymInitialize()
  call.
------------------------------------------------------------
revno: 2679
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Mon 2008-09-15 15:34:39 -0400
message:
  Bug#37938 Test "mysqldump" lacks various INSERT statements / values
  
  Moved fix for this bug to 5.0 as other mysqldump bugs seem tied to concurrent_insert being on
  Setting concurrent_insert off during this test as INSERTs weren't being 
  completely processed before the calls to mysqldump, resulting in failing tests.
  
  Altered .test file to turn concurrent_insert off during the test and to restore it
  to whatever the value was at the start of the test when complete.
  
  Re-recorded .result file to account for changes to variables in the test.
------------------------------------------------------------
revno: 2680
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2008-09-16 13:16:41 +0200
message:
  Bug#35987 - post-review fix
  Correct usage of strncat() in get_symbol_path()
  
  3rd parameter to strncat is changed to be count of 
  remaining bytes in the output buffer minus 1.
------------------------------------------------------------
revno: 2681
committer: Matthias Leich <Matthias.Leich@sun.com>
branch nick: mysql-5.0-bugteam-push
timestamp: Tue 2008-09-16 19:05:30 +0200
message:
  Fix for Bug#38184 : main.federated fails sporadically
  Details:
  - backport of some improvements which prevent sporadic
    failures from 5.1 to 5.0
  - @@GLOBAL.CONCURRENT_INSERT= 0 also for slave server
  - --sorted_result before all selects which have result
    sets with more than one row
  - Replace error numbers by error names
------------------------------------------------------------
revno: 2682
committer: Matthias Leich <Matthias.Leich@sun.com>
branch nick: mysql-5.0-bugteam-push
timestamp: Thu 2008-09-18 15:32:06 +0200
message:
  Merge actual tree -> local tree
  no conflicts
    ------------------------------------------------------------
    revno: 2679.1.1
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 50-37114
    timestamp: Wed 2008-09-17 08:34:00 +0200
    message:
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
      
      NO_BACKSLASH_ESCAPES was not heeded in LOAD DATA INFILE
      and SELECT INTO OUTFILE.  It is now.
    ------------------------------------------------------------
    revno: 2679.1.2
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 50-37114
    timestamp: Wed 2008-09-17 17:44:15 +0200
    message:
      auto-merge
    ------------------------------------------------------------
    revno: 2679.1.3
    committer: Tatiana A. Nurnberg <azundris@mysql.com>
    branch nick: 50-37114
    timestamp: Thu 2008-09-18 11:24:50 +0200
    message:
      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA      Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DATA INFILE
      
      tweaked test to make embedded server happy
------------------------------------------------------------
revno: 2683
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Sat 2008-09-20 02:21:28 -0400
message:
  Bug#38311 Some tests use 'rm' which is not portable
  Substituted use of MTR's remove_file function in the tests
  Started with 5.0 tree and will clean up any offenders discovered during upmerge.
------------------------------------------------------------
revno: 2684
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2008-09-23 05:24:32 -0400
message:
  Bug#38311 - Fix of some cruft from remove_files in ndb_autodiscover.test, clean up of distinct.test,
  and replacing error numbers with error names.
    ------------------------------------------------------------
    revno: 2682.1.1
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.0-bugteam
    timestamp: Sat 2008-09-20 03:56:33 -0300
    message:
      Restore team tree name.
------------------------------------------------------------
revno: 2685
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2008-09-30 12:56:12 -0400
message:
  Automerge
    ------------------------------------------------------------
    revno: 2676.1.1
    committer: Kristofer Pettersson <kpettersson@mysql.com>
    branch nick: mysql-5.0-bug38469
    timestamp: Sat 2008-09-20 10:51:03 +0200
    message:
      Bug#38469 invalid memory read and/or crash with utf8 text field, stored procedure, uservar
                  
      A stored procedure involving substrings could crash the server on certain
      platforms because of invalid memory reads.
                
      During storing the new blob-field value, the cached value's address range
      overlapped that of the new field value. This caused problems when the 
      cached value storage was reallocated to provide access for a new 
      characater set representation. The patch checks the address ranges, and if
      they overlap, the new field value is copied to a new storage before it is
      converted to the new character set.
    ------------------------------------------------------------
    revno: 2682.1.2
    committer: Kristofer Pettersson <kpettersson@mysql.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Sat 2008-09-20 16:45:39 +0200
    message:
      Automerge
    ------------------------------------------------------------
    revno: 2682.1.3
    committer: Alexey Botchkov <holyfoot@mysql.com>
    branch nick: 37949
    timestamp: Mon 2008-09-29 19:11:34 +0500
    message:
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
           JOIN for the subselect wasn't cleaned if we came upon an error
           during sub_select() execution. That leads to the assertion failure
           in close_thread_tables()
      
           part of the 6.0 code backported
      
      per-file comments:
        mysql-test/r/sp-error.result
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          test result
      
        mysql-test/t/sp-error.test
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          test case
      
        sql/sp_head.cc
      Bug#37949 Crash if argument to SP is a subquery that returns more than one row 
          lex->unit.cleanup() call added if not substatement
------------------------------------------------------------
revno: 2686
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Tue 2008-09-30 16:23:04 -0400
message:
  automerge
    ------------------------------------------------------------
    revno: 2682.1.4
    committer: Gleb Shchepa <gshchepa@mysql.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Tue 2008-09-30 17:50:28 +0500
    message:
      Fixed bug #17823: 'arc' directories inside database directories.
      
      Server created "arc" directories inside database directories and
      maintained there useless copies of .frm files.
      
      Creation and renaming procedures of those copies as well as
      creation of "arc" directories has been discontinued.
      Removal procedure has been kept untouched to be able to
      cleanup existent database directories by the DROP DATABASE
      query. Also view renaming procedure has been updated to remove
      these directories.
------------------------------------------------------------
revno: 2687
committer: Patrick Crews <patrick.crews@sun.com>
branch nick: mysql-5.0-newest
timestamp: Tue 2008-09-30 20:54:06 -0400
message:
  Bug#38311  Some tests use 'rm' which is not portable
  
  Repush of change to fix tests on Pushbuild.
------------------------------------------------------------
revno: 2688
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Wed 2008-10-01 12:41:13 +0300
message:
  merged 5.0-5.1.29-rc into 5.0-bugteam
------------------------------------------------------------
revno: 2689
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Wed 2008-10-01 12:42:45 +0300
message:
  merged 5.0-main -> 5.0-bugteam
    ------------------------------------------------------------
    revno: 2676.2.1
    author: timothy.smith@sun.com
    committer: mysqldev <mysqldev@production.mysql.com>
    branch nick: mysql-5.0
    timestamp: Fri 2008-09-19 15:48:46 +0200
    message:
      Raise version number after cloning 5.0.70
------------------------------------------------------------
revno: 2690
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Wed 2008-10-01 12:45:02 +0300
message:
  fixed a wrong directory in distinct.test
------------------------------------------------------------
revno: 2691
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Wed 2008-10-01 15:53:11 +0300
message:
  fixed a failure in symlink.test caused by replacing rm with remove_file
------------------------------------------------------------
revno: 2692
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: B37943-5.0-bugteam
timestamp: Wed 2008-10-01 18:50:55 +0300
message:
  Bug#37943: Reproducible mysqld crash/sigsegv in sel_trees_can_be_ored
              
  When analyzing the possible index use cases the server was re-using an internal structure.
  This is wrong, as this internal structure gets updated during the analysis.
  Fixed by making a copy of the internal structure for every place it needs to be used.
  Also stopped the generation of empty SEL_TREE structures that unnecessary 
  complicate the analysis.
------------------------------------------------------------
revno: 2693
committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-02 14:37:07 +0500
message:
  Bug#22763 Disrepancy between SHOW CREATE VIEW and I_S.VIEWS
  The problem:
  I_S views table does not check the presence of SHOW_VIEW_ACL|SELECT_ACL
  privileges for a view. It leads to discrepancy between SHOW CREATE VIEW
  and I_S.VIEWS.
  The fix:
  added appropriate check.
------------------------------------------------------------
revno: 2694
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-02 16:29:41 +0200
message:
  Bug #38629  	
  mysql-test-run.pl --start-and-exit starts but does not exit
  Instead, it hangs with ActiveState perl. The error is
  believed to be a bug in ActiveState implementation.
  Workaround is using POSIX::_exit, as described here
  http://www.perlmonks.org/?node_id=334610
  
  Thanks to Philip Stoev for the idea of the patch.
------------------------------------------------------------
revno: 2695
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-02 17:48:37 +0200
message:
  merge
    ------------------------------------------------------------
    revno: 2693.1.1
    committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Thu 2008-10-02 16:57:52 +0500
    message:
      Bug#35924 DEFINER should be stored 'quoted' in I_S
      The '@' symbol can not be used in the host name according to rfc952.
      The fix:
      added function check_host_name(LEX_STRING *str)
      which checks that all symbols in host name string are valid and
      host name length is not more than max host name length
      (just moved check_string_length() function from the parser into check_host_name()).
------------------------------------------------------------
revno: 2696
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.0-bugteam
timestamp: Fri 2008-10-03 10:19:02 -0400
message:
  Merge fix for Bug#35754.
    ------------------------------------------------------------
    revno: 2682.2.1
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.0-bugteam--bug31167
    timestamp: Wed 2008-09-24 08:59:56 -0400
    message:
      Bug#35754: mysql_install_db does not work if no hostname is set
      
      Machines with hostname set to "localhost" cause uniqueness errors in 
      the SQL bootstrap data.
      
      Now, insert zero lines for cases where the (lowercased) hostname is 
      the same as an already-inserted 'localhost' name.  Also, fix a few tests 
      that expect certain local accounts to have a certain host name.
------------------------------------------------------------
revno: 2697
committer: Matthias Leich <Matthias.Leich@sun.com>
branch nick: mysql-5.0-bugteam-push
timestamp: Sat 2008-10-04 17:13:43 +0200
message:
  Merge of fixes for Bug#38427 and Bug#38762 into actual tree
  (no conflicts)
    ------------------------------------------------------------
    revno: 2682.3.1
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.0-bugteam-A
    timestamp: Thu 2008-10-02 13:04:29 +0200
    message:
      Fix for Bug#38762 main.federated_bug_25714 fails sporadically
    ------------------------------------------------------------
    revno: 2682.3.2
    committer: Matthias Leich <Matthias.Leich@sun.com>
    branch nick: mysql-5.0-bugteam-A
    timestamp: Thu 2008-10-02 13:47:16 +0200
    message:
      Fix for Bug#38427 "Data too long" in some configurations,
                        tests "<ENGINE>_func_view" fail
------------------------------------------------------------
revno: 2698
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.0-bugteam
timestamp: Mon 2008-10-06 08:24:14 -0400
message:
  Merge fix for join-testcase failure.
    ------------------------------------------------------------
    revno: 2682.2.2
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.0-bugteam--bug31167
    timestamp: Mon 2008-10-06 08:18:13 -0400
    message:
      Fix for test for b-g#35754 which fails based on hostname ?= "localhost".
------------------------------------------------------------
revno: 2699
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.0-bugteam
timestamp: Mon 2008-10-06 09:52:27 -0400
message:
  Merge fix for bug 11122.
    ------------------------------------------------------------
    revno: 2652.1.1
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.0-bugteam--bug11122
    timestamp: Thu 2008-10-02 12:25:52 -0400
    message:
      Bug#11122: Server won't always start when cold-booting after a crash
      
      The grep expression that finds a running "mysqld" program fails if the
      "mysqld_safe" is running with the same PID.
      
      Now, excise "ps" output that has the word " grep" or "mysqld_safe" in 
      it, to be a little more certain that the matched process is not a false 
      positive hit.  This will fail when the path to mysqld contains either
      of those two names, which should be acceptable.
      
      Additionally, some text to search could be truncated if very long.  
      Expand the number of lines "ps" emits.
    ------------------------------------------------------------
    revno: 2652.1.2
    committer: Chad MILLER <chad@mysql.com>
    branch nick: 5.0-bugteam--bug11122
    timestamp: Mon 2008-10-06 09:49:50 -0400
    message:
      Remove part of comment for b-g#11122 that is no longer true.
------------------------------------------------------------
revno: 2700
committer: Chad MILLER <chad@mysql.com>
branch nick: 5.0-bugteam
timestamp: Mon 2008-10-06 11:35:21 -0400
message:
  Fix autoconf substitution and evaluation of a string inside single quotes
  so that if the substitution contains single-quotes, the program will fail.
------------------------------------------------------------
revno: 2701
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Tue 2008-10-07 18:24:25 +0300
message:
  merged 5.0-5.1.29-rc -> 5.0-bugteam
    ------------------------------------------------------------
    revno: 2671.2.16
    committer: Ramil Kalimullin <ramil@mysql.com>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Wed 2008-10-01 14:48:47 +0500
    message:
      Fix for bug#39182: Binary log producing incompatible character set query
      from stored procedure. 
      
      Problem: we replace all references to local variables in stored procedures     
      with NAME_CONST(name, value) logging to the binary log. However, if the
      value's collation differs we might get an 'illegal mix of collation'           
      error as we don't pass the collation to the function.
      
      Fix: pass the value's collation to NAME_CONST().
      
      Note: actually we should pass to NAME_CONST() the value's derivation as well.
      It's impossible without the parser modifying. Now we always set the 
      derivation to DERIVATION_IMPLICIT, the same as local variables have.
    ------------------------------------------------------------
    revno: 2671.2.17
    committer: Ramil Kalimullin <ramil@mysql.com>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Thu 2008-10-02 13:10:06 +0500
    message:
      merge
------------------------------------------------------------
revno: 2702
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Fri 2008-10-10 15:13:12 +0500
message:
  Bug #39283: Date returned as VARBINARY to client for queries
              with COALESCE and JOIN
  
  The server returned to a client the VARBINARY column type
  instead of the DATE type for a result of the COALESCE,
  IFNULL, IF, CASE, GREATEST or LEAST functions if that result
  was filesorted in an anonymous temporary table during
  the query execution.
  
  For example:
    SELECT COALESCE(t1.date1, t2.date2) AS result
      FROM t1 JOIN t2 ON t1.id = t2.id ORDER BY result;
  
  
  To create a column of various date/time types in a
  temporary table the create_tmp_field_from_item() function
  uses the Item::tmp_table_field_from_field_type() method
  call. However, fields of the MYSQL_TYPE_NEWDATE type were
  missed there, and the VARBINARY columns were created
  by default.
  Necessary condition has been added.
------------------------------------------------------------
revno: 2703
committer: Gleb Shchepa <gshchepa@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Fri 2008-10-10 15:27:58 +0500
message:
  Bug #37894: Assertion in init_read_record_seq in handler.h line 1444
  
  Select with a "NULL NOT IN" condition containing complex
  subselect from the same table as in the outer select failed
  with an assertion.
  
  
  The failure was caused by a concatenation of circumstances:
  1) an inner select was optimized by make_join_statistics to use
     the QUICK_RANGE_SELECT access method (that implies an index
     scan of the table);
  2) a subselect was independent (constant) from the outer select;
  3) a condition was pushed down into inner select.
  
  During the evaluation of a constant IN expression an optimizer
  temporary changed the access method from index scan to table
  scan, but an engine handler was already initialized for index
  access by make_join_statistics. That caused an assertion.
  
  
  Unnecessary index initialization has been removed from
  the QUICK_RANGE_SELECT::init method (QUICK_RANGE_SELECT::reset
  reinvokes this initialization).
------------------------------------------------------------
revno: 2704
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: merge-5.0-bugteam
timestamp: Fri 2008-10-10 17:27:16 +0300
message:
  merged 5.0-main -> 5.0-bugteam
    ------------------------------------------------------------
    revno: 2671.2.18
    committer: Gleb Shchepa <gshchepa@mysql.com>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Wed 2008-10-08 02:34:00 +0500
    message:
      Bug #38691: segfault/abort in ``UPDATE ...JOIN'' while
                ``FLUSH TABLES WITH READ LOCK''
      
      Concurrent execution of 1) multitable update with a
      NATURAL/USING join and 2) a such query as "FLUSH TABLES
      WITH READ LOCK" or "ALTER TABLE" of updating table led
      to a server crash.
      
      
      The mysql_multi_update_prepare() function call is optimized
      to lock updating tables only, so it postpones locking to
      the last, and if locking fails, it does cleanup of modified
      syntax structures and repeats a query analysis.  However,
      that cleanup procedure was incomplete for NATURAL/USING join
      syntax data: 1) some Field_item items pointed into freed
      table structures, and 2) the TABLE_LIST::join_columns fields
      was not reset.
      
      Major change:
        short-living Field *Natural_join_column::table_field has
        been replaced with long-living Item*.
    ------------------------------------------------------------
    revno: 2701.1.1
    committer: Georgi Kodinov <kgeorge@mysql.com>
    branch nick: merge-5.0-bugteam
    timestamp: Wed 2008-10-08 11:36:24 +0300
    message:
      merged 5.0-5.1.29-rc -> 5.0-bugteam
    ------------------------------------------------------------
    revno: 2701.1.2
    committer: Gleb Shchepa <gshchepa@mysql.com>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Thu 2008-10-09 20:24:31 +0500
    message:
      Bug#38499: flush tables and multitable table update with
                 derived table cause crash
      
      When a multi-UPDATE command fails to lock some table, and
      subsequently succeeds, the tables need to be reopened if
      they were altered. But the reopening procedure failed for
      derived tables.
      
      Extra cleanup has been added.
------------------------------------------------------------
revno: 2705
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: 38823-5.0
timestamp: Tue 2008-10-14 11:04:36 -0300
message:
  Bug#38823: Invalid memory access when a SP statement does wildcard expansion
  
  The problem is that field names constructed due to wild-card
  expansion done inside a stored procedure could point to freed
  memory if the expansion was performed after the first call to
  the stored procedure.
  
  The problem was solved by patch for Bug#38691. The solution
  was to allocate the database, table and field names in the
  in the statement memory instead of table memory.
------------------------------------------------------------
revno: 2706
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: B38693-5.0-bugteam
timestamp: Wed 2008-10-15 16:55:52 +0300
message:
  Bug #38693: leaked memory with blobs!
  
  If delayed insert fails to upgrade the lock it was not
  freeing the temporary memory storage used to keep
  newly constructed blob values in memory.
  Fixed by iterating over the remaining rows in the delayed
  insert rowset and freeing the blob storage for each row.
  
  No test suite because it involves concurrent delayed inserts 
  on a table and cannot easily be made deterministic. 
  
  Added a correct valgrind suppression for Fedora 9.
------------------------------------------------------------
revno: 2707
committer: Georgi Kodinov <kgeorge@mysql.com>
branch nick: B38693-5.0-bugteam
timestamp: Mon 2008-10-20 16:26:07 +0300
message:
  merge 5.0-bugteam -> bug 38693-5.0-bugteam
    ------------------------------------------------------------
    revno: 2692.1.1
    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
    branch nick: mysql-5.0-bug24289
    timestamp: Thu 2008-10-09 09:26:42 +0200
    message:
      Bug#24289 Status Variable "Questions" gets wrong values with Stored Routines
                       
      When running Stored Routines the Status Variable "Questions" was wrongly
      incremented. According to the manual it should contain the "number of
      statements that clients have sent to the server"
                    
      Introduced a new status variable 'questions' to replace the query_id
      variable which currently corresponds badly with the number of statements
      sent by the client.
                  
      The new behavior is ment to be backward compatible with 4.0 and at the
      same time work with new features in a similar way.
                  
      This is a backport from 6.0
    ------------------------------------------------------------
    revno: 2701.2.1
    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Wed 2008-10-15 12:06:44 +0200
    message:
      automerge
    ------------------------------------------------------------
    revno: 2701.2.2
    committer: Kristofer Pettersson <kristofer.pettersson@sun.com>
    branch nick: mysql-5.0-bugteam
    timestamp: Mon 2008-10-20 13:39:33 +0200
    message:
      Auto commit
        ------------------------------------------------------------
        revno: 2705.1.1
        committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
        branch nick: 37075-5.0
        timestamp: Wed 2008-10-15 18:34:51 -0300
        message:
          Bug#37075: offset of limit clause might be truncated on 32-bits server w/o big tables
          
          The problem is that the offset argument of the limit clause
          might be truncated on a 32-bits server built without big
          tables support. The truncation was happening because the
          original 64-bits long argument was being cast to a 32-bits
          (ha_rows) offset counter.
          
          The solution is to check if the conversing resulted in value
          truncation and if so, the offset is set to the maximum possible
          value that can fit on the type.
        ------------------------------------------------------------
        revno: 2705.1.2
        committer: Georgi Kodinov <kgeorge@mysql.com>
        branch nick: B39958-5.0-bugteam
        timestamp: Thu 2008-10-16 14:16:27 +0300
        message:
          Bug #39958: Test "windows" lacks a cleanup
          
          Added the missing DROP TABLE
        ------------------------------------------------------------
        revno: 2705.1.3
        committer: Georgi Kodinov <kgeorge@mysql.com>
        branch nick: B39958-5.0-bugteam
        timestamp: Fri 2008-10-17 11:47:35 +0300
        message:
          merged 5.0-bugteam -> bug 39958
            ------------------------------------------------------------
            revno: 2705.2.1
            committer: Gleb Shchepa <gshchepa@mysql.com>
            branch nick: 5.0-bugteam-39844
            timestamp: Thu 2008-10-16 21:37:17 +0500
            message:
              Bug #39844: Query Crash Mysql Server 5.0.67
              
              Server crashed during a sort order optimization
              of a dependent subquery:
              
              SELECT
                  (SELECT t1.a FROM t1, t2
                    WHERE t1.a = t2.b AND t2.a = t3.c
                    ORDER BY t1.a)
                FROM t3;
              
              
              Bitmap of tables, that the reference to outer table
              column uses, in addition to the regular table bit
              has the OUTER_REF_TABLE_BIT bit set.
              The only_eq_ref_tables function traverses this map
              bit by bit simultaneously with join->map2table list.
              Obviously join->map2table never contains an entry
              for the OUTER_REF_TABLE_BIT pseudo-table, so the
              server crashed there.
              
              
              The only_eq_ref_tables function has been modified
              to traverse regular table bits only like the
              update_depend_map function (resetting of the
              OUTER_REF_TABLE_BIT there is enough, but
              resetting of the whole set of PSEUDO_TABLE_BITS
              is used there for sure).
------------------------------------------------------------
revno: 2708
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-23 15:28:53 +0200
message:
   Bug#40280: Message compiler(mc.exe) needed to compile MySQL on windows.
  
  Visual Studio 2008 Express edition does not include message compiler mc.exe
  It is not possible to build MySQL server if only VC2008 Express is installed,
  because we use mc.exe to generate event log messages.
  
  This patch removes the mc.exe dependency. Generated files message.h, 
  message.rc and MSG00001.bin  are checked into source code repository.
  Instructions on how to add or change messages are added to messages.mc
------------------------------------------------------------
revno: 2709
committer: Vladislav Vaintroub<vvaintroub@mysql.com>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-23 22:05:47 +0200
message:
  merge
    ------------------------------------------------------------
    revno: 2707.1.1
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: 28323-5.0
    timestamp: Tue 2008-10-21 15:45:43 -0200
    message:
      Bug#28323: Server crashed in xid cache operations
      
      The problem was that the server did not robustly handle a
      unilateral roll back issued by the Resource Manager (RM)
      due to a resource deadlock within the transaction branch.
      By not acknowledging the roll back, the server (TM) would
      eventually corrupt the XA transaction state and crash.
      
      The solution is to mark the transaction as rollback-only
      if the RM indicates that it rolled back its branch of the
      transaction.
------------------------------------------------------------
revno: 2710
tags: clone-5.0.72-build
committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
branch nick: mysql-5.0-bugteam
timestamp: Thu 2008-10-23 18:56:03 -0200
message:
  Merge from mysql-5.0-5.1.29-rc into mysql-5.0-bugteam
    ------------------------------------------------------------
    revno: 2701.1.3
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Tue 2008-10-21 16:07:31 -0200
    message:
      Bug#28323: Server crashed in xid cache operations
      
      The problem was that the server did not robustly handle a
      unilateral roll back issued by the Resource Manager (RM)
      due to a resource deadlock within the transaction branch.
      By not acknowledging the roll back, the server (TM) would
      eventually corrupt the XA transaction state and crash.
      
      The solution is to mark the transaction as rollback-only
      if the RM indicates that it rolled back its branch of the
      transaction.
    ------------------------------------------------------------
    revno: 2701.1.4
    committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
    branch nick: mysql-5.0-5.1.29-rc
    timestamp: Tue 2008-10-21 19:02:26 -0200
    message:
      Post-merge fix: drop table at the end of test.
    ------------------------------------------------------------
    revno: 2701.1.5
    committer: Georgi Kodinov <kgeorge@mysql.com>
    branch nick: merge-5.0-5.1.29-rc
    timestamp: Thu 2008-10-23 16:35:44 +0300
    message:
      merged 5.0 main -> 5.0-5.1.29-rc
        ------------------------------------------------------------
        revno: 2646.3.8
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: push-5.0
        timestamp: Sat 2008-10-04 17:38:24 +0200
        message:
          Merge main 5.0 branch -> 5.0-build (team tree).
        ------------------------------------------------------------
        revno: 2646.3.9
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: push-5.0
        timestamp: Sat 2008-10-04 18:32:23 +0200
        message:
          Fix some bad merge that got the string "5.1-bugteam" into this 5.0 tree.
        ------------------------------------------------------------
        revno: 2646.3.10
        committer: Joerg Bruehe <joerg@mysql.com>
        branch nick: push-5.0
        timestamp: Fri 2008-10-10 19:20:42 +0200
        message:
          Merge from main 5.0 branch -> 5.0-build
          
          Merge conflicts in test "create:
          - for "create.result", handled correctly by "bzr extmerge" (using "kdiff3"),
          - for "create.test", not reported as a conflict, but merged wrong
            (new block at the test end got duplicated), fixed manually.
          
          Test on Linux (Debian, PowerPC) was ok.
        ------------------------------------------------------------
        revno: 2646.3.11
        committer: Kent Boortz <kent@kent-amd64>
        branch nick: mysql-5.0-build
        timestamp: Mon 2008-10-13 14:23:39 +0200
        message:
          The header "config.h" needs to be included "early" to control other headers.
          This time the inclusion of <stdio.h> before "config.h" enabled legacy large
          file support, seek64() and similar, on AIX breaking the compile of "gzio.c"
        ------------------------------------------------------------
        revno: 2646.3.12
        author: timothy.smith@sun.com
        committer: mysqldev <mysqldev@production.mysql.com>
        branch nick: mysql-5.0-build
        timestamp: Tue 2008-10-21 17:21:23 +0200
        message:
          Merge from mysql-5.0.70-release
------------------------------------------------------------
revno: 2711
committer: Joerg Bruehe <joerg@mysql.com>
branch nick: clone-5.0
timestamp: Fri 2008-10-24 17:34:17 +0200
message:
  Fix a "configure" syntax error.
  
  It had been introduced with the patch for bug entry 37098
  and affected runs "--without-server" only.
