into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/space/pekka/ndb/version/my51

storage/ndb/src/ndbapi/NdbBlob.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)
storage/ndb/test/ndbapi/test_event_merge.cpp:
  fix some mem leaks (event ops however are never dtor-ed yet)

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged

into  mysql.com:/data0/mysqldev/my/mysql-5.1-new


configure.in:
  Null merge.

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


sql/ha_berkeley.cc:
  Use local: manual merge

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

corrected test case

correction

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-bug9412-latest

Implement table-level TRIGGER privilege to control access to triggers.
Before this path global SUPER privilege was used for this purpose, that
was the big security problem.

In details, before this patch SUPER privilege was required:
  - for the user at CREATE TRIGGER time to create a new trigger;
  - for the user at DROP TRIGGER time to drop the existing trigger;
  - for the definer at trigger activation time to execute the trigger (if the
    definer loses SUPER privilege, all its triggers become unavailable);

This patch changes the behaviour in the following way:
  - TRIGGER privilege on the subject table for trigger is required:
    - for the user at CREATE TRIGGER time to create a new trigger;
    - for the user at DROP TRIGGER time to drop the existing trigger;
    - for the definer at trigger activation time to execute the trigger
      (if the definer loses TRIGGER privilege on the subject table, all its
      triggers on this table become unavailable).
  - SUPER privilege is still required:
    - for the user at CREATE TRIGGER time to explicitly set the trigger
      definer to the user other than CURRENT_USER().

When the server works with database of the previous version (w/o TRIGGER
privilege), or if the database is being upgraded from the previous versions,
TRIGGER privilege is granted to whose users, who have CREATE privilege.


mysql-test/r/grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/information_schema.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/lowercase_table_grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/ps.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/sp.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-compat.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/r/trigger-grant.result:
  Updated the result file after adding TRIGGER privilege.
mysql-test/t/trigger-compat.test:
  Grant table-level TRIGGER privilege instead of global SUPER one.
mysql-test/t/trigger-grant.test:
  1. Grant table-level TRIGGER privilege instead of global SUPER one.
  2. Updated the test case to check that SUPER is required to specify
  the user other than the current as a definer.
scripts/mysql_create_system_tables.sh:
  Added TRIGGER privilege.
scripts/mysql_fix_privilege_tables.sql:
  Added TRIGGER privilege.
sql/sql_acl.cc:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Added TRIGGER privilege.
sql/sql_show.cc:
  Added TRIGGER privilege.
sql/sql_trigger.cc:
  Check TRIGGER privilege instead of SUPER.
sql/sql_yacc.yy:
  Added TRIGGER privilege.

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

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

mysql-test/r/ndb_binlog_ddl_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_ddl_multi.result''
mysql-test/t/ndb_binlog_ddl_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_ddl_multi.test''

into mysql.com:/home/psergey/mysql-5.1-fix-assert

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Merge
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Merge

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

partial fix for bug #16407
WL#1034 (Internal CRON)


scripts/mysql_fix_privilege_tables.sql:
  sql_mode should be after on_completion and before comment

into  linux.site:/home/marty/MySQL/mysql-5.1-new

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