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


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/util/SocketClient.hpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SocketClient.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged

mysql-test/r/ndb_basic.result:
  from spaces, to tabs. what fun!
sql/ha_ndbcluster.h:
  fix estimate_rows_upper_bound() to be correct for NDB
sql/sql_select.cc:
  use non-exact records information

ndb/src/common/transporter/Transporter.cpp:
  change so timeout is rounded up to nearest second

  
  aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).


ndb/include/mgmapi/mgmapi.h:
  add ndb_mgm_set_connect_timeout
ndb/include/util/SocketClient.hpp:
  add timeout (seconds) for max time to wait for connection
ndb/src/common/transporter/Transporter.cpp:
  set limit on amount of time we'll wait for tcp connect
ndb/src/common/util/SocketClient.cpp:
  only try to connect for a maximum of timeout time
ndb/src/mgmapi/mgmapi.cpp:
  add ndb_mgm_set_connect_timeout

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

- post review changes

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


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

- make sure keys are copied correctly when varchar has 2 length bytes
- test case


mysql-test/r/ndb_basic.result:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - test case
mysql-test/t/ndb_basic.test:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - test case
sql/ha_ndbcluster.cc:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - make sure keys are copied correctly when varchar has 2 length bytes

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


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged

  remove accidently left debug prinouts

  Make sure subscriber is removed from list when n_subscribers is decreased


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Make sure subscriber is removed from list when n_subscribers is decreased
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Make sure subscriber is removed from list when n_subscribers is decreased

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


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

  Fix assertion in corner-case where signal isnt sent to any node


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix corner-case where signal isnt sent to any node

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

storage/archive/archive_reader.c:
  Print minor information version.
storage/archive/archive_test.c:
  Fixed test
storage/archive/azio.c:
  Added support for "minor" version.
storage/archive/azlib.h:
  Added information for minor information.

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


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

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

2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats. 


storage/archive/archive_reader.c:
  Added options for:
  1) Online backup for tables
  2) Check table option.
storage/archive/archive_test.c:
  Additional test, format is now the same as an actual table.
storage/archive/azio.c:
  Fixed issue closing files multiple times.
  Added option for recording longest and shortest rows. 
  Additional "dirty" state added.
storage/archive/azlib.h:
  Added additional space for longest and shortest row information.
storage/archive/ha_archive.cc:
  Cleaned up warming and removed unneeded close.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush


mysys/string.c:
  Auto merged

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


storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug when sending NODE_VERSION_REP

into  recycle.(none):/src/mysql-5.0-maint


mysys/string.c:
  Auto merged

into  recycle.(none):/src/mysql-5.1-maint


mysys/string.c:
  Auto merged

into  recycle.(none):/src/bug22807/my51-bug22807


mysys/string.c:
  Auto merged

- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.


mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Fix compiler warnings.
  - Used dynstr_append_mem where string length is known.

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


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Use local.

  fix some more sp100 hang cases


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  let suma know of API_FAILREQ even if not connected, to handle startme/handover 
    problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  some error inserts
  + resend API_FAILREQ during handover

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Manual merge.

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


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

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


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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.


mysql-test/t/ps.test:
  Quash platform-specific warnings.

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.


client/mysqlimport.c:
  Changed the opt_use_threads variable type to uint.

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

- on blob part execute failure, must leave in state executin, and await dropEventOperation