mysql-test/r/mysqldump.result:
  Update results

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


mysql-test/r/view.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  Merge
mysql-test/t/sql_mode.test:
  Merge

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged

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


mysql-test/r/query_cache.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/grant.result:
  Merge
mysql-test/t/grant.test:
  Merge

mysql-test/r/query_cache.result:
  Remove stray empty line
mysql-test/r/grant.result:
  Update results
mysql-test/t/grant.test:
  Fix test case to

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

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

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


sql/sql_table.cc:
  Auto merged

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

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


mysql-test/r/lowercase_table2.result:
  Auto merged

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


include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
tests/mysql_client_test.c:
  Clean up merge of new tests

mysys/charset.c:
  Add documentation for escape functions
  Minor style cleanup

  Use IF EXISTS in initiation section


mysql-test/r/lowercase_table2.result:
  Use IF EXISTS in initiation section
mysql-test/t/lowercase_table2.test:
  Use IF EXISTS in initiation section

client/mysqldump.c:
  Auto merged
sql/log_event.cc:
  Removed settings of thd->lex fields since they are not needed in 5.0.

into mysql.com:/home/bk/b11401-mysql-4.1

this as a LOAD DATA ... REPLACE INTO .. statement.


sql/log_event.cc:
  Setting thd->lex so that engines (i.e., InnoDB) recognizes this 
  as a LOAD DATA ... REPLACE INTO .. statement.

sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

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

fixed environment creation and cleaning up for processing view one by one during checking (BUG#11337)


mysql-test/r/view.result:
  checking views after some view with error (BUG#11337)
mysql-test/t/view.test:
  checking views after some view with error (BUG#11337)
sql/sql_lex.cc:
  environment cleaning up for processing view one by one
sql/sql_lex.h:
  methods for lex cleunup during view processing one by one
sql/sql_table.cc:
  fixed environment creation and cleaning up for processing view one by one (BUG#11337)

mysql-test/r/grant.result:
  test of new table privileges
mysql-test/r/system_mysql_db.result:
  added new table priveleges
mysql-test/r/view_grant.result:
  error changed
mysql-test/t/grant.test:
  test of new table privileges
mysql-test/t/view_grant.test:
  error changed
scripts/mysql_create_system_tables.sh:
  add new table privileges
scripts/mysql_fix_privilege_tables.sql:
  fixed system tables fix script
sql/sql_acl.h:
  fixed coding/decoding new tables grants

into hundin.mysql.fi:/home/marko/mysql-5.0-current

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

mysql-test/r/query_cache.result:
  results moved
sql/sql_cache.cc:
  postmerge fixes

innobase/btr/btr0cur.c:
  Move #ifdef outside ut_ad() argument.
innobase/page/page0cur.c:
  Move #ifdef outside ut_ad() argument.

sql/item_sum.h:
  Auto merged

into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc

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

into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod-gcc

into mysql.com:/home/psergey/mysql-5.0-jul4

  execution, not before.

execution. Failure to do so caused the erroneous statements to send nothing
and hang the client.


mysql-test/r/sp-error.result:
  Testcase for BUG#9814. Note that the result demonstrates that currently
  mysql-test-run ignores errors in multi-statement if they arrive after first 
  resultset has been received.
mysql-test/t/sp-error.test:
  Testcase for BUG#09814.

which is wrong now that slave recovers gracefully from a crashed binlog (thx Serg).
stat -> my_stat in my_copy.c so that failing stat() does not hang client connection.


BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
  Delete: mysql-test/t/rpl_trunc_binlog.test
BitKeeper/deleted/.del-rpl_trunc_binlog.result~14b4a61886a332e8:
  Delete: mysql-test/r/rpl_trunc_binlog.result
mysql-test/std_data/trunc_binlog.000001:
  Rename: BitKeeper/deleted/.del-trunc_binlog.000001~b504d840c7efde25 -> mysql-test/std_data/trunc_binlog.000001
mysql-test/t/rpl_until.test:
  making test more robust if machine is slow. We still need to sleep before testing if slave SQL thread stopped, because otherwise it may not have started yet when we test for stop, then we would return too early. When we have "START SLAVE" wait a few secs until slave threads actually started well (WL#2688) these "sleep 2" could be removed.
mysys/my_copy.c:
  Using my_stat() instead of stat(). Reason is that my_stat() reports an error message if wanted (MY_WME),
  which is critical for an error being sent to the client. Before this patch, a failing stat() caused
  the client connection to hang (because error was not set because my_error was never called).
  Adding an assertion to match the comment at the start of the function.

into mysql.com:/space/my/mysql-4.1-build

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


support-files/mysql.spec.sh:
  Auto merged

  the version string with the base version of the current build

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

into mysql.com:/space/my/mysql-4.1-merge

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


configure.in:
  Auto merged
sql/sql_udf.cc:
  Auto merged

sql/sql_udf.cc:
  Auto merged
configure.in:
  - merge: keep local version number