into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge


sql/ha_innodb.cc:
  Auto merged

storage/example/ha_example.cc:
  add handlerton call for fill files table

into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-new-merge
Null-merge InnoDB snapshots from 5.0 to 5.1


storage/innobase/include/lock0lock.h:
  Auto merged
mysql-test/r/innodb.result:
  null-merge from 5.0
mysql-test/t/innodb.test:
  null-merge from 5.0
sql/ha_innodb.cc:
  null-merge from 5.0
storage/innobase/include/data0type.h:
  null-merge from 5.0
storage/innobase/include/data0type.ic:
  null-merge from 5.0
storage/innobase/include/os0file.h:
  null-merge from 5.0
storage/innobase/include/row0mysql.h:
  null-merge from 5.0
storage/innobase/lock/lock0lock.c:
  null-merge from 5.0
storage/innobase/os/os0file.c:
  null-merge from 5.0
storage/innobase/row/row0ins.c:
  null-merge from 5.0
storage/innobase/row/row0mysql.c:
  null-merge from 5.0
storage/innobase/row/row0sel.c:
  null-merge from 5.0
storage/innobase/trx/trx0trx.c:
  null-merge from 5.0

into  mysql.com:/home/dlenev/src/mysql-5.1-merges

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/dlenev/src/mysql-5.1-merges

into  mysql.com:/home/dlenev/src/mysql-5.1-merges


sql/ha_berkeley.cc:
  Auto merged

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

When we add new privilege we should update mysql-test/lib/init_db.sql
accordingly.


mysql-test/lib/init_db.sql:
  Added TRIGGER privilege.
sql/sql_acl.h:
  Updated comment describing process of addition of new privileges - added yet
  another script place which should be modified when new privilege is added.

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:/home/stewart/Documents/MySQL/5.1/tmp_merge

into  mysql.com:/home/stewart/Documents/MySQL/5.1/tmp_merge


mysql-test/r/information_schema.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_show.cc:
  Auto merged

fix up test cases.


mysql-test/r/information_schema.result:
  update result for INFORMATION_SCHEMA.FILES
mysql-test/r/information_schema_db.result:
  update result for INFORMATION_SCHEMA.FILES
sql/ha_ndbcluster.cc:
  in fill_files_table, use my_snprintf instead of snprintf
sql/sql_show.cc:
  correct DBUG_ENTER for fill_schema_files
sql/table.h:
  add SCH_FILES to information schema enum

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  mysql.com:/home/stewart/Documents/MySQL/5.1/wl1359


sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged

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