BitKeeper/deleted/.del-thread_repository.cc~bba09f64f8cb4037:
  Delete: server-tools/instance-manager/thread_repository.cc
BitKeeper/deleted/.del-thread_repository.h~e6a3b9cab7a6612a:
  Delete: server-tools/instance-manager/thread_repository.h
server-tools/instance-manager/commands.cc:
  All instances are guarded by default now, so we need to perform check on whether the instance is nonguarded,
  rather then guarded when adding it to the list of guarded instnces.
server-tools/instance-manager/guardian.cc:
  Guardian rewritten to start instances by default, and shut them down, when exiting. Behaviour of the guardian
  in case of the instance crash has changed. Now it tries to restart an instance constantly in the first 2 
  seconds after the crash was noticed, and then it tries restart an instance once in the MONITORING_INTERVAL.
  If it failed to restart instance for "restart_retry" (compiled-in value) times, guardian stops trying to
  restart it.
server-tools/instance-manager/guardian.h:
  Several new functions and variables declared.
server-tools/instance-manager/instance.cc:
  now start doesn't call stop(), but rather tries to remove the pidfile itself
server-tools/instance-manager/instance.h:
  cleanup
server-tools/instance-manager/instance_map.cc:
  no more "admin" options
server-tools/instance-manager/instance_map.h:
  User and password purged from instance_map options, as IM shouldn't know them
server-tools/instance-manager/instance_options.cc:
  new option added -- shutdown_delay, guarded option now called nonguaded and has the opposite meaning
server-tools/instance-manager/instance_options.h:
  appropriate changes, reflecting options addition/removal
server-tools/instance-manager/manager.cc:
  shutdown process is complicated a bit -- at first signal thread should stop guardian, and only then the IM
  itself
server-tools/instance-manager/messages.cc:
  update error message
server-tools/instance-manager/options.cc:
  admin user/password purged from mysqlmanager options

into mysql.com:/home/cps/mysql/devel/im-fix

IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups


server-tools/instance-manager/Makefile.am:
  New file added
server-tools/instance-manager/client_func.c:
  typo fixed
server-tools/instance-manager/commands.cc:
  there are no admin-user snd admin-password fields anymore, so no need to show their values
server-tools/instance-manager/guardian.cc:
  Syncronization added -- now guardian wakes up whenever SIGCLD has been catched
server-tools/instance-manager/guardian.h:
  Condition variable declared
server-tools/instance-manager/instance.cc:
  Persistent connection to the instance removed. Now we use SIGTERM instead of com_shutdown for STOP. We also
  manage SIGCHLD ourselves now (therefore no double fork).
server-tools/instance-manager/instance.h:
  Pointer to the instance_map added, MySQL connection structures removed
server-tools/instance-manager/instance_map.cc:
  More syncronization added (to make proper STOP)
server-tools/instance-manager/instance_map.h:
  added condition variable and mutex for connection threads to wait for SIGCHLD
server-tools/instance-manager/instance_options.cc:
  defaults-handling methods have been added.
server-tools/instance-manager/instance_options.h:
  New functions and constants declared
server-tools/instance-manager/listener.cc:
  No changes here (bk bug?)
server-tools/instance-manager/manager.cc:
  SIGCHLD handling added

sql/ha_ndbcluster.cc:
  removed compiler warnings

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

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

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


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

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


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

a note, not a warning or error.

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

ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure

mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version

into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

(Bug#7428) (renamed: hash_reset -> my_hash_reset)


mysys/hash.c:
  renamed: hash_reset -> my_hash_reset
sql/sql_class.h:
  hash_reset -> my_hash_reset

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


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged

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


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged

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

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

ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit

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


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

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

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

sql/examples/ha_archive.cc:
  Fix style

  Did some more split TABLE to TABLE and TABLE_SHARE


sql/field.cc:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
sql/field.h:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'

sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings

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

into mysql.com:/home/mysql_src/mysql-5.0-clean

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

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0

into mysql.com:/space/my/mysql-5.0-build


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged