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


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

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.

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

mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/my_decimal.h:
  we neede to check for zero here not to get -0.00

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

mysql-test/r/create.result:
  test result fixed
mysql-test/r/distinct.result:
  test result fixed
mysql-test/t/distinct.test:
  test case added
sql/item_cmpfunc.cc:
  max_length should be calculated differently for DECIMAL_RESULT and others

sql/sql_prepare.cc:
  Cleanup mysql_test_* family of calls: now we don't send error message
  from mysql_stmt_prepare, so no need to support -1 return code 
  (meaning error is not sent to client) in these functions.
  Move unit->cleanup() to mysql_stmt_prepare() as it's done in most
  of the mysql_test_ functions, and is a no-op for those which don't
  call unit->prepare(). This should make fixing of Bug#10729 (cursors)
  easier.

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged

  Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts


ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure that entire stopGCP is in log
ndb/tools/restore/Restore.cpp:
  
    Notice: this will not group and commit the deltas listed below
    into a ChangeSet, because there are no ChangeSet comments.
    Click [Checkin] again to check in only the commented deltas,
    or type Control-l to go back and provide ChangeSet comments.
ndb/tools/restore/Restore.hpp:
  Keep track of last gci to next iteration
ndb/tools/restore/consumer_restore.cpp:
  Handle insert in log
  Only allow certain errors

into mysql.com:/home/hf/work/mysql-5.0.8459

mysql-test/r/func_math.result:
  test result ixed
mysql-test/t/func_math.test:
  test case added
sql/item_strfunc.cc:
  Item_func_format::val_str now handles 'decimal' and 'double' values in
  different way

into mysql.com:/space/my/mysql-5.0

  "make install" is called (mysql_delimiter.sql was missing)


mysql-test/Makefile.am:
  - make sure to include mysql-test/t/*.sql files in the binary distributions
    (mysql_delimiter.sql was missing)
scripts/make_binary_distribution.sh:
  - make sure to include mysql-test/t/*.sql files when doing a "make install"
    (mysql_delimiter.sql was missing)

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

into mysql.com:/usr/home/ram/work/mysql-5.0

  As the bug was already fixed, just testcase added here


mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added

IPCConfig wasn't constructing the connect string properly.


ndb/src/common/mgmcommon/IPCConfig.cpp:
  fix construction of connect string from configuration.
  
  the port number was not being added correctly. This would cause the handle to default
  to localhost:1186

mysql-test/r/type_decimal.result:
  test result fixed
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/field.cc:
  We need to refuse negative integers when 'unsigned'

into mysql.com:/usr/home/ram/work/mysql-5.0

The changes are similar to those pushed with a fix for Bug#9899,
so my guess is that ps_6dbd and ps_7ndb tests were simply not run then.


mysql-test/r/ps_6bdb.result:
  Fix failing test.
mysql-test/r/ps_7ndb.result:
  Fix failing test.

missed ityesterday :()


mysql-test/r/ps_7ndb.result:
  Fix ps_7ndb.result wrt working LIMIT clause.

sql/log_event.cc:
  GCC 4.0 fix
sql/sql_acl.cc:
  GCC 4.0

don't evaluate subqueries during statement prepare, even if they
are not correlated.
With post-review fixes.


sql/mysql_priv.h:
  Add UNCACHEABLE_PREPARE to mark subqueries as non-constant in 
  mysql_stmt_prepare
sql/sql_lex.cc:
  Add a missing assert: noone can call unit::set_limit from 
  mysql_stmt_prepare.
sql/sql_lex.h:
  Comment fixed.
sql/sql_parse.cc:
  Mark new SELECT_LEXes as uncacheable if they created during 
  statement prepare.
sql/sql_prepare.cc:
  Switch off the uncacheable flag when prepare is done.

(Bug which caused its failure before was fixed in the beginning of March
 by the ChangeSet that introduced improved SP-locking).

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

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


myisam/mi_key.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged

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

  Added missing ';'.


sql/sql_yacc.yy:
  Added missing ';'.

into mysql.com:/home/cps/mysql/trees/mysql-5.0

server-tools/instance-manager/instance_options.cc:
  fix order of if branches
server-tools/instance-manager/instance_options.h:
  portability fix
server-tools/instance-manager/parse_output.cc:
  remove stupid comment
server-tools/instance-manager/parse_output.h:
  portability fix

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