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

absolute path".

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita


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

no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).


mysql-test/r/blackhole.result:
  result update
mysql-test/t/blackhole.test:
  checking that statements get into binlog even when they were affecting
  no rows of the blackhold engine. So that this engine can serve as
  a binlog propagator (A->B->C replication where B has only blackhole tables,
  B receives binlog from A, applies it to blackhole tables, writes statements
  to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.

option in my.cnf correctly"

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

parameter problems.

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

Doc fix for Bug#9870.
 

mysys/charset.c:
  A fix (bug #9756: mysql client failing on dumps containing certain \ sequences).
  As 'to_end' points to the last position we should use '>' comparison 
  instead of '>=' there.
  'l' replaced with 'tmp_length' (in order not to mix 'l' with '1').

BUG#10037: A proper fix: Add 0.01 to cost of 'range' scans, don't add 0.01 to cost of the 'index' scan.

  Changed function signature to fix compile errors with Whidbey


regex/regerror.c:
  Changed function signature to fix compile errors with Whidbey

configure.in:
  - fixed NDB_VERSION_BUILD to have the correct number (4->5)

- bumped up version number in configure.in to 5.0.6 now that engineering branched off for the 5.0.5 builds
- tagged ChangeSet 1.1882 as the "clone-5.0.5-build" branchoff point


configure.in:
  - bumped up version number to 5.0.6 now that engineering branched off for the 5.0.5 builds

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

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


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

  post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.


ndb/test/ndbapi/testOperations.cpp:
  Test case also for abort case.
    (abort if not lock owner still fails!)

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-5.0-merges


sql/item_timefunc.cc:
  Auto merged

into mysql.com:/home/dlenev/src/mysql-4.1-bg10040

"'func_sapdb' fails on 64bit build hosts")


sql/item_timefunc.cc:
  calc_time_diff():
    Fixed yet another signedness problem.

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


ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  add more tests to verify correctness of backups


ndb/test/run-test/daily-basic-tests.txt:
  ndb - test
    add more tests to verify correctness of backups

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged

  remove incorrect assertion

into mysql.com:/home/psergey/mysql-5.0-bug8490-2

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

I'm thinking of removing the script in 5.1).


scripts/mysql_tableinfo.sh:
  Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA

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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged

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


ndb/src/ndbapi/ndberror.c:
  Auto merged

  uninit variable

ndb/src/kernel/blocks/ERROR_codes.txt:
  post merge 4.1->5.0
ndb/src/ndbapi/ndberror.c:
  post merge 4.1->5.0
ndb/test/ndbapi/testOIBasic.cpp:
  post merge 4.1->5.0