BUILD/SETUP.sh:
  for now no optimizations in debug build - get rid of "value optimized out"

into mysql.com:/M51/mysql-5.1

    Fix a typo: "distibution" -> "distribution".


sql/mysqld.cc:
  Fix a typo: "distibution" -> "distribution".

into  mysql.com:/usr/home/bar/mysql-5.1-new


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged

Changed to alphabetical order


mysql-test/r/show_check.result:
  Changed to alphabetical order

into  mysql.com:/tmp/x/mysql-5.1-new

mysql-test/r/show_check.result:
  fixed failing test for Holyfoot ;-)
sql/authors.h:
  added myself

into mysql.com:/data0/mysqldev/my/mysql-5.1.3-pushmain

sql/authors.h:
  line about HF

into mysql.com:/data0/mysqldev/my/mysql-5.1.3-fixes

The previous variant where it was a specific ha_partition method
only worked for the partition handler. It was unfortunately called also
for the NDB handler and in this case it called a random method in the
NDB handler with random input.


sql/ha_ndbcluster.cc:
  Moved initialisation of some handler variables to
  set_part_info method called earlly in the open process
sql/ha_ndbcluster.h:
  Moved initialisation of some handler variables to
  set_part_info method called earlly in the open process
sql/ha_partition.h:
  Made set_part_info a handler method and not a ha_partition method only
sql/handler.h:
  Made set_part_info a handler method and not a ha_partition method only
sql/sql_partition.cc:
  Made set_part_info a handler method and not a ha_partition method only

mysql-test/r/mysqldump.result:
  Fixing result from merge

into  zim.(none):/home/brian/mysql/mysql-5.1-new


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  REsolve
mysql-test/t/mysqldump.test:
  Resolve conflict

Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.

Though I hear you could just use a sed line to modify it back :)


client/client_priv.h:
  New option for --replace
client/mysqldump.c:
  Added option for REPLACE INTO instead of INSERT INTO
mysql-test/r/mysqldump.result:
  Updated REsultes for replace into
mysql-test/t/mysqldump.test:
  Added new test for --replace

Update version number to 5.1.4-alpha


configure.in:
  Update version number to 5.1.4-alpha

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

   (only showed up in a non-debug build)


mysys/mf_tempdir.c:
   - fixed a compile error by adding a missing comma (only showed up in a non-debug
     build)

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


mysql-test/t/disabled.def:
  SCCS merged

into  mysql.com:/my/mysql-5.1

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

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


sql/field.cc:
  Auto merged

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


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

mysql-test/r/view_grant.result:
  Drop things that may be left from old runs
mysql-test/t/view_grant.test:
  Drop things that may be left from old runs

into  mysql.com:/my/mysql-5.1

Removed valgrind warnings when using not aligned bitmap buffer size
Added setting of thread_stack


include/my_bitmap.h:
  Added bitmap_buffer_size()
sql/handler.cc:
  use bitmap_buffer_size()
sql/opt_range.cc:
  use bitmap_buffer_size()
sql/sql_insert.cc:
  Use bitmap_buffer_size()
sql/sql_parse.cc:
  Added setting of thread_stack when taking thread from thread cache
sql/sql_plugin.cc:
  Set thread_stack

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


sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/unireg.h:
  Auto merged

into  mysql.com:/my/mysql-5.1


sql/field.cc:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/examples/ha_tina.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge

Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk


BitKeeper/etc/ignore:
  added libmysqld/ha_blackhole.cc
BitKeeper/deleted/.del-ha_blackhole.cc~727c69ef7846623a:
  Delete: libmysqld/ha_blackhole.cc
include/my_global.h:
  Don't use PATH_MAX for FN_REFLEN as this uses too much stack space.
  (With a PATH_MAX of 4096, we use 80K for opening a table as there is several objects of size FN_REFLEN on stack)
mysql-test/r/federated.result:
  Update results after error message changes
mysql-test/r/grant.result:
  Update results after error message changes
mysql-test/r/grant2.result:
  Update results after error message changes
sql/ha_federated.cc:
  Fix error messages to be more consistent
sql/mysql_priv.h:
  Stack size to have when opening a table
  (This was needed on x86 64 bit Linux)
sql/share/errmsg.txt:
  Remove quotes around error string for federated as two quotes in the output looks strange
sql/sql_base.cc:
  More correct stack size
sql/sql_parse.cc:
  Set thread_stack before store_globals()
sql/unireg.h:
  More correct MAX_DBKEY_LENGTH

into  regul.home.lan:/mnt/md/bk/mysql-5.0

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


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/key.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/field.cc:
  Merge with global tree
sql/sql_base.cc:
  Merge with global tree
sql/table.cc:
  Merge with global tree