diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-05 13:22:13 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-07-05 13:22:13 +0300 |
| commit | db6afa75b4624360ce67c46765e1fd7b4d68fbe8 (patch) | |
| tree | c7f379ff7d95ee50552e1349c6847d4dfa34beba /scripts | |
| parent | ea140d862e01fe5d7c5cabb6367dcef21a595980 (diff) | |
| parent | 279b3adfc78ae93f976eb8797f41c64f3bc6b4bb (diff) | |
| download | mariadb-git-db6afa75b4624360ce67c46765e1fd7b4d68fbe8.tar.gz | |
merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index 3b6f0cccf20..2020971fb1a 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -69,7 +69,7 @@ ALTER TABLE tables_priv COLLATE utf8_general_ci DEFAULT '' NOT NULL, MODIFY Table_priv set('Select','Insert','Update','Delete','Create', 'Drop','Grant','References','Index','Alter', - 'Create View','Show view') + 'Create View','Show view','Trigger') COLLATE utf8_general_ci DEFAULT '' NOT NULL, COMMENT='Table privileges'; @@ -603,8 +603,6 @@ ALTER TABLE host MODIFY Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAU ALTER TABLE db ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL; ALTER TABLE db MODIFY 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; # |