include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.

config/ac-macros/openssl.m4:
  "Configure" variable 'IS_LINUX' renamed to 'TARGET_LINUX'.
  Manual merge: In 4.1, this was in 'acinclude.m4'.
include/my_global.h:
  As we have a new CPP symbol, this should be "undef"ed explicitly.

Post-merge fix will follow.


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Automerge / manual check.
configure.in:
  Automerge / manual check.
include/my_global.h:
  Automerge / manual check.
myisam/Makefile.am:
  Automerge / manual check.
scripts/Makefile.am:
  Automerge / manual check.
scripts/mysqld_safe.sh:
  Automerge / manual check.
support-files/Makefile.am:
  Automerge / manual check.
tools/mysqlmanager.c:
  Automerge / manual check.

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

to insert view's subqueries into select_lex->slave(->next)* chain. 
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)


mysql-test/r/view.result:
  Testcase for BUG#8490
mysql-test/t/view.test:
  Testcase for BUG#8490

Change "configure.in".

The branches for Tru64 (ex: OSF/1) and Linux are separated,
and for Linux 'getconf GNU_LIBPTHREAD_VERSION' is used to tell between Linuxthreads and NPTL.


configure.in:
  Step 3 of the switch to support configuration with NPTL:
  Change "configure.in".
  
  1) Separate the branches checking for thread libraries on OSF/1 (now: Tru64) and on Linux,
     as these are different things. In the Tru64 branch, remove the obsolete part for OSF/1 3.2,
     because that is gone since long (about a decade?); we are at 5 now. Adapt the comment.
  
  2) For Linux, the thread libraries are "Linuxthreads" (older) and "NPTL" (newer).
     Until now, we cared only about "Linuxthreads", and we did so by checking a comment in 
     the header file '/usr/include/pthread.h'.
     With NPTL as an alternative or only thread package, this is not secure any more,
     there are distributions where the header file still contains that comment but the lib is NPTL.
     For all current distributions, the way to check is the 'getconf' command.
  
     On old distributions, 'getconf' exists but does not understand the 'GNU_LIBPTHREAD_VERSION'
     parameter. It is unlikely that such an old system should have NPTL, so the header file check is
     sufficient if the getconf inquiry fails.
  
     For both Linuxthreads and NPTL, '-lpthread' is the linker option to use.
  
  3) To detect problems as early as possible, on Linux a link test using '-lpthread' is done.
     The code is copied from a later check where the thread functions are searched in '-lc',
     '-lpthread', and '-lpthreads', but this later search would not be executed after the lib
     was already determined. So if the test is not done here, it will be detected only during
     the real build. This is too late.

into mysql.com:/home/mydev/mysql-5.0-5000