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


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged

+ some more docs on event


ndb/examples/ndbapi_event_example/ndbapi_event.cpp:
  ndbapi event code cleanup
ndb/include/kernel/signaldata/CreateEvnt.hpp:
  ndbapi event code cleanup
ndb/include/ndbapi/NdbDictionary.hpp:
  ndbapi event code cleanup
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  ndbapi event code cleanup
ndb/src/ndbapi/ndberror.c:
  ndbapi event code cleanup

+ some docs update on events


ndb/examples/ndbapi_simple_example/ndbapi_simple.cpp:
  updated example somewhat
ndb/include/ndbapi/NdbDictionary.hpp:
  fixed some docs
ndb/src/ndbapi/NdbDictionary.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/desc.cpp:
  last go at enabling using const NdbDictionary didn't work
ndb/tools/listTables.cpp:
  last go at enabling using const NdbDictionary didn't work

and removed usage of Ndb::waitUntilReady()

ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  getTable retry if DICT busy
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

and provided some backwards compat functions

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb

+ some extra docs on the area
updated docs by removing som async stuff


ndb/include/ndbapi/NdbTransaction.hpp:
  mostly reformatting but also some more explicit references to objects and methods

BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged

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

into mysql.com:/M50/mysql-5.0

sql/sql_acl.cc:
  block checking view underlying tables
sql/sql_base.cc:
  item registration fixed
  fixed non registred item resolving
  fixed result of outo-merge
  fixed creation reference if alias used
sql/sql_insert.cc:
  layout fixed
  removed unused variable
sql/sql_parse.cc:
  block checking view underlying tables
sql/sql_prepare.cc:
  make preparation check same as usual check
sql/sql_update.cc:
  made want_privilege assignment simplier
  block checking view underlying tables
sql/sql_view.cc:
  belong_to_view assignmebt moved after privileges check
sql/table.cc:
  check option fix field added
  arena management added

and updated some docs

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

BitKeeper/deleted/.del-select_all.cpp~de02d1231f741270:
  Delete: ndb/examples/select_all/select_all.cpp
BitKeeper/deleted/.del-Makefile~a3c445ed68365196:
  Delete: ndb/examples/select_all/Makefile

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

Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results


libmysql/libmysql.c:
  Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
  After merge fixes
mysql-test/r/select.result:
  Delete conflicting tables form previous tests
mysql-test/r/view.result:
  New code from 4.1 fixed old error
mysql-test/t/create.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
  Fixed comment
mysql-test/t/system_mysql_db_fix.test:
  Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
  Added comment
mysql-test/t/type_blob.test:
  Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
  Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
  Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
  Removed --error as bug is now fixed
mysql-test/t/warnings.test:
  Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
  Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
  Removed compiler warning
sql/log_event.cc:
  After merge fix
sql/sql_class.h:
  After merge fix
sql/sql_insert.cc:
  After merge fix
sql/sql_load.cc:
  After merge fix
sql/sql_prepare.cc:
  Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
  After merge fixes

mysql-test/t/multi_update.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

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

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

    Install varchar.frm
    Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh
    Use correct path to clist_tests in on installed system


mysql-test/Makefile.am:
  Install varchar.frm
  Otherwise type_varchar fails when running mysql-test-run on installed system
mysql-test/mysql-test-run.sh:
  Use correct path to clist_tests in on installed system

ndb/test/run-test/daily-basic-tests.txt:
  increase time for testTransactions

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


sql/sql_base.cc:
  Auto merged

into mysql.com:/users/pchardin/mysql-5.0

BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Delete: man/isamchk.1.in
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Delete: man/isamlog.1.in
man/Makefile.am:
  man pages for isamchk and isamlog removed
support-files/mysql.spec.sh:
  fix .spec file after isam/merge purge

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


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

    don't fail w/o bdb (or innodb)
sql/sql_base.cc
    typo fixed.
    "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)


mysql-test/r/multi_update.result:
  don't fail w/o bdb (or innodb)
mysql-test/t/multi_update.test:
  don't fail w/o bdb (or innodb)
sql/sql_base.cc:
  typo fixed.
  "mysql-test-run --ps-protocol select" fixed (item->cached_item was set to the last table if many matches)

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

ndb/include/ndb_types.h:
  SCCS merged

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