summaryrefslogtreecommitdiff
path: root/scripts/mysql_create_system_tables.sh
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-05-02 10:25:47 -0700
committerunknown <jimw@mysql.com>2005-05-02 10:25:47 -0700
commitd4b39a511c92a86e2d8bb6236d62f160ca547897 (patch)
tree71803adcb670f8b34123ef8306726aae14fa834a /scripts/mysql_create_system_tables.sh
parent2d998575d3ad173a01c6eac6f9471ae770380c97 (diff)
parent1968527da980bab642ee8341c6f96a8bf4a57c7a (diff)
downloadmariadb-git-d4b39a511c92a86e2d8bb6236d62f160ca547897.tar.gz
Resolve merge of fix for #8166.
mysql-test/r/system_mysql_db.result: Update results scripts/mysql_create_system_tables.sh: Resolve merge of bug fix scripts/mysql_fix_privilege_tables.sql: Resolve merge of bug fix
Diffstat (limited to 'scripts/mysql_create_system_tables.sh')
-rw-r--r--scripts/mysql_create_system_tables.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index e76fc935b03..0eb14cd5e65 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -105,6 +105,9 @@ then
c_h="$c_h Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
c_h="$c_h Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
c_h="$c_h Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
+ c_h="$c_h Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
+ c_h="$c_h Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
+ c_h="$c_h Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,"
c_h="$c_h PRIMARY KEY Host (Host,Db)"
c_h="$c_h ) engine=MyISAM"
c_h="$c_h CHARACTER SET utf8 COLLATE utf8_bin"