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

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

  make lockpages=1 run a bit earlier in startup

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge

  new file

    remove compiler warning EventLogger.cpp
    Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
     - partial fix
     - object map to handle failed realloc

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

- do not call function if table has no autoincrement

into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-merge

remove SET_VAR_REQ,REF,CONF - unused, #if 0 and confusing

Remove the dead SET_VAR_REQ,REF,CONF signals.

They:
a) don't currently work
b) will cause confusion with future mgmd updates for
   signal interface to configuration things (e.g. port numbers)

remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.

Don't send uninit data in TAMPER_ORD to DIHNDBTAMPER

Even though this data is unused from the CMVMI (mgmd) signal,
we shouldn't be doing stuff with uninited data.

there is backwards compatibility for GET CONFIG style configuration requests in
ndb_mgmd. None of the ndbd versions that use this couldn't possibly connect to a
5.0 or 5.1 cluster. remove the backwards compat

remove it

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

indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.

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

- signals where sometimes sent too early when setting up subscriptions

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  mysql.com:/home/tnurnberg/24660/50-24660

into  mysql.com:/home/tnurnberg/24660/41-24660

into  mysql.com:/home/tnurnberg/24660/50-24660

ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used. Now if 0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an error.

Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.

into  trift2.:/MySQL/M50/push-5.0

  Copy "ndb_size.tmpl" into binary distribution (Bug#24191)

into  siva.hindu.god:/home/tsmith/m/bk/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/maint/41

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

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

Avoid problem with "noinst_HEADERS" being sucked into "mysqld_LDADD" if openssl_libs and yassl_libs are empty strings

into  trift2.:/MySQL/M50/push-5.0

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

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

  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration

bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value

Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range