into neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
sql/sql_base.cc:
  Auto merged

sql/sql_parse.cc:
  Just do a simple sprintf to format error message.

into neptunus.(none):/home/msvensson/mysql/bug10466


mysql-test/r/alias.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/alias.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

mysql-test/r/client_xml.result:
  Update testresult
mysql-test/r/ndb_autodiscover.result:
  Moving order opf test results to match test execution order

sql/sql_select.cc:
  If we use subqueries, we can have double-free of tmp_table_param.copy_field
  in JOIN::destroy and in JOIN::join_free because.

into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.sh:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

sql/sql_select.cc:
  According to the conclusion made in the previous patch, we can widen
  the range of cases when JOINs are fully freed early, and include 
  subqueries to it.

sql/sql_select.cc:
  This assert is not relevant because:
  - the correct assert is DBUG_ASSERT(! (full && sl->uncacheable)) 
    (prevents freeing of uncacheable JOINs), it breaks view.test
  - it seems we can free internal JOINs, even if they are uncacheable:
    if the top level join is evaluated, we're not going to need  the
    internal joins any more

into mysql.com:/opt/local/work/mysql-5.0-join_free2push

into mysql.com:/opt/local/work/mysql-5.0-join_free2push


sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

The reason it happened was that both, JOIN::cleanup() and JOIN::join_free(),
went over all nested joins and called cleanup/join_free for them.
For that:
- split recursive and non-recursive parts of JOIN::cleanup() and
JOIN::join_free()
- rename JOIN::cleanup to JOIN::destroy, as it actually destroys its
  argument
- move the recursive part of JOIN::cleanup to st_select_lex::cleanup
- move the non-recursive part of JOIN::join_free to the introduced
  method JOIN::cleanup().


sql/sql_lex.h:
  Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup()
sql/sql_select.cc:
  - remove two unused arguments from return_zero_rows
  - split JOIN::join_free and JOIN::cleanup to recursive and non-recursive
    parts.
  - note, the assert in JOIN::join_free _does_ fail in having.test.
    We have two options: a) propagate `full' flag to the nested joins.
    We did it before, and this patch didn't change it. If so, we 
    can end up cleaning up an uncacheable JOIN (that is, the join that
    we might need again).
    b) evaluate own 'full' flag on every level. In this case, we might
    end up with tables freed in mysql_unlock_read_tables, but not
    cleaned up properly, and this may be even worse. The test suite
    passes with both approaches, but not with the assert.
sql/sql_select.h:
  - declarations for JOIN::cleanup() and JOIN::join_free()
sql/sql_union.cc:
  Add st_select_lex::cleanup, a counterpart of st_select_lex_unit::cleanup():
  move the recursive part of JOIN::cleanup to it.

into mysql.com:/home/mydev/mysql-5.0-bug8321

After merge fixes of test result.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

Bug#10568 - Function 'LAST_DAY(date)' does not return NULL for invalid argument.
Manual merge.


include/my_global.h:
  Auto merged
mysql-test/t/heap_hash.test:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
  Used local for the backported fix for Bug#10568.
mysql-test/r/heap_hash.result:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
  Used local for the backported fix for Bug#10568.
sql/ha_heap.cc:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Manual merge.

mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

Added 64-bit extensions, comments, extended statistics 
and trace prints.


include/my_base.h:
  Bug#8321 - myisampack bug in compression algorithm
  Added a comment.
myisam/mi_packrec.c:
  Bug#8321 - myisampack bug in compression algorithm
  Fixed a function comment.
myisam/myisampack.c:
  Bug#8321 - myisampack bug in compression algorithm
  Enlarged the variables which hold Huffman codes to
  ulonglong and adjusted the functions accordingly.
  Added test code for long Huffman codes.
  Enlarged the distinct column values buffer (tree_buff)
  and added checks to stay in its range.
  Added statistics and trace prints.
  Added a lot of comments.
mysys/tree.c:
  Bug#8321 - myisampack bug in compression algorithm
  Added a check against overflow of the tree element count.
  The tree element count is only 31 bits, but sometimes
  used for big numbers. There is however no application yet,
  which relies on exact tree element counts.

  Corrected master server id's


mysql-test/mysql-test-run.pl:
  Corrected master server id's

Wrong comparing method were choosen which results in false comparison.

Make Item_bool_func2::fix_length_and_dec() to get type and field from
real_item() to make REF_ITEM pass the check. 


sql/item_cmpfunc.cc:
  Fix bug#11325 Wrong date comparison in views
mysql-test/t/view.test:
  Test case for bug#11325 Wrong date comparison in views.
mysql-test/r/view.result:
  Test case for bug#11325 Wrong date comparison in views.

Moved the key statistics update to info().
The table is not locked in open(). This made wrong stats possible.

No test case for the test suite.
This happens only with heavy concurrency.
A test script is added to the bug report.


mysql-test/r/heap_hash.result:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Updated test results to reflect the new  statistics behaviour.
mysql-test/t/heap_hash.test:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Added a FLUSH TABLES to avoid statistics differences between normal 
  and ps-protocol tests.
sql/ha_heap.cc:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Moved the key statistics update to info().
  The table is not locked in open(). This made wrong stats possible.
sql/ha_heap.h:
  Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
  Added an element to track the validity of the key statistics.

  Corrected path to CA certificate


mysql-test/mysql-test-run.sh:
  Corrected path to CA certificate

into rurik.mysql.com:/home/igor/mysql-5.0

  Correction after manula merge.


sql/field.cc:
  Correction after manula merge.

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release

include/my_global.h:
  an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).
  redefine 'new' before #include <asm/atomic.h> in any case.

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

into mysql.com:/home/timka/mysql/src/5.0-virgin

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0

mysql-test/r/view.result:
  using encrypt & substring_index in view
mysql-test/t/view.test:
  using encrypt & substring_index in view
sql/item_strfunc.h:
  fixed encrypt() print

into mysql.com:/home/timka/mysql/src/5.0-virgin

into mysql.com:/home/timka/mysql/src/4.1-virgin