scripts/mysql_fix_privilege_tables.sql:
  fix to be event and ADD

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

add sql_mode to mysql.event
WL#1034 (Internal CRON)


mysql-test/lib/init_db.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
mysql-test/r/system_mysql_db.result:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_create_system_tables.sh:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event
scripts/mysql_fix_privilege_tables.sql:
  partial fix for bug#16407 (sql_mode not regarded)
  add sql_mode to mysql.event

into  big_geek.:C:/Work/mysql/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

win/build-vs71.bat:
  batch file to build project files for Visual Studio 2003
win/build-vs8.bat:
  batch file to build project files for Visual Studio 2005
win/cmakefiles/base:
  cmakefile that will later be moved into the target directory
win/cmakefiles/bdb:
  cmakefile that will later be moved into the target directory
win/cmakefiles/client:
  cmakefile that will later be moved into the target directory
win/cmakefiles/dbug:
  cmakefile that will later be moved into the target directory
win/cmakefiles/deploy.bat:
  cmakefile that will later be moved into the target directory
win/cmakefiles/extra:
  cmakefile that will later be moved into the target directory
win/cmakefiles/heap:
  cmakefile that will later be moved into the target directory
win/cmakefiles/innobase:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisam:
  cmakefile that will later be moved into the target directory
win/cmakefiles/myisammrg:
  cmakefile that will later be moved into the target directory
win/cmakefiles/mysys:
  cmakefile that will later be moved into the target directory
win/cmakefiles/regex:
  cmakefile that will later be moved into the target directory
win/cmakefiles/sql:
  cmakefile that will later be moved into the target directory
win/cmakefiles/strings:
  cmakefile that will later be moved into the target directory
win/cmakefiles/taocrypt:
  cmakefile that will later be moved into the target directory
win/cmakefiles/vio:
  cmakefile that will later be moved into the target directory
win/cmakefiles/yassl:
  cmakefile that will later be moved into the target directory
win/cmakefiles/zlib:
  cmakefile that will later be moved into the target directory
win/config-handlerton.js:
  javascript file for updating handlerton.cc based on configure options
win/config-version.js:
  javascript file for updating mysql_version.h based on configure.in data
win/configure.js:
  basic configure javascript

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new

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

  last bug fix revealed another bug.
  fix buffer management when parsing table descriptor


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  remove pages on backup record, use buffer in file record instead
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  remove useless pages on backup record
    file buffer is good enough
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove useless pages on backup record
    file buffer is good enough

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

into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new


BitKeeper/etc/ignore:
  Added BitKeeper/etc/RESYNC_TREE to the ignore list
client/mysqltest.c:
  merged
mysql-test/r/mysqltest.result:
  merged
mysql-test/t/mysqltest.test:
  merged

+ fix crashing bug when discovering ndb tables outside select context

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


scripts/make_win_src_distribution.sh:
  Auto merged

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

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

  Allow GET_TABINFO during BACKUP
  (otherwise LCP gets corrupt)


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  All GET_TABINFO during BACKUP

into  linux.site:/home/reggie/work/mysql-5.1

into  mysql.com:/home/jimw/my/mysql-5.1-clean

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


VC++Files/sql/mysqld.vcproj:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
VC++Files/client/mysqldump.vcproj:
  Manual merge.

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

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

WL#1034 (Internal CRON)


mysql-test/r/events.result:
  fix result of t/events (post-merge fix of bug #16642)
mysql-test/r/system_mysql_db.result:
  fix result(post-merge fix of bug #16642)
mysql-test/t/events.test:
  fix test, use --echo instead of select, fix failing create event statement
sql/event_timed.cc:
  add a bit more debug information

This bug was fixed through other patches.  This test case just shows 
that it is fixed.


mysql-test/r/partition_hash.result:
  result block for bug #14524
mysql-test/t/partition_hash.test:
  test block for bug# 14524

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql51

mysql-test/r/ndb_restore.result:
  removed test printout not used
mysql-test/t/ndb_restore.test:
  removed test printout not used

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

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

into  mysql.com:/home/bk/fix-mysql-5.1-new

when executed using the Perl version of mysql-test-run.


mysql-test/t/rpl_row_basic_11bugs-master.opt:
  Removing extreneous semicolon

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


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/innobase/include/os0file.h:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
VC++Files/sql/mysqld.vcproj:
  SCCS merged

mysql-test/lib/init_db.sql:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/event.cc:
  Auto merged
sql/event.h:
  Auto merged
sql/event_executor.cc:
  Auto merged
sql/event_priv.h:
  Auto merged
sql/event_timed.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/events.result:
  manual merge
mysql-test/r/system_mysql_db.result:
  manual merge
mysql-test/t/events.test:
  manual merge

VC++Files/client/mysqlslap.vcproj:
  Fix dependencies also for Release and classic configuration.

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1

into  april.(none):/home/svoj/devel/mysql/BUG16722/mysql-5.1-new


storage/myisam/ft_boolean_search.c:
  Auto merged

post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
 This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
  EVENT_CATALOG  - MYSQL_TYPE_STRING  (Always NULL)
  EVENT_SCHEMA   - MYSQL_TYPE_STRING  (the database)
  EVENT_NAME     - MYSQL_TYPE_STRING  (the name)
  DEFINER        - MYSQL_TYPE_STRING  (user@host)
  EVENT_BODY     - MYSQL_TYPE_STRING  (the body from mysql.event)
  EVENT_TYPE     - MYSQL_TYPE_STRING  ("ONE TIME" | "RECURRING")
  EXECUTE_AT     - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
  INTERVAL_VALUE - MYSQL_TYPE_LONG    (set for RECURRING otherwise NULL)
  INTERVAL_FIELD - MYSQL_TYPE_STRING  (set for RECURRING otherwise NULL)
  SQL_MODE       - MYSQL_TYPE_STRING  (for now NULL)
  STARTS         - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
  ENDS           - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
  STATUS         - MYSQL_TYPE_STRING  (ENABLED | DISABLED)
  ON_COMPLETION  - MYSQL_TYPE_STRING  (NOT PRESERVE | PRESERVE)
  CREATED        - MYSQL_TYPE_TIMESTAMP
  LAST_ALTERED   - MYSQL_TYPE_TIMESTAMP
  LAST_EXECUTED  - MYSQL_TYPE_TIMESTAMP
  EVENT_COMMENT  - MYSQL_TYPE_STRING

  SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.

 This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
   because the PK of mysql.event is (definer, db, name) several 
   users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
   of all users. The user has to have PROCESS privilege, if not then
   SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
  SHOW EVENTS returns table with the following columns, which are subset of
  the data which is returned by SELECT * FROM I_S.EVENTS
   Db
   Name
   Definer 
   Type
   Execute at
   Interval value
   Interval field 
   Starts 
   Ends
   Status


mysql-test/lib/init_db.sql:
  change the PK - (definer, db, name)
  quicker searches when SHOW EVENTS;
  allow also different users to have events with the same name -> 
  no information disclosure
mysql-test/r/events.result:
  result of new tests
mysql-test/r/information_schema.result:
  result of new tests
mysql-test/r/information_schema_db.result:
  result of new tests
mysql-test/r/system_mysql_db.result:
  result of new tests
mysql-test/t/events.test:
  new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
  change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
  change the PK of mysql.event to (definer, db, name)
sql/event.cc:
  pass around the definer of the event because of the new PK
  which is (definer, db, name). It's needed for index searching.
sql/event.h:
  - make enum evex_table_field again public so it can be used
  in sql_show.cc
  - make created and modified ulonglong, because they should be such
  - make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
  - cosmetics
sql/event_priv.h:
  - moved enum evex_table_field and evex_open_event_table()
    to event.h (made them therefore public)
sql/event_timed.cc:
  - in event_timed::init_definer() always fill this.definer with
    the concatenated value of definer_user@definer_host. Makes
    later the work easier.
  - pass around the definer wherever is needed for searching 
    (new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
  - add counter for SHOW EVENTS
sql/sql_lex.h:
  - register SHOW EVENTS as command
sql/sql_parse.cc:
  - handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
  - make additional check in case of SHOW EVENTS (check for EVENT on
    the current database. if it is null check_access() gives appropriate
    message back.
sql/sql_show.cc:
  - add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
  - I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
    asked to be added so bug #16642 can be completely closed. There
    is another bug report which will fix the lack of storage of
    SQL_MODE during event creation.
sql/sql_yacc.yy:
  - always call event_timed::init_definer() when CREATE/ALTER/DROP
    EVENT but not when just compiling the body of the event because
    in this case this operation is not needed, it takes memory and
    CPU time and at the end the result is not used. event_timed::definer
    is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
    statement compilation.
  - add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
    in case of FULL and the user has PROCESS privilege then he will see
    also others' events in the current database, otherwise the output
    is the same as of SHOW EVENTS. Because the events are per DB only
    the events from the current database are shown. pattern is applied
    against event name. FROM db is self explanatory.
sql/table.h:
  add SCH_EVENTS as part of INFORMATION_SCHEMA