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

ndb/include/kernel/signaldata/TuxMaint.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  merge from 4.1
ndb/test/ndbapi/testOIBasic.cpp:
  merge from 4.1

ndb/include/kernel/signaldata/TuxMaint.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtup/Notes.txt:
  handle multipl index update failure atomically
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
  handle multipl index update failure atomically
ndb/src/ndbapi/ndberror.c:
  handle multipl index update failure atomically
ndb/test/ndbapi/testOIBasic.cpp:
  handle multipl index update failure atomically

In mysql_make_view when joining subquery lists, take into account that both lists
can have length > 1 (see also fix for BUG#8490) 
(note to bk trigger: this commit is about BUG#10107)


sql/sql_view.cc:
  Fix for BUG#10107: In mysql_make_view, when joining subquery lists, take into account 
  that both lists can have length > 1 (see also fix for BUG#8490)

BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"



mysql-test/r/create.result:
  MEMORY, not HEAP
mysql-test/r/ps_1general.result:
  order changed in SHOW STORAGE ENGINES
mysql-test/r/variables.result:
  MEMORY, not HEAP
sql/handler.cc:
  the array of storage engine names is searched in index order, so we must put the preferred name
  before the alias so that the preferred name is printed by MySQL instead of the alias.
sql/log.cc:
  TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
  could not be opened.
sql/set_var.cc:
  --log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.

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