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


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  merge

    ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data


ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix so that backup dont read xfrm data

ndb/include/ndbapi/NdbTransaction.hpp:
  post merge fixes
ndb/src/ndbapi/Ndblist.cpp:
  post merge fixes
sql/ha_ndbcluster.cc:
  post merge fixes

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


ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.cpp:
  Auto merged
ndb/src/ndbapi/NdbApiSignal.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/test/include/NDBT_Test.hpp:
  Auto merged
ndb/test/ndbapi/bank/BankLoad.cpp:
  Auto merged
ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/tools/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
ndb/include/ndbapi/Ndb.hpp:
  merge
ndb/include/ndbapi/NdbIndexOperation.hpp:
  merge
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  merge
ndb/include/ndbapi/NdbTransaction.hpp:
  merge
ndb/src/ndbapi/NdbImpl.hpp:
  merge
ndb/src/ndbapi/Ndblist.cpp:
  merge
ndb/test/src/HugoCalculator.cpp:
  merge
ndb/test/src/NDBT_Test.cpp:
  merge
sql/ha_ndbcluster.cc:
  merge
sql/mysqld.cc:
  merge
sql/sql_lex.h:
  merge
sql/sql_parse.cc:
  merge

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

server-tools/instance-manager/buffer.cc:
  perform initialization of static consts in .cc file to respect VC6
server-tools/instance-manager/buffer.h:
  fix compiler warning
server-tools/instance-manager/commands.cc:
  fix compiler warning
server-tools/instance-manager/user_map.cc:
  fix compiler warning

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

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


client/mysqltest.c:
  Merged from 4.1.

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


client/mysqltest.c:
  Merged from 4.0.

  Bug #13152 bit fields and fields that follow become corrupted when dumped from NDB tables

  that dump free list allocation per connection


sql/ha_ndbcluster.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/ha_ndbcluster.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/mysqld.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_lex.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_parse.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_yacc.yy:
  imlp. show engine ndb status;
    that dump free list allocation per connection

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

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


ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged

  Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest

  big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


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

  Bug#10504: additional test


mysql-test/t/ctype_utf8.test:
  Bug#10504: additional test
mysql-test/r/ctype_utf8.result:
  Bug#10504: additional test

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

into lmy002.wdf.sap.corp:/home/georg/work/mysql/bugs/mysql-5.0-master


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_view.cc:
  Auto merged

sql/parse_file.cc:
  Fix after discussion/review with Sanja: removed rename_view from sql_view to general function rename_in_schema_file
  (so it can be used for other .frm types like triggers too)
sql/parse_file.h:
  added prototype for rename_in_schema_file
sql/sql_rename.cc:
  simplified code (thanks to Sanja)
sql/sql_view.cc:
  moved rename_view_files to rename_in_schema_file (parse_file.cc)
  corrected MYF parameter from MY_WME to 0.

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1

  Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2

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

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

Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.


BUILD/SETUP.sh:
  Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
BUILD/autorun.sh:
  Change of syntax

  Enabled --valgrind to work (bug#13280)


mysql-test/mysql-test-run.pl:
  Enabled --valgrind to work (bug#13280)

into  127.(none):/home/osku/mysql/5.0/clean

mysql-test/r/view.result:
  test results for rename table view1 to view2
mysql-test/t/view.test:
  tests for rename table view1 to view2
sql/share/errmsg.txt:
  added new errormessage (schema change not allowed in rename table view)
sql/sql_rename.cc:
  added support for renaming views
sql/sql_view.cc:
  added new function mysql_rename_view
sql/sql_view.h:
  added prototype mysql_rename_view

  remove extra ";" from test programs


ndb/test/include/NDBT_Test.hpp:
  Remove extra ";"
ndb/test/ndbapi/bank/BankLoad.cpp:
  Remove extra ";"
ndb/test/ndbapi/testOIBasic.cpp:
  Remove extra ";"
ndb/test/src/HugoCalculator.cpp:
  Remove extra ";"
ndb/test/src/NDBT_Test.cpp:
  Remove extra ";"
ndb/test/src/NdbBackup.cpp:
  Remove extra ";"
ndb/test/src/NdbRestarts.cpp:
  Remove extra ";"

into moonbone.local:/work/12291-bug-5.0-mysql

  impl support for querying resource usage in ndb api
  to help track down mem leaks


ndb/include/ndbapi/Ndb.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbBlob.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbConnection.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbIndexOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbOperation.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/include/ndbapi/NdbRecAttr.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbApiSignal.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbBlob.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbImpl.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbRecAttr.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbUtil.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/NdbUtil.hpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndbif.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndbinit.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/src/ndbapi/Ndblist.cpp:
  Impl. reporting of free list usage
  Put free list into handler class
ndb/tools/restore/Restore.cpp:
  Impl. reporting of free list usage
  Put free list into handler class

into mysql.com:/M50/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0

sql/sql_show.cc:
  fixed typo
  fixed length detection