into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysys/hash.c:
  Auto merged
sql/ha_heap.h:
  Auto merged
configure.in:
  Resolve conflicts from 4.1
mysql-test/r/heap.result:
  Update results
mysql-test/t/heap.test:
  Merge from 4.1

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ps_6bdb.result:
  Auto merged
include/my_global.h:
  SCCS merged

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/sql_acl.cc:
  Auto merged

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806

into xiphis.org:/usr/home/antony/work2/p1-bug11028.4

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0

into mysql.com:/var/tmp/sslbug/mysql-4.1

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0

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

  Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.


sql/sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
mysql-test/r/select.result:
  Added a test case for bug #10084.
mysql-test/t/select.test:
  Added a test case for bug #10084.

BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged

into xiphis.org:/usr/home/antony/work2/p1-bug11028.3

  Report error instead of crashing


mysql-test/r/create.result:
  Test for bug 11028
mysql-test/t/create.test:
  Test for bug 11028
sql/sql_table.cc:
  fix for null db name

CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.


sql/mysql_priv.h:
  Rename reset_stmt_for_execute to init_stmt_before_use (to correspond to
  cleanup_stmt_and_thd_after_use).
sql/sp_head.cc:
  Rename.
sql/sql_prepare.cc:
  Move common cleanup code to a cleanup function, call it when we close
  a cursor.
sql/sql_select.cc:
  Cleanup.
sql/sql_select.h:
  No need for init_thd, this code has been inlined in Cursor::open.
tests/mysql_client_test.c:
  Add a test case for Bug#10729 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY"
  (problem reusing a prepared statemnt if there was a cursor)

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  now we always use decimals_to_set

into mysql.com:/home/gluh/MySQL/Merge/4.1

mysql-test/r/ps_7ndb.result:
  fix result file

  generate proper error message if we use SET ... = NULL for 'set'
  variables

into mysql.com:/home/jonas/src/mysql-4.1-push

into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0

into deer.(none):/home/hf/work/mysql-5.0.8482

a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.).

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  in round(999.9, 0) case we have to increase intg

into mysql.com:/home/jonas/src/mysql-4.1-push

  small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked

into mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

bug#10711
bug#10058
bug#9363
bug#9025
bug#8918


ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Use UintPtr when computing page address to make sure that Uint32 does not overflow

into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged

when checking if the server is running in mysqld_safe. (Bug #11122)


configure.in:
  Add "grep -v grep" to FIND_PROC so we don't mistake "grep mysqld"
  for a mysqld process.

into mysql.com:/home/dlenev/src/mysql-5.0-bgmd


sql/sql_yacc.yy:
  Auto merged

This is to close Bug#10975, Bug#7115, Bug#10605 
This feature will be implemented in a future release.


mysql-test/r/sp-error.result:
  Test results fixed (test coverage for disabled Dynamic SQL in SP).
mysql-test/t/sp-error.test:
  Test coverage to disable Dynamic SQL in stored routines.
sql/sql_yacc.yy:
  Disable dynamic SQL in stored routines.

sql/mysql_priv.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

In order to make multi-delete SP friendly we need to have all table 
locks for the elements of main statement table list properly set 
at the end of parsing.

Also performed small cleanup: We don't need relink_tables_for_multidelete()
any longer since the only case now when TABLE_LIST::correspondent_table
is non-zero are tables in auxilary table list of multi-delete and these
tables are handled specially in mysql_multi_delete_prepare().


mysql-test/r/sp-threads.result:
  Added test case for bug #11158 "Can't perform multi-delete in stored
  procedure".
mysql-test/t/sp-threads.test:
  Added test case for bug #11158 "Can't perform multi-delete in stored
  procedure".
sql/mysql_priv.h:
  - Removed third argument from the declaration of multi_delete_precheck()
    as nowdays we calculate number of tables in multi-delete from which
    we are going to delete rows right at the end of statement parsing.
  - Introduced definition of multi_delete_set_locks_and_link_aux_tables()
    which is responsible for propagation of proper table locks from
    multi-delete's auxilary table list to the main list and binding
    corresponding tables in these two lists.
sql/sql_base.cc:
  Removed relink_tables_for_multidelete() routine and its invocations.
  We don't need them in 5.0 since the only case now when
  TABLE_LIST::correspondent_table is non-zero are tables in auxilary table
  list of multi-delete and these tables are handled specially in
  mysql_multi_delete_prepare().
sql/sql_lex.h:
  LEX::table_count
    Added description of new role of this LEX member for multi-delete. 
    Now for this statement we store number of tables from which we should
    delete records there.
sql/sql_parse.cc:
  multi_delete_precheck():
    Moved code which is responsible for iterating through auxilary table
    list and binding its elements with corresponding elements of main
    table list, and properly updating locks in it to separate function -
    multi_delete_set_locks_and_link_aux_tables(). This is because in order
    to make multi-delete SP friendly we need to have all locks set properly
    at the end of statement parsing. So we are introducing new function
    which will be called from parser.
    We also calculate number of tables from which we are going to perform
    deletions there and store this number for later usage in
    LEX::table_count.
    Also removed some no longer needed code.
sql/sql_prepare.cc:
  mysql_test_multidelete():
    Now multi_delete_precheck() takes only two arguments, so we don't
    need to pass fake third parameter.
sql/sql_yacc.yy:
  delete:
    In order to make multi-delete SP friendly we need to have all table 
    locks for the elements of main statement table list properly set 
    at the end of parsing.