ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  changed using new event constructor

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added classification "schema object already exists"
  retrieved error from sub_stop_ref correctly
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added classification "schema object already exists"
  + added error code for failed prepare drop subscribe event

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

BitKeeper/etc/logging_ok:
  auto-union
ndb/src/mgmsrv/main.cpp:
  Auto merged

The test case does not currently work (I am comitting this so that Patrick will have a working copy).
I am going to look at the test case next. It is suspected that it is failing do to a change in mysql_test_run.



sql/ha_federated.cc:
  Changed for table structure change.

Seems like such a short commit message...


sql/examples/ha_archive.cc:
  Updates for Monty's change to table structures.
  The way the loop through blobs worked has changed.
sql/examples/ha_tina.cc:
  Update for monty's change in table structures. 
  Only used for copying null bytes.

sql/sql_parse.cc:
  Fixing merge issue with goto label missing.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/home/jwinstead2/mysql-5.0


client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_pthread.h:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

   added my_pthread_init to get dbug print correct in Hugo
    added define for event error code



ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  updated event example to make use of new NdbError member in NdbEventOperation
  + use define to check error code
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  updated create event signal to use define
ndb/include/ndbapi/NdbEventOperation.hpp:
  added NdbError member to NdbEventOperation
ndb/include/ndbapi/ndberror.h:
  added define for event error code
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  changed name of error code
ndb/src/ndbapi/NdbEventOperation.cpp:
  added NdbError
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  added debug printout
  added some error handling
ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  added NdbError
ndb/src/ndbapi/Ndberr.cpp:
  added NdbError for NdbEventOperationImpl
ndb/src/ndbapi/ndberror.c:
  changed some error codes
ndb/test/ndbapi/test_event.cpp:
  added testcase for BUG#7627
ndb/test/src/HugoTransactions.cpp:
  added printout in event
ndb/test/src/NDBT_Test.cpp:
  added my_pthread_init to get dbug print correct

into build.mysql.com:/users/tulin/mysql-5.0

  correcting 4.1 merge error


ndb/src/mgmsrv/main.cpp:
  correcting 4.1 merge error

into mysql.com:/home/jwinstead2/mysql-4.1-clean


scripts/mysql_config.sh:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

scripts/mysql_config.sh:
  Add comment to clarify why we can safely only strip flags with a leading space

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

client/mysqldump.c:
  fixed comment
  fixed compiler warning

BitKeeper/etc/ignore:
  auto-union
include/my_pthread.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  merged manually

client/mysqldump.c:
  fixed comparation with string constant on some platform

into mysql.com:/home/jwinstead2/mysql-4.1-clean


client/mysqladmin.cc:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/space/my/mysql-4.1

into mysql.com:/home/my/mysql-5.0


sql/sql_prepare.cc:
  Auto merged

After merge fixes


libmysql/libmysql.c:
  Fixed a bug in prepared statements error handling introduced by me on a recent patch
mysql-test/r/delayed.result:
  Updated results
mysql-test/t/delayed.test:
  Bigger timeout needed when using --ps-protocol (don't understand why yet)
  Added output of not_flushed_dealyed_rows for easier debugging
sql/sql_base.cc:
  USE tables_share fix for prepared statements
sql/sql_prepare.cc:
  After merge fix

BUILD/compile-dist:
  - manual merge
include/my_pthread.h:
  - manual merge

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

Ensure that a 'bool' function really returns a value - was compiler error on some problems causing build failure.

   build (to make the test suite pass)


BUILD/compile-dist:
  - enable "with-extra-charsets=complex" for the distribution build
    (to make the test suite pass)

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

  fixed ndb configure according to 4.1


config/ac-macros/ha_ndbcluster.m4:
  fixed ndb configure according to 4.1

  forgot hex prefix


ndb/src/ndbapi/NdbRecAttr.cpp:
  forgot hex prefix

  improved printout routine


ndb/src/ndbapi/NdbRecAttr.cpp:
  improved printout routine