summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-02-25 21:54:34 +0200
committermonty@mysql.com <>2006-02-25 21:54:34 +0200
commit1e2e9e28565d97f140f230824a1adfcea475ee34 (patch)
tree69f6c8a1a1bef870aa8b2cbe729b0fd87fcf1c31 /scripts
parent066c7148fb5243a0533fd7b6edfe948cb1722548 (diff)
parent54274976e7b4a9a28e94a6f0b4f8d064140248db (diff)
downloadmariadb-git-1e2e9e28565d97f140f230824a1adfcea475ee34.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_fix_privilege_tables.sql6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 0fbaf7bec8a..169c606280a 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -680,3 +680,9 @@ ALTER TABLE db ADD Trigger_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT
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;
+
+# Activate the new, possible modified privilege tables
+# This should not be needed, but gives us some extra testing that the above
+# changes was correct
+
+flush privileges;