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

  Revise option description. And let's put it in the proper
  lexical order within the option list.


sql/mysqld.cc:
  Revise option description. And let's put it in the proper
  lexical order within the option list.

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

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

  Small change to enable sending of mails from Windows bk clones


BitKeeper/triggers/post-commit:
  Small change to enable sending of mails from Windows bk clones

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

sql/log_event.cc:
  Fix Windows compile errors.
storage/innobase/btr/btr0sea.c:
  Fix AIX compile error (declarations must come before code in traditional C).
sql/sql_class.h:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.
sql/sql_insert.cc:
  Fix HPUX compile problem (HP compiler bug).
  Local class of member in derived class has no access to protected members,
  so make the class global and a friend.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

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

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


sql/sql_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  e
  Resolve conflict
mysql-test/t/partition.test:
  Resolve conflict

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


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

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


mysql-test/r/partition.result:
  Resolve conflict
mysql-test/t/partition.test:
  Resolve conflict
sql/ha_partition.cc:
  Resolve conflict

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


mysql-test/r/partition.result:
  SCCS merged
mysql-test/t/partition.test:
  SCCS merged

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1-bug17173

Bug # 17894 - Comparison with "less than" operator fails with range partition

The problem here was that on queries such as < 3, the range given is NULL < n < 3.
The null part works correctly where the null value is stored in rec[0] and the
field is marked as being null.  However, when the 3 is processed, the 3 is places
on rec[0] but the null flag is left uncleared.

partition_range.result:
  Results block for bug #17894
partition_range.test:
  Test block for bug #17894
partition_list.result:
  Results block for bug #17173
partition_list.test:
  Test block for bug #17173
opt_range.cc:
  call set_notnull to clear any null flag that may have been set


sql/opt_range.cc:
  call set_notnull to clear any null flag that may have been set
mysql-test/t/partition_list.test:
  Test block for bug #17173
mysql-test/r/partition_list.result:
  Results block for bug #17173
mysql-test/t/partition_range.test:
  Test block for bug #17894
mysql-test/r/partition_range.result:
  Results block for bug #17894

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  merge

into  perch.ndb.mysql.com:/home/jonas/src/50-work


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

    ndb crash if trigger record get to big, fix incorrect max size of trigger record


ndb/src/kernel/blocks/backup/Backup.cpp:
  Increase size of max trigger record

  ndb crash if trigger record get to big, fix incorrect max size of trigger record


ndb/src/kernel/blocks/backup/Backup.cpp:
  Increase size of max trigger record

  When doing an ALTER TABLE on a table using partitioning, force the table
  definition to get reloaded, since it may become invalid whenever the ALTER
  TABLE fails (even for an ALTER TABLE without specific partitioning changes).


mysql-test/r/partition.result:
  New results
mysql-test/t/partition.test:
  New regression test
sql/sql_partition.cc:
  Always force table to get reloaded when we ALTER a
  partitioned table

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  incorrect handling of varsize primary key and charsets in tup-scan


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  put tracenr log in signal log instead...as out file gets very big...
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  PK needs to be normalized before computing hashvalue, otherwise lock-req will not find row,
    causing assertion in debug build, and inconsistency in release

  put nrtrace in out file instead (debug compiled..)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  put nrtrace in out file instead (debug compiled..)

into  xgeek.:C:/work/mysql-5.1-new

  Fixed problem where taocrypt was defined too early in the process


win/cmakefiles/base:
  Fixed problem where taocrypt was defined too early in the process

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

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


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

mysql-test/mysql-test-run.pl:
  Setup path the slave clusters data dir
  Remove slave clusters data dir on restart after test case failure

into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm


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

mysql-test/mysql-test-run.pl:
  Remove extra printouts

into  shellback.(none):/home/msvensson/mysql/init_rm/my51-init_rm


mysql-test/mysql-test-run.pl:
  Merge 5.0 -> 5.1

mysql-test/mysql-test-run.pl:
  Take a snapshot of the data dirs just after all db's have been installed and usedthat snasphot to restore the db(s) to a known state after a test case has failed.
  Thus avoiding subsequent test cases to fail because of previous test failures.

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

sql/ha_ndbcluster_binlog.cc:
  removing non critical assert

into  perch.ndb.mysql.com:/home/jonas/src/51-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  bug#17854, bug#18000


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove incorrect assertion

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

mysql-test/t/rpl_ndb_dd_advance.test:
  remove drop and create of test db
mysql-test/r/rpl_ndb_dd_advance.result:
  update

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


sql/log.cc:
  Auto merged