mysql-test/r/archive.result:
  Result file for adding check table support
mysql-test/t/archive.test:
  Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
  Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
  Updates for adding CHECK table support

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test1

client/mysqldump.c:
  BUG# 13052 Changed text in option to TIMESTAMP

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12739


sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

droping trigger on InnoDB table".

Deadlock occured in cases when we were trying to create two triggers for
the same InnoDB table concurrently and both threads were able to reach
close_cached_table() simultaneously. Bugfix implements new approach to
table locking and table cache invalidation during creation/dropping
of trigger.

No testcase is supplied since bug was repeatable only under high concurrency.


sql/mysql_priv.h:
  reopen_name_locked_table():
    Changed function signature to make it more robust against erroneous usage.
sql/sql_base.cc:
  reopen_name_locked_table():
    Changed function signature to make it more robust against erroneous usage.
    Obtaining LOCK_open lock is now resposibility of caller.
    When searching for the table to open we should not prefer connection's current
    database over database which was explicitly specified in TABLE_LIST::db member
    (even if database is not explicitly specified for table in original query
    TABLE_LIST::db will be set properly at parsing stage).
    Fixed behavior of function in cases when error occurs during opening of table.
sql/sql_table.cc:
  prepare_for_restore()/prepare_for_repair():
    We should not prefer connection's current database over database which was
    specified in TABLE_LIST::db member (even if database is not explicitly
    specified for table in original query TABLE_LIST::db will be set properly
    at parsing stage). Fixed behavior in unlikely case when we are unable
    to open table which we are restoring/reparing at the end of preparation
    stage.
sql/sql_trigger.cc:
  mysql_create_or_drop_trigger():
    Now instead of opening and locking table, creating trigger, and then trying
    to invalidate all instances of this table in table cache, we obtain name
    lock on table first (thus ensuring that no other thread has this table
    open), open it, create trigger and then close table therefore releasing lock.
    New approach is more in line with other places where change .frm files
    (i.e. change table meta-data).
    With this change we also get rid of deadlock which occured in cases when we
    were trying to create two triggers for the same InnoDB table concurrently
    and both threads were able to reach close_cached_table() simultaneously.
    (Alternative was to forbid to InnoDB downgrade locks for CREATE/DROP
     TRIGGER statements in one way or another but I think that proposed
     solution is better long term).

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

into  selena.:H:/MYSQL/src/#13377-mysql-5.0


mysql-test/include/check_var_limit.inc:
  Auto merged
mysql-test/include/have_big5.inc:
  Auto merged
mysql-test/include/have_compress.inc:
  Auto merged
mysql-test/include/have_crypt.inc:
  Auto merged
mysql-test/include/have_outfile.inc:
  Auto merged
mysql-test/include/have_query_cache.inc:
  Auto merged
mysql-test/include/have_tis620.inc:
  Auto merged
mysql-test/include/have_ucs2.inc:
  Auto merged
mysql-test/include/have_ujis.inc:
  Auto merged
mysql-test/include/not_embedded.inc:
  Auto merged
mysql-test/include/system_db_struct.inc:
  Auto merged
mysql-test/include/test_outfile.inc:
  Auto merged
mysql-test/r/greedy_optimizer.result:
  Auto merged
mysql-test/r/index_merge.result:
  Auto merged
mysql-test/r/index_merge_bdb.result:
  Auto merged
mysql-test/r/index_merge_innodb.result:
  Auto merged
mysql-test/r/index_merge_innodb2.result:
  Auto merged
mysql-test/r/index_merge_ror.result:
  Auto merged
mysql-test/r/index_merge_ror_cpk.result:
  Auto merged
mysql-test/r/join_nested.result:
  Auto merged
mysql-test/r/rowid_order_bdb.result:
  Auto merged
mysql-test/r/rowid_order_innodb.result:
  Auto merged
mysql-test/r/rpl_session_var.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sum_distinct.result:
  Auto merged
mysql-test/std_data/des_key_file:
  Auto merged
mysql-test/std_data/init_file.dat:
  Auto merged
mysql-test/std_data/loaddata1.dat:
  Auto merged
mysql-test/std_data/loaddata2.dat:
  Auto merged
mysql-test/std_data/loaddata3.dat:
  Auto merged
mysql-test/std_data/loaddata4.dat:
  Auto merged
mysql-test/std_data/rpl_loaddata.dat:
  Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
  Auto merged
mysql-test/std_data/warnings_loaddata.dat:
  Auto merged
mysql-test/t/greedy_optimizer.test:
  Auto merged
mysql-test/t/index_merge.test:
  Auto merged
mysql-test/t/index_merge_bdb.test:
  Auto merged
mysql-test/t/index_merge_innodb.test:
  Auto merged
mysql-test/t/index_merge_innodb2.test:
  Auto merged
mysql-test/t/index_merge_ror.test:
  Auto merged
mysql-test/t/index_merge_ror_cpk.test:
  Auto merged
mysql-test/t/join_nested.test:
  Auto merged
mysql-test/t/rowid_order_bdb.test:
  Auto merged
mysql-test/t/rowid_order_innodb.test:
  Auto merged
mysql-test/t/rpl_session_var.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/sum_distinct.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

sql/log.cc:
  Small update to apply patch to *nix builds as well

mysql-test/include/check_var_limit.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
  Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
  Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
  Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
  Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
  Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
  Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
  Turn off EOLN_NATIVE flag

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


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged

Make sure "select" aborts when finding a SP condition handler beyond the current scope.


mysql-test/r/sp.result:
  Updated test results after fixing error handling in select.
sql/mysqld.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
  Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.

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

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

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

  Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported

Init KeyDescriptor before sending to DIH, 
  make sure that its always inited

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

  testBackup, fix assertion


ndb/test/ndbapi/testBackup.cpp:
  Fetch table before verifying

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

bug 2030. Will push a proper fix later


server-tools/instance-manager/manager.cc:
  Fix im tests on powermacg5: temporarily fix for problem with Darwin kernels.

  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file
mtr_cases.pl:
  Added --skip-im option handling
mtr_process.pl:
  Kill left over 'mysqld' processes started by IM


mysql-test/lib/mtr_process.pl:
  Kill left over 'mysqld' processes started by IM
mysql-test/lib/mtr_cases.pl:
  Added --skip-im option handling
mysql-test/mysql-test-run.pl:
  Added --skip-im option handling
  Don't terminate script if IM fails to create PID file

  Test for bug#12812 moved from sp.test to sp-security.test


mysql-test/t/sp.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp-security.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp.result:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp-security.result:
  Test for bug#12812 moved from sp.test to sp-security.test

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

  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.

  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX

  Missing yaSSL added to pro-gpl target


VC++Files/mysql.sln:
  Missing yaSSL added to pro-gpl target

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


myisam/mi_check.c:
  Auto merged

  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0


support-files/mysql.spec.sh:
  Give mode arguments the same way in all places
  Moved copy of mysqld.a to "standard" build, but
  disabled it as we don't do embedded yet in 5.0

  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree


support-files/mysql.spec.sh:
  For 5.x, always compile with --with-big-tables
  Copy the config.log file to location outside
  the build tree

  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"


support-files/mysql.spec.sh:
  Removed unneeded/obsolte configure options
  Added archive engine to standard server
  Removed the embedded server from experimental server
  Changed suffix "-Max" => "-max"
  Changed comment string "Max" => "Experimental"

instead of Field_longlong::store(double nr).

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

mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023

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


sql/ha_ndbcluster.cc:
  merge

Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)

  After merge fix.


client/mysql.cc:
  After merge fix.