summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_create_system_tables.sh2
-rw-r--r--scripts/mysql_fix_privilege_tables.sql16
2 files changed, 17 insertions, 1 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index 1b4472f5baa..44fbb7183b9 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -212,7 +212,7 @@ CREATE TABLE servers ("
c_s="$c_s Wrapper char(64) NOT NULL,"
c_s="$c_s Owner char(64) NOT NULL,"
c_s="$c_s PRIMARY KEY (Server_name))"
- c_s="$c_s comment='MySQL Foreign Servers table';"
+ c_s="$c_s CHARACTER SET utf8 comment='MySQL Foreign Servers table';"
i_s="INSERT INTO servers VALUES
('test','localhost','test','root','', 0,
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 37bd17c03d6..056761f3ad0 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -380,6 +380,22 @@ ALTER TABLE procs_priv
MODIFY Timestamp timestamp(14) AFTER Proc_priv;
--
+-- servers
+--
+CREATE TABLE servers (
+ Server_name char(64) NOT NULL DEFAULT '',
+ Host char(64) NOT NULL DEFAULT '',
+ Db char(64) NOT NULL DEFAULT '',
+ Username char(64) NOT NULL DEFAULT '',
+ Password char(64) NOT NULL DEFAULT '',
+ Port INT(4) NOT NULL DEFAULT '0',
+ Socket char(64) NOT NULL DEFAULT '',
+ Wrapper char(64) NOT NULL DEFAULT '',
+ Owner char(64) NOT NULL DEFAULT '',
+ PRIMARY KEY (Server_name))
+ CHARACTER SET utf8 comment='MySQL Foreign Servers table';
+
+--
-- help_topic
--
CREATE TABLE IF NOT EXISTS help_topic (