mysql-test/r/flush_block_commit.result:
  FLUSH TABLES WITH READ LOCK should block writes to binlog too
  it does not yet
mysql-test/t/flush_block_commit.test:
  FLUSH TABLES WITH READ LOCK should block writes to binlog too
  it does not yet

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

mysql-test/r/user_var.result:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied
mysql-test/t/user_var.test:
  after merge fixes - old (erroneous) results restored.
  Should be corrected when the fix is applied

Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually


BitKeeper/etc/logging_ok:
  auto-union
include/m_ctype.h:
  Auto merged
innobase/btr/btr0pcur.c:
  Auto merged
innobase/include/btr0pcur.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/r/user_var.result:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  ul
ndb/include/ndbapi/NdbScanOperation.hpp:
  ul
ndb/src/ndbapi/NdbIndexOperation.cpp:
  ul
ndb/src/ndbapi/NdbOperationDefine.cpp:
  ul
ndb/src/ndbapi/NdbOperationSearch.cpp:
  ul
ndb/src/ndbapi/NdbScanOperation.cpp:
  ul
sql/field.cc:
  manually merged, because bk messed it up
sql/sql_yacc.yy:
  merged

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

sql/sql_select.cc:
  Fix a discrepancy spotted after the setup_end_select_func patch has been 
  pushed: last join sweep assumes that join->tmp_table is zero.

into mysql.com:/media/sda1/mysql/mysql-5.0-9520

sql/sql_select.cc:
  Bits of refactoring of do_select as one step forward to merge cursor and
  non-cursor execution.
  Moving send_fields (metadata handling) out of do_select to one level up
  and moving end_select setting to a separate function.
  This function is used in the Cursor::open() too.

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

mysql-test/r/drop.result:
  Made error message smaller to not get into trouble with clients with smaller error buffers
  The proper way to fix this is to generate a separate warning for each not found table if there was more than one table in the DROP
  but
mysql-test/r/kill.result:
  Portablity fix
mysql-test/t/kill.test:
  Portablity fix
mysys/my_sync.c:
  Fixed possible compiler warning
sql/records.cc:
  Fixed possible compiler warning
sql/share/errmsg.txt:
  Made error message smaller to not get into trouble with clients with smaller error buffers
sql/sql_class.cc:
  Don't put code in comments
sql/sql_show.cc:
  Cleanup

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

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


mysql-test/mysql-test-run.sh:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Added suppression file for some valgrind warnings that are not real errors


mysql-test/mysql-test-run.sh:
  Added suppression of some valgrind warnings that are not real errors
mysql-test/r/heap.result:
  Cleanup old tests and added new tests
mysql-test/t/heap.test:
  Cleanup old tests and added new tests
mysys/default.c:
  Removed duplicate fn_format()
scripts/make_binary_distribution.sh:
  Added valgrind suppress file
sql/ha_federated.cc:
  Ensure that 'socket' is initialized properly
sql/ha_heap.cc:
  Ensure that with_auto_increment is initialized properly
sql/mysqld.cc:
  Ensure that create_time is initialized for cached threads
sql/sql_parse.cc:
  Indentation fix
strings/decimal.c:
  Fixed wrong tests

BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)


innobase/include/os0file.h:
  Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1
innobase/os/os0file.c:
  os_file_lock(): Do not close the file on failure, but let the
  callers do that.
  os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
  os_file_lock() fails, keep retrying for 100 seconds.
innobase/srv/srv0start.c:
  open_or_create_data_files(): Open the first data file with
  OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
  instance of the MySQL server.

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

 - Fixing obvious ones


sql/ha_ndbcluster.cc:
  Delete ndb object before exiting thread

  Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed


mysql-test/mysql-test-run.pl:
  Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
  Added missing database cleanup
mysql-test/Makefile.am:
  Include the Perl version of mysql-test-run

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

sql/field.cc:
  Use a separate variable. Otherwise "error" value gets lost
  after well_formed_length call.
strings/ctype-mb.c:
  Don't return an error if we reached end of line.

into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286


sql/sql_yacc.yy:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context


innobase/include/btr0pcur.h:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/include/btr0pcur.ic:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/btr/btr0pcur.c:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
innobase/row/row0sel.c:
  Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

return error. We'll use it for better warnign reporting.

mysql-test/r/null.result:
  Update results
mysql-test/r/show_check.result:
  Update results
mysql-test/r/strict.result:
  Update results
mysql-test/t/null.test:
  Fix default for smallint column.
mysql-test/t/show_check.test:
  Fix default for bool column.

mysql-test/r/create.result:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/limit.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_blob.test:
  Auto merged
mysql-test/t/type_ranges.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/t/strict.test:
  SCCS merged

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

the argument type. Fixed also some float() casts to double() as query_id
is now actually longlong type. Related to Bug#9646.



sql/sql_parse.cc:
  Some of the argument place holders were not quite correct compared to
  the argument type. Fixed also some float() casts to double() as query_id
  is now actually longlong type.

mysql-test/Makefile.am:
  Remove result.es references
scripts/make_binary_distribution.sh:
  Remove result.es refernece

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

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

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


BitKeeper/triggers/post-commit:
  Auto merged

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

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


sql/mysqld.cc:
  Auto merged

  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error


sql/ha_innodb.cc:
  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
sql/handler.cc:
  Fix Bug #8650 : InnoDB does not rollback SQL statement at an error

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