mysql-test/r/grant2.result:
  Update results
mysql-test/t/grant2.test:
  Reset sql_mode before test.
sql/sql_acl.cc:
  Fixes to merge

innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/bigint.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
sql/item.h:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
mysql-test/r/grant2.result:
  Hand-merged new test
mysql-test/t/grant2.test:
  Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
  Used 5.0 version per tomas
sql/sql_acl.cc:
  Merge fix for Bug #3309.

mysql-test/r/symlink.result:
  Update test results
mysql-test/t/symlink.test:
  Fix test to avoid filenames including path in results

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

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

  Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST


innobase/srv/srv0start.c:
  Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST

innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0start.c:
  SCCS merged

  Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
  Revert the AIX patch here


innobase/os/os0file.c:
  Revert the AIX patch here
innobase/srv/srv0start.c:
  Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c

into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/os/os0file.c:
  Auto merged

  AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.


innobase/os/os0file.c:
  AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.

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.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  lqh to forward abort within ng

into mysql.com:/M50/mysql-5.0

into mysql.com:/space/pekka/ndb/version/my41

See mysqldump.test diff for more details

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'.

ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error?

Secondary weight out of bounds was picked up in mistake when
the string is empty, instead of returning 0.

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

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


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

into mysql.com:/home/psergey/mysql-4.1-bugs

hostnames to not be matched correctly. (Bug #3309)


sql/sql_acl.cc:
  Use an acl_host_or_ip in the GRANT_TABLE struct instead of storing the host
  itself, and use compare_hostname() in testing it. This adds support for IP
  addresses with netmasks to table-specific grants, and results in simplified
  code by making use of compare_hostname() in more places.
mysql-test/r/grant2.result:
  Add new results
mysql-test/t/grant2.test:
  Add new regression test

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