mysql-test/t/disabled.def:
  Disabled mysqlslap was errorneously enabled in merge; disable again.

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


include/config-win.h:
  Auto merged

include/config-win.h:
  Port to Win64/x64 in Visual Studio 2005.
  Avoid endless deprecation warnings.

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

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

into  mysql.com:/home/ndbdev/jmiller/clones/5.1-new2

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


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.1-merge

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Updated

mysql-test/extra/rpl_tests/rpl_row_blob.test:
  New blobs test for RBR
mysql-test/t/rpl_row_blob_innodb.test:
  Innodb wrapper for rbr blob test
mysql-test/t/rpl_row_blob_myisam.test:
  MyISAM wrapper for rbr blob test
mysql-test/r/rpl_row_blob_myisam.result:
  MyISAM result for rbr blob test
mysql-test/r/rpl_row_blob_innodb.result:
  Innodb result for rbr blob test

into  mysql.com:/opt/local/work/mysql-5.1-merge


include/config-win.h:
  Auto merged
mysys/hash.c:
  Auto merged
mysql-test/r/rpl_stm_sp.result:
  Auto merged
mysql-test/t/rpl_stm_sp.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/lock.cc:
  Manual merge.

  Fix out of order system variable.


sql/set_var.cc:
  Fix out of order system variable.

  Put options in standard order: help first, then lexically,
  then variables.


client/mysqlbinlog.cc:
  Put options in standard order: help first, then lexically,
  then variables.

into  mysql.com:/opt/local/work/mysql-5.0-merge

sql/sql_acl.cc:
  A post-merge fix.
sql/sql_base.cc:
  A post-merge fix.

into  mysql.com:/users/lthalmann/bkroot/mysql-5.1-new

sql/sql_class.cc:
  Needed to be able to compile without RBR

into  mysql.com:/usr/local/mysql/mysql-5.0

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

parent when we are not the process group leader.

into  mysql.com:/opt/local/work/mysql-5.0-merge


mysys/hash.c:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_acl.cc:
  Manual merge.
sql/sql_base.cc:
  Manual merge.

when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a 
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.


include/hash.h:
  - remove current_record from HASH, instead modify hash_first,
  hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter
mysys/hash.c:
  - remove HASH::current_record
  - change declarations of functions that use HASH in read-only mode
    to accept const HASH * instead of HASH *. 
  - implement hash_search; move the old implementation of hash_search
  to hash_first
mysys/testhash.c:
  - adjust the test case to changed function declarations
sql/lock.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_acl.cc:
  - adjust to changed declarations of hash_search, hash_next
sql/sql_base.cc:
  - adjust to changed declarations of hash_search, hash_nex
sql/sql_cache.cc:
  - adjust to a changed declaration of hash_replace

the bug is fixed.


mysql-test/t/rpl_row_sp000.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_row_sp000.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/r/rpl_stm_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_stm_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.

the bug is fixed.


mysql-test/r/rpl_sp.result:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.
mysql-test/t/rpl_sp.test:
  BUG#14931: Temporarily add synchronization to avoid sporadic failures until
  the bug is fixed.

into  mysql.com:/home/bkroot/mysql-5.1-new

into  mysql.com:/home/bk/b15924-mysql-5.1-new

into  mysql.com:/home/bk/b15924-mysql-5.1-new


sql/sql_class.cc:
  Auto merged
mysql-test/t/disabled.def:
  Merge with mysql-5.1-new

into  mysql.com:/home/bk/b15942-mysql-5.1-new


sql/handler.cc:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged

into  mysql.com:/usr/local/mysql/mysql-5.0

mysql-test/t/disabled.def:
  BUG#16167: Disable test case until bug is fixed.

into mysql.com:/M51/mysql-5.1

  enable view prepared mode during getting metedata for I_S table


mysql-test/r/information_schema.result:
  Fix for bug#15533 crash, information_schema, function, view
    test case
mysql-test/t/information_schema.test:
  Fix for bug#15533 crash, information_schema, function, view
    test case

head_sptr array was wrong.