sql/ha_ndbcluster.cc:
  Use the ndb-cache-check-time value as a millisecond counter

sql/mysqld.cc:
  Change _ to - for ndb-cache-check-time variable

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

  split into script/conf for easier deployment

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql/sql_yacc.yy:
  duplicated symbol removed

into mysql.com:/home/mysqldev/tulin/mysql-5.0

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

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

mysql-test/r/myisam.result:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/r/ndb_autodiscover.result:
  Update test results
mysql-test/r/rpl_EE_error.result:
  Change test to conform with new handling of drop table when handler file is missing
mysql-test/t/myisam.test:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/t/rpl_EE_error.test:
  Change test to conform with new handling of drop table when handler file is missing
sql/handler.cc:
  Generate a warning in ha_delete_table() if we get an error from 'delete_table()'
sql/handler.h:
  More parameters to ha_delete_table() so that we can generate better error messages
sql/sql_table.cc:
  Generate warning in ha_delete_table()

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


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

  Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited


sql/ha_innodb.cc:
  Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited

into deer.(none):/home/hf/work/mysql-5.0.clean

sql/item_sum.cc:
  curr_dec_buff should be set to 0 here

into mysql.com:/home/mysqldev/tulin/mysql-5.0

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

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into deer.(none):/home/hf/work/mysql-5.0.clean

mysql-test/r/analyse.result:
  test result extended
mysql-test/r/cast.result:
  test result extended
mysql-test/r/func_group.result:
  test result extended
mysql-test/r/subselect.result:
  test result extended
mysql-test/t/analyse.test:
  test extended
mysql-test/t/cast.test:
  test extended
mysql-test/t/func_group.test:
  test extended
mysql-test/t/subselect.test:
  test extended

into mysql.com:/home/mysqldev/tulin/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

mysql-test/t/type_bit.test:
  Cleanup (we don't need to have include/have_innodb.inc here).

(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)


sql/sp_head.cc:
  A minor adjustment of the previous bug fix; moved the rollback of item changes
  to a better place which will not miss some cases.

into mysql.com:/usr/home/ram/work/5.0

ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Moved ndbrequire and break down one line, to avoid warnings and compiler crash

into mysql.com:/usr/home/ram/work/5.0

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


sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()


sql/handler.cc:
  delete_table() will not return error for not found files if one handler file was found and deleted
sql/handler.h:
  Incremented MAX_HA so that ndb works again
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/log.cc:
  Indentation fixes
  Simplified loop to find next log
  Fixed race condition in reset_logs that caused mix_innodb_myisam_binlog to fail
sql/log_event.cc:
  Don't convert char pointer to (my_xid*) as we don't know if the address is aligned on 8
sql/sql_acl.cc:
  Convert db name directly to avoid extra strmov
sql/sql_base.cc:
  Added comment
  Removed not needed code
sql/sql_db.cc:
  Added comment
  Remove not needed code
sql/sql_parse.cc:
  Always call mysql_rm_db() with lower case db name
  Ensure that 'res' is set correctly in mysql_execute_command()
  (One don't have to set res if one calls my_error() and res should be = 0 for correct commands)
sql/sql_repl.cc:
  Indentation fixes
  use packet->ptr() instead of packet->c_ptr()
sql/sql_table.cc:
  Join similar code when table didn't exist in engine

into mysql.com:/home/mysqldev/tulin/mysql-5.0

"create table ta(a bit...) engine=innodb" moved to innodb.test


mysql-test/r/innodb.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/r/type_bit.result:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/innodb.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)
mysql-test/t/type_bit.test:
  A fix (bug #7661: 'classic' shows different test effects which must be cared for)

into mysql.com:/home/mysqldev/tulin/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/log.cc:
  Auto merged

sql/handler.cc:
  more DBUG
sql/handler.h:
  increase MAX_HA (ha_archive has its handlerton too)
sql/log.cc:
  fix assert

mysql-test/r/ndb_cache_multi2.result:
  reset query cache settings on end of test
mysql-test/t/ndb_cache_multi2.test:
  reset query cache settings on end of test

into mysql.com:/home/mysqldev/tulin/mysql-5.0

sql/ha_ndbcluster.cc:
  Respect "all" flag so that correct transaction is released
sql/handler.cc:
  Make sure innodb temporary latches are only released if innodb is used