Bug#17196, --default-storage-engine option broken
configure.in:
  This is an alpha


configure.in:
  This is an alpha
sql/sql_plugin.cc:
  Bug#17196, --default-storage-engine option broken

scripts/make_binary_distribution.sh:
  As of 5.1, any package will contain both an optimized and a debugging server,
  built with identical configuration (features / table handlers).
  This "mysqld-debug" must be contained in the package.
  Also, the server will not be stripped any more.
  Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.

into mysql.com:/M51/clone-5.1

Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.


scripts/make_binary_distribution.sh:
  Adaption of the 5.1.6 build clone to the new "storage" directory layer,
  already done in the general tree by Jani:
      2006/02/02 16:22:22+02:00 jani@ua141d10.elisa.omakaista.fi +2 -2
      Fix to reflect change in directory structure.

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

sql/sql_show.cc:
  Add cast for Windows.

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

sql/mysql_priv.h:
  remove reference to variable removed in the previous patch

for the log tables.


sql/mysqld.cc:
  post-review fixes

sql/field.cc:
  Use memmove() instead of memcpy() -- after implementation of WL#2984
  (Make stored routine variables work according to the standard) it is
  possible to store in the field the value from this field. For instance,
  this can happen for the following statement:
    SET sp_var = SUBSTR(sp_var, 1, 3);
sql/sp_head.cc:
  Work correctly with String:
  - String length has to be be reset before use;
  - qs_append() does not allocate memory, so the memory should
    be reserved beforehand.

    Copied from the general tree, to solve a build problem:
    ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
      build fix when building with example storage engine.


storage/example/ha_example.cc:
  Copied from the general tree, to solve a build problem:
  ChangeSet 1.2121.1.5 2006/02/02 11:02:09 stewart@mysql.com
    build fix when building with example storage engine.

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

privilege".

Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.


mysql-test/r/system_mysql_db.result:
  Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
  Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
  Corrected addition of TRIGGER privilege.

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

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:/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  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:/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