sql/item_func.cc:
  ceiling::int_op should work differently depending on argument's type

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

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

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


sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0

will not cause "make" to fail.


mysql-test/Makefile.am:
  Files of the '*.disabled' pattern may exist, but need not.
  So it is important to ignore command failures arising from this pattern not finding
  any matches - whereas files of the other types must be present.

 and bug#8849 "problem with insert statement with table alias's": 
make equality propagation work in stored procedures and prepared 
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.


mysql-test/r/ps.result:
  Bug#8115: test results fixed.
mysql-test/r/sp.result:
  Bug#8849: test results fixed.
mysql-test/t/ps.test:
  A test case for Bug#8115 "Server Crash with prepared statement".
mysql-test/t/sp.test:
  A test case for Bug#8849 "problem with insert statement with table 
  alias's".
sql/item_cmpfunc.cc:
  Comment a parse tree transformation.
sql/item_cmpfunc.h:
  Comment how Item_equal works with PS/SP.
sql/mysql_priv.h:
  Add declaration for init_stmt_after_parse.
sql/sp_head.cc:
  Call init_stmt_after_parse in restore_lex(), which is used to
  grab TABLE_LIST and SELECT_LEX list of a parsed substatement of
  stored procedure. This is a necessary post-init step which 
  must be done for any statement which can be executed many times.
sql/sql_prepare.cc:
  Implement init_stmt_after_parse() which prepares AND/OR
  structure of all ON expressions and WHERE clauses of a statement
  for copying.
sql/sql_select.cc:
  Implementation of equality propagation inspected with regard to 
  prepared statements and stored procedures. We now restore
  AND/OR structure of every ON expression in addition to AND/OR
  structure of WHERE clauses when reexecuting a PS/SP.
sql/table.h:
  Add declaration for TABLE::prep_on_expr.

into mysql.com:/M50/mysql-5.0

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

sql/sql_lex.cc:
  No need to change options here.

include/my_sys.h:
  There are platforms which use '#define errno ...' and then cause a collision with
  'extern int errno;', one example is OpenBSD.
  Rather than treat them explicitly by the 'HAVE_ERRNO_AS_DEFINE', we can check for these
  by using '#ifndef errno'.

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/home/mysql_src/mysql-5.0-xa

into mysql.com:/data0/mysqldev/my/mysql-5.0-merge


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Auto merged

committing this deletion of federated.disabled, which was already committed in another tree apparently; just to make bk happy.


BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled

into mysql.com:/home/pem/work/mysql-5.0

into mysql.com:/home/mysql_src/mysql-5.0-xa

BitKeeper/deleted/.del-federated.disabled~a5703a3321e4108:
  Delete: mysql-test/t/federated.disabled

into mysql.com:/home/cps/mysql/devel/im-fix-review

server-tools/instance-manager/Makefile.am:
  "Makefile" target removed

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


sql/item_func.cc:
  Auto merged

into mysql.com:/home/pem/work/mysql-5.0

into krsna.patg.net:/home/patg/mysql-5.0

Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge


mysql-test/r/drop_temp_table.result:
  result update
mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/r/rpl000001.result:
  result update
mysql-test/r/rpl_change_master.result:
  result update
mysql-test/r/rpl_deadlock.result:
  result update (merge)
mysql-test/t/rpl000001.test:
  can't rely on GET_LOCK() to do slave synchro (use table lock instead)
mysql-test/t/rpl_change_master.test:
  changing the test as we can't use GET_LOCK() for slave synchro
mysql-test/t/rpl_deadlock.test:
  update (merge) binlog positions
mysql-test/t/rpl_get_lock.test:
  comment

                of DROP PROCEDURE IF EXISTS statement.


mysql-test/r/sp.result:
  New test case for BUG#8757
mysql-test/t/sp.test:
  New test case for BUG#8757
sql/sp.cc:
  Don't zap lex->found_semicolon. (For compound statements)

into mysql.com:/usr/home/ram/work/4.1

into krsna.patg.net:/home/patg/mysql-5.0


sql/handler.cc:
  Auto merged

sql/sql_union.cc:
  a fix for --ps-protocol (bug #6089: FOUND_ROWS returns wrong values when no table/view is used)
  Don't touch options as itit's not needed.

into mysql.com:/home/mysql_src/mysql-5.0-xa


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

First part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()"
(next part is updating test results)


sql/item_func.cc:
  no need for binlogging DO RELEASE_LOCK() anymore. Make GET_LOCK() do nothing in slave thread.
sql/log_event.cc:
  comment fixes
sql/mysqld.cc:
  warning removed
sql/slave.cc:
  fix after merge

into mysql.com:/M50/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_innodb.cc:
  Auto merged

mysys/my_mmap.c:
  cleanup
sql/ha_innodb.cc:
  don's start a transaction in prepare().
  restore disabled code for ibbackup

sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  SCCS merged
sql/slave.h:
  SCCS merged

innobase/row/row0sel.c:
  Manual merge (Bug #8771)

After merge fix.
The bugfix results in a different error message in this situation.

use function-wide declaration also for loop body.


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Get rid of a duplicate declaration ('Uint32 k;' at function start) that caused 
  compiler failures on 'octane2' (both 32 and 64 bit) and a compiler crash on 'ds20'.
  It would be better not to use those variable declarations with a loop scope,
  they have caused compile problems again and again.