into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_update.result:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged

bug#24470  MySQL Servers crashes during creating new tables with blob column: fix of error handling at resource shortage

bug #24301  Next command hangs in mysql after creating new NDB table via LIKE operation.: Locked mutex LOCK_open during operation

bug #21495  Alter table from x engine to ndb and back can cause issue with drop DB:added error printout to log

bug #21495  Alter table from x engine to ndb and back can cause issue with drop DB:disable distributed drop database if a database contains local tables

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values. 5.1 re-implementation

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
sql/sql_class.h:
  Fixed indentation

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Using local
  will re-generate
sql/ha_ndbcluster.cc:
  Using local
  will merge manually
sql/ha_ndbcluster.h:
  Using local
  will merge manually

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


mysql-test/mysql-test-run-shell.sh:
  Auto merged

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


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

  Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well

If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.

This dramatically improves performance of mysql-test-run cases as well:

e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113 
WITH this patch  :  ALL 1 or 2 extents

(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).

As for timing of test run:
BEFORE
ndb_dd_basic                   [ pass ]         107727
real    3m2.683s
user    0m1.360s
sys     0m1.192s

AFTER
ndb_dd_basic                   [ pass ]          70060
real    2m30.822s
user    0m1.220s
sys     0m1.404s

(results are again consistent over various runs)

similar for other tests (BEFORE and AFTER):
ndb_dd_alter                   [ pass ]         245360
ndb_dd_alter                   [ pass ]         211632


configure.in:
  Check for XFS headers
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  If the XFS headers are installed, use the xfsctl(XFS_IOC_RESVSP64) call (a
  wrapper around ioctl) to tell the xfs file system how much space to reserve
  for this file.

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

bug#23542  crash on DELETE from ndb dd table: uses_blob_value always reads write_set, should check read_set if read operation

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


configure.in:
  Merge bump of version

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

sql/sql_show.cc:
  fix warning during mysql-test-run of freeing null pointer

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work


storage/ndb/include/util/Vector.hpp:
  Auto merged

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


scripts/make_binary_distribution.sh:
  Auto merged

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


scripts/make_binary_distribution.sh:
  Auto merged

into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic


README:
  Auto merged

  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt


README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
BitKeeper/deleted/.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
scripts/make_binary_distribution.sh:
  Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.

into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


configure.in:
  Auto merged

bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/mysql-test-run.pl:
  Auto merged
vio/viosslfactories.c:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


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

 - Readd --skip-bdb when valgrinding


mysql-test/mysql-test-run.pl:
  Readd --skip-bdb when valgrinding