diff options
| author | unknown <dlenev@mysql.com> | 2006-02-02 13:36:07 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2006-02-02 13:36:07 +0300 |
| commit | c20d947470b08491e5a7f9bb85d187cb6e7bd669 (patch) | |
| tree | 04a44aa82825196b76d7a69e72f54bb979ef3bd6 /scripts | |
| parent | 02296b58ca0f85dd9b59c69de64dfd15532e60a6 (diff) | |
| download | mariadb-git-c20d947470b08491e5a7f9bb85d187cb6e7bd669.tar.gz | |
Yet another addition to the fix for BUG#9412 "Triggers: should have trigger
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 73b4ce32640..0fbaf7bec8a 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -674,5 +674,9 @@ ALTER TABLE event ADD sql_mode SET @hadTriggerPriv := 0; SELECT @hadTriggerPriv :=1 FROM user WHERE Trigger_priv LIKE '%'; -ALTER TABLE user add Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; +ALTER TABLE user ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL AFTER Event_priv; +ALTER TABLE host ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; +ALTER TABLE db ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; +ALTER TABLE tables_priv MODIFY Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter','Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL; + UPDATE user SET Trigger_priv=Super_priv WHERE @hadTriggerPriv = 0; |