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


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  manual merge

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd


ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb: added missing lock of mutex

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


support-files/mysql.spec.sh:
  Auto merged

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


support-files/mysql.spec.sh:
  Auto merged

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


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
  manual merge

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


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  mysql.com:/home/mysql-5.1-18997e


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged

if input year for date_add() / date_sub() with INTERVAL is low enough for
calc_daynr() to possibly return incorrect results (calc_daynr() has no information
on whether the year is low because it was a two-digit year ('77) or because it
was a really low four-digit year (0077) and will indiscriminately try to turn the
value into a four-digit year by adding 1900 or 2000 respectively), the functions
will now throw NULL.


include/my_time.h:
  new define YY_MAGIC_BELOW: if year is below this threshold, magic kicks in in
  calc_daynr(). the idea is to convert two-digit years to four-digit ones, adding
  1900 to values >= YY_PART_YEAR or adding 2000 otherwise.
  current value of YY_MAGIC_BELOW derived from original code in calc_daynr()
mysql-test/r/func_time.result:
  test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
  it happens
mysql-test/t/func_time.test:
  test where 2 digit -> 4 digit year magic kicks in, and whether we throw NULL when
  it happens
sql-common/my_time.c:
  use new const YY_MAGIC_BELOW, apply 2-digit -> 4-digit magic only to years
  below this threshold.
sql/item_timefunc.cc:
  throw NULL when year in date_add() / date_sub() would be affected by
  2 digit -> 4 digit magic.

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

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


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


sql/sql_select.cc:
  Auto merged

storage/ndb/src/ndbapi/DictCache.cpp:
  changed dbug printout

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


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge

The problem is that in a MyISAM table the following column
after a varchar field gets corrupted, if varchar field is
extended.

This should be made to work without a copy in the future, but
I'm not sure if this code is ready yet. This fix will force copy
in this case. It will not do any harm to have it here, only makes
alter table a bit slower in this case. If this should work for
MyISAM, then the bug is somewhere else in that code.

Until it works, I propose this as a temporary fix or a workaround.
Test case for the bug has been added.


mysql-test/r/alter_table.result:
  Added test case for Bug#19386: Multiple alter causes crashed table.
mysql-test/t/alter_table.test:
  Added test case for Bug#19386: Multiple alter causes crashed table.
sql/ha_myisam.cc:
  For MyISAM type, if varchar column is extended, it should return not
  compatible for now. In other words, it forces a copy of the table during
  alter table.

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


sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sp_head.cc:
  SCCS merged

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss547
 Null merge


sql/ha_innodb.cc:
  Null merge
storage/innobase/os/os0file.c:
  Null merge

into  mysql.com:/home/alexi/innodb/mysql-5.0-ss547-work
 Null merge


innobase/os/os0file.c:
  Null merge
sql/ha_innodb.cc:
  Null merge

- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid


ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/TransporterFacade.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_autodiscover3.result:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/t/ndb_autodiscover3.test:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter".


innobase/os/os0file.c:
  Applied innodb-5.0-ss547 snapshot.
   Check the page trailers also after writing to disk.
   This improves the chances of diagnosing Bug 18886.
   os_file_check_page_trailers(): New function for checking
   that two copies of the LSN stamped on the pages match.
   os_aio_simulated_handle(): Call os_file_check_page_trailers()
   before and after os_file_write().
sql/ha_innodb.cc:
  Applied innodb-5.0-ss547 snapshot.
   Increment statistic counter in ha_innobase::index_prev().

 Fix BUG#19542 "InnoDB doesn't increase the Handler_read_prev counter.
 


innobase/os/os0file.c:
  Applied innodb-4.1-ss29 snapshot.
   Check the page trailers also after writing to disk.
   This improves the chances of diagnosing Bug 18886.
   os_file_check_page_trailers(): New function for checking
   that two copies of the LSN stamped on the pages match.
   os_aio_simulated_handle(): Call os_file_check_page_trailers()
   before and after os_file_write().
sql/ha_innodb.cc:
  Applied innodb-4.1-ss29 snapshot.
   Increment statistic counter in ha_innobase::index_prev().

  
Stored procedure execution sometimes placed the address of auto variables
in the list of Item changes to undo in THD::rollback_item_tree_changes().
This could cause stack corruption.


sql/sp_head.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_head.h:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_rcontext.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sp_rcontext.h:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.
sql/sql_class.cc:
  Avoid storing address of auto variables in global rollback list, to
  prevent stack memory corruption.

Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  Added suppressions for Red Hat AS 4


mysql-test/valgrind.supp:
  Added suppressions for Red Hat AS 4

into  mysql.com:/home/psergey/mysql-5.1-merge2


mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/opt_range.cc:
  Manual merge

mysql-test/r/partition.result:
  fix results - bad automerge

into  xiphis.org:/home/acurtis/mysql-5.1-merge


sql/sql_table.cc:
  Auto merged

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new


BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Auto merged
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Auto merged

  Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test


BitKeeper/deleted/.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test
BitKeeper/deleted/.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
BitKeeper/deleted/.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
BitKeeper/deleted/.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
BitKeeper/deleted/.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
BitKeeper/deleted/.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
BitKeeper/deleted/.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
BitKeeper/deleted/.del-ndb_partition_range.result~17fc1db754d4153d:
  Delete: mysql-test/r/ndb_partition_range.result

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509


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

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge