lock-free alloc (WL#3229), lock-free hash (WL#3230)
bit functions made inline


include/Makefile.am:
  lf.h added
mysys/Makefile.am:
  lf_hash.c lf_dynarray.c lf_alloc-pin.c
include/atomic/nolock.h:
  amd64 atomic ops
include/atomic/rwlock.h:
  s/rw_lock/mutex/g
include/atomic/x86-gcc.h:
  amd64 atomic ops
  try PAUSE
include/my_global.h:
  STATIC_INLINE
mysys/mf_keycache.c:
  make bit functions inline
mysys/my_atomic.c:
  STATIC_INLINE
mysys/my_bitmap.c:
  make bit functions inline
sql/ha_myisam.cc:
  make bit functions inline
sql/item_func.cc:
  make bit functions inline
include/my_atomic.h:
  STATIC_INLINE
mysys/my_bit.c:
  make bit functions inline
sql/sql_select.cc:
  make bit functions inline
storage/myisam/mi_create.c:
  make bit functions inline
storage/myisam/mi_test2.c:
  make bit functions inline
storage/myisam/myisamchk.c:
  make bit functions inline
mysys/my_init.c:
  thread_size moved to mysys
sql/mysql_priv.h:
  thread_size moved to mysys
sql/set_var.cc:
  thread_size moved to mysys
include/my_sys.h:
  thread_size moved to mysys
sql/mysqld.cc:
  thread_size moved to mysys
sql/sql_parse.cc:
  thread_size moved to mysys
sql/sql_test.cc:
  thread_size moved to mysys
include/lf.h:
  dylf_dynarray refactored to remove 65536 elements limit
mysys/lf_alloc-pin.c:
  dylf_dynarray refactored to remove 65536 elements limit
mysys/lf_dynarray.c:
  dylf_dynarray refactored to remove 65536 elements limit
mysys/lf_hash.c:
  dylf_dynarray refactored to remove 65536 elements limit
unittest/mysys/my_atomic-t.c:
  fix to commit (remove debug code)

config/ac-macros/misc.m4:
  remove unnecessary macro
configure.in:
  use AC_CHECK_SIZEOF when appropriate

storage/ndb/test/ndbapi/test_event_merge.cpp:
  cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  report even composite op in merge
  test case: test_event_merge --no-blobs --ops ic:dcic

into  dator5.(none):/home/pappa/bug17138


sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  dator5.(none):/home/pappa/bug17138


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  dator5.(none):/home/pappa/bug20583


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged

into  dator5.(none):/home/pappa/bug17138


BUILD/compile-pentium-gcov:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

Last round of review fixes


BUILD/compile-pentium-gcov:
  No change
sql/ha_ndbcluster.h:
  Last round of review changes
sql/ha_partition.h:
  Last round of review changes
sql/handler.h:
  Last round of review changes
sql/item_sum.cc:
  Last round of review changes
sql/sql_acl.cc:
  Last round of review changes
sql/sql_insert.cc:
  Last round of review changes
sql/sql_select.cc:
  Last round of review changes
sql/sql_table.cc:
  Last round of review changes
sql/sql_union.cc:
  Last round of review changes
sql/sql_update.cc:
  Last round of review changes

into moonbone.local:/work/merge-5.1

mysql-test/t/key.test:
  Added SHOW CREATE TABLE, which is the proper way to check for table definitions
mysql-test/r/key.result:
  Fixed result after removing wrong bug fix
sql/table.cc:
  Reverted wrong bug fix.
  The intention with the original code was to show that MySQL treats the first
  given unique key as a primary key. Clients can use the marked primary key as a
  real primary key to validate row changes in case of conflicting updates.  The
  ODBC driver (and other drivers) may also use this fact to optimize/check
  updates and handle conflicts.  The marked key also shows what some engines, like InnoDB or NDB,
  will use as it's internal primary key.
  For checking if someone has declared a true PRIMARY KEY, one should use 'SHOW CREATE TABLE'

into  mysql.com:/data0/knielsen/tmp-5.1

into  mysql.com:/usr/local/mysql/tmp-5.1


scripts/Makefile.am:
  Auto merged

binary disctribution for Falcon.


scripts/Makefile.am:
  Add the make_win_bin_dist script.
scripts/make_win_bin_dist:
  New BitKeeper file ``scripts/make_win_bin_dist''

into moonbone.local:/work/merge-5.1


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/spatial.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
strings/ctype-mb.c:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp-prelocking.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp-prelocking.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysql-test/valgrind.supp:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  don't set errno without a real error

mysys/my_pread.c:
  don't set errno without a real error

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


sql/ha_ndbcluster.cc:
  Auto merged

(It failed even if test was marked as skipped)



sql/ha_ndbcluster.cc:
  Replaced assert with argument checking, as rpl_ndb_UUID failed on x64

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge

into  mysql.com:/home/cps/mysql/trees/5.1-team

mysys/my_pread.c:
  Fix our implementation of pread/pwrite: we did change the file pointer in our
  implementation, while the normal preads/pwrites don't. The new code is based
  on glibc version of pread/pwrite.

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

include/atomic/nolock.h:
  support for xadd emulation
include/atomic/x86-msvc.h:
  syntax error
include/my_atomic.h:
  support for xadd emulation, cleanup
mysys/my_atomic.c:
  assert

into  mysql.com:/home/stewart/Documents/MySQL/5.1/ndb


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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge

+ adopted signal to be as close as possible to 5.1...

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

into  mysql.com:/home/kgeorge/mysql/5.0/warnings


sql/opt_range.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/item_cmpfunc.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/spatial.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/sql_select.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code

into  mysql.com:/home/kgeorge/mysql/4.1/warnings

Mark events_stress.test as 'big' as it's very slow on some machines


BitKeeper/etc/ignore:
  added server-tools/instance-manager/net_serv.cc
mysql-test/t/events_stress.test:
  Slow test: only run when using --big
mysql-test/t/rpl_ndb_auto_inc.test:
  Fix failing test

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


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged