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


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  merge

  fix correct frag count in Backup block


ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Fix correct no of fragment records

  fix mem leak (not during running of transactions, but a few bytes when shutting down)


ndb/src/ndbapi/NdbLinHash.hpp:
  Make sure that getNext(0) actually finds first element

  silent valgrind warnings 5.0, ndb_autodiscover


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  append 4 bytes of 0's to end of buffer to shut valgrind up

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

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

  remove debug prinouts in Qmgr


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove debug prinouts

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


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

  1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)

  add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Expand CmRegReq with lots of stuff
ndb/include/mgmapi/ndb_logevent.h:
  Add Start report during sp1
ndb/src/common/debugger/EventLogger.cpp:
  Add Start report during sp1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Init cntrref
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix small bugs related to partial initial start
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Remove timeouts as they are handled in QMGR nowadays
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/vm/Configuration.cpp:
  Add new flags
    --initial-start
    --nowait-nodes

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

as it is now required by mysql_set_character_set()


libmysql/libmysql.c:
  Removing mysql_get_server_version()
sql-common/client.c:
  Adding mysql_get_server_version()

  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.


sql-common/client.c:
  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.

into  mysql.com:/usr/home/bar/mysql-5.0


libmysql/libmysql.c:
  Bug#18830 incompatibility new libraries with old server
  Mergeing from 4.1

  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.


libmysql/libmysql.c:
  Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.

into  mysql.com:/usr/home/bar/mysql-5.0

Adding test case to cover queries which worked incorrectly earlier:
Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci


mysql-test/r/ctype_latin1.result:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci
mysql-test/t/ctype_latin1.test:
  Adding test case for Bug#18321: Can't store EuroSign with latin1_german1_ci and latin1_general_ci

  Using local.


strings/ctype-extra.c:
  Using local.

into  mysql.com:/usr/home/bar/mysql-5.0


strings/conf_to_src.c:
  Auto merged

  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.
ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.


strings/ctype-extra.c:
  Regenerating ctype-extra.c with the fixed conf_to_src.
strings/conf_to_src.c:
  Backporting a 5.0 change:
  MAX_BUF was too small for Index.xml
  Changeing MAX_BUF and adding assert to easier
  catch the same problem in the future.

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.
ctype-extra.c:
  Additional charsets were generated.


strings/ctype-extra.c:
  Additional charsets were generated.
strings/conf_to_src.c:
  Buffer was too small to load Index.xml.
  So some charsets were not gerenrated.
  Making the buffer bigger, and adding an DBUG_ASSERT,
  to easier catch the problem in the future.

into sunlight.local:/local_work/16281-bug-5.0-mysql


sql/field.h:
  Auto merged

Mutli-table uses temporary table to store new values for fields. With the
new values the rowid of the record to be updated is stored in a Field_string
field. Table to be updated is set as source table of the rowid field.
But when the temporary table creates the tmp field for the rowid field it
converts it to a varstring field because the table to be updated was created by
the v4.1. Due to this the stored rowids were broken and no records for 
update were found.

The flag can_alter_field_type is added to Field_string class. When it is set to
0 the field won't be converted to varstring. The Field_string::type() function 
now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0.
The multi_update::initialize_tables() function now sets can_alter_field_type
flag to 0 for the rowid fields denying conversion of the field to a varstring
field.



sql/field.h:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The flag can_alter_field_type is added to Field_string class. When it is set to
  0 the field won't be converted to varstring.
  The Field_string::type() function now always returns MYSQL_TYPE_STRING if 
  can_alter_field_type is set to 0.
sql/sql_update.cc:
  Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
  The multi_update::initialize_tables() function now sets can_alter_field_type
  flag to 0 for the rowid fields denying conversion of the field to a varstring
  field.

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  merge
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  merge

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


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

The code in opt_sum_query that prevented the COUNT/MIN/MAX 
optimization from being applied to outer joins  was not adjusted 
after introducing nested joins. As a result if an outer join
contained a reference to a view as an inner table the code of
opt_sum_query missed the presence of an on expressions and
erroneously applied the mentioned optimization.


mysql-test/r/view.result:
  Added a test case for bug #18237.
mysql-test/t/view.test:
  Added a test case for bug #18237.

into  mysql.com:/usr/home/bar/mysql-5.0

mysql-test/r/information_schema.result:
  IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
  IS_COMPILED is not determenistic
strings/conf_to_src.c:
  Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
  Recreating sources according to 5.0 XML files using conf_to_src.

into  rurik.mysql.com:/home/igor/mysql-5.0

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

Add support for "--debugger=windbg" and "--debugger=vcexpress"

into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into  rurik.mysql.com:/home/igor/mysql-5.0


sql/item.cc:
  Auto merged

  fix testprogam if only 1 node group


ndb/test/ndbapi/testNodeRestart.cpp:
  fix testprogam if only 1 node group

netware/BUILD/compile-linux-tools:
  .libs/sql is no longer used when compiling netware