summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-22 09:52:56 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-22 09:52:56 +0100
commit139450341f3e41135e8fa92a6464ae0ec62341f8 (patch)
tree599defc3f6b900bd92fc65400c698454c95cf037 /scripts
parent456959cfef32ca90d5fffc2924350ed3360d91d4 (diff)
parentca401ce10068abe7fc252ef7030f72582e146225 (diff)
downloadmariadb-git-139450341f3e41135e8fa92a6464ae0ec62341f8.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug20589/my41-bug20589
into neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589 scripts/mysql_fix_privilege_tables.sql: Auto merged
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_fix_privilege_tables.sql4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 28c9aced618..287d51379e2 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -1,5 +1,5 @@
-- This script converts any old privilege tables to privilege tables suitable
--- for MySQL 4.0.
+-- for MySQL 4.1
-- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
-- because these just mean that your tables are already up to date.
@@ -100,7 +100,7 @@ ALTER TABLE columns_priv change Type Column_priv set('Select','Insert','Update',
ALTER TABLE func add type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL;
--
--- Change the user,db and host tables to MySQL 4.0 format
+-- Change the user,db and host tables to current format
--
# Detect whether we had Show_db_priv