into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug


mysql-test/t/log_tables.test:
  Auto merged

The log content is obviously different in two modes,
as Queries are translated into Prepare and Execute
commands. Thus we should use test only in one mode
to get the match with result.


mysql-test/t/log_tables.test:
  disable ps-protocol in log_tables test

into lmy004.:/work/mysql-5.1-bug16548


mysql-test/t/disabled.def:
  Auto merged

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged

  updated


mysql-test/t/disabled.def:
  updated

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

  uninit variable


storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  Correct signal length

  Added comments on 1022 per Lars request


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Added comments on 1022 per Lars request

into lmy004.:/work/mysql-5.1-bug16548

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged

sql/sql_yacc.yy:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

added option for verbose ndb startup


mysql-test/mysql-test-run.pl:
  added option for relative pat in ndb config
mysql-test/ndb/ndbcluster.sh:
  added option for relative pat in ndb config

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo

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

  end_ptr to my_strtoll10 is in/out parameter


sql/sql_yacc.yy:
  init end_ptr as it's an in/out parameter, not only out

into  mysql.com:/usr/local/mysql/mysql-5.1-new

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

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

libmysqld/lib_sql.cc:
  logger initialization added
mysql-test/mysql-test-run.pl:
  ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
  ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
  result fixed
mysql-test/r/sp_notembedded.result:
  result fixed
mysql-test/t/log_tables.test:
  test disabled in embedded server
mysql-test/t/sp_notembedded.test:
  test fixed

storage/csv/ha_tina.cc:
  Removed unimplemented methods.
storage/csv/ha_tina.h:
  Reomoved unneeded methods

  had to add order by


mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
  had to add order by

BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
  Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
  Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
  Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
  Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
  setting back to orginal values

into  mysql.com:/usr/local/mysql/mysql-5.1-new

WL#1034 (Internal CRON)


mysql-test/r/events.result:
  add a test for to test bug #16431
mysql-test/t/events.test:
  results of new tests
sql/event.cc:
  - more debug info
  - pass info to evex_remove_from_cache() whether the operation 
    was drop or alter. this fixes possible bug that may lead to dropping
    of an event when it's altered. also fix for bug#16431
sql/event_executor.cc:
  be more verbose and throw more errors
sql/event_timed.cc:
  - add ` around the names of the db and the event_name and not
  their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
  which was failing because after some recursion the query was ending on ;;
  which is normally an error in the parser because that's the delimiter
  
  - more debug info
  - don't execute lex_end() two times when there's a parse error or thd->is_fatal_error

into  selena.:H:/MYSQL/src/#00000-mysql-5.1


client/mysqlslap.c:
  Auto merged
configure.in:
  Auto merged
VC++Files/mysql.sln:
  manual merge

WL #1034 (Internal CRON)


mysql-test/r/events.result:
  fix the results
mysql-test/t/disabled.def:
  make it enabled
mysql-test/t/events.test:
  - comment out some tests (having problems now)
  - add test for fix for bug#16548
sql/sql_yacc.yy:
  - fix for bug#16548 (Events: can't alter clause for preserve)
  - prefix optional non-terminals with opt_

into  mysql.com:/usr/local/mysql/tmp5.1

into  mysql.com:/usr/local/mysql/tmp5.1

calculate ndbcluster slave port


mysql-test/mysql-test-run.pl:
  calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
  option to run mysql-test-run without binlog
sql/mysqld.cc:
  option to run mysql-test-run without binlog

into  mysql.com:/usr/local/mysql/tmp5.1

into  mysql.com:/usr/local/mysql/tmp5.1


sql/sql_class.cc:
  Auto merged

storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix sol10-amd64-a compile failure, conflict with system headers.
sql/log.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/mysql_priv.h:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_delete.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/table.cc:
  Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_parse.cc:
  Fix HPUX compile failure, initializing char * with const char *