summaryrefslogtreecommitdiff
path: root/scripts/mysql_system_tables_fix.sql
diff options
context:
space:
mode:
authorSergey Glukhov <Sergey.Glukhov@sun.com>2009-10-27 14:09:36 +0400
committerSergey Glukhov <Sergey.Glukhov@sun.com>2009-10-27 14:09:36 +0400
commitf554a3c094db0fa5fa9ab66cd68081b27f5cc384 (patch)
treed3aa3e965ee6f4df4e7608cf2226e132a4c4ddf8 /scripts/mysql_system_tables_fix.sql
parentfb043f9bc2e3af91f62d4324744491965bb15f32 (diff)
parentf0a7ff84190dd161b9e5643ef4aabc9e31809046 (diff)
downloadmariadb-git-f554a3c094db0fa5fa9ab66cd68081b27f5cc384.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'scripts/mysql_system_tables_fix.sql')
-rw-r--r--scripts/mysql_system_tables_fix.sql4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql
index a6497f57f0a..1844860c84d 100644
--- a/scripts/mysql_system_tables_fix.sql
+++ b/scripts/mysql_system_tables_fix.sql
@@ -337,6 +337,10 @@ ALTER TABLE procs_priv
MODIFY Proc_priv set('Execute','Alter Routine','Grant')
COLLATE utf8_general_ci DEFAULT '' NOT NULL;
+ALTER IGNORE TABLE procs_priv
+ MODIFY Routine_name char(64)
+ COLLATE utf8_general_ci DEFAULT '' NOT NULL;
+
ALTER TABLE procs_priv
ADD Routine_type enum('FUNCTION','PROCEDURE')
COLLATE utf8_general_ci NOT NULL AFTER Routine_name;