diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-02 14:10:04 +0300 |
| commit | a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0 (patch) | |
| tree | 52d813ba1e4f0b538b1f175a1d157d865cce8a22 /scripts | |
| parent | 487bfd56d4386fe9abbd4beb80d759b0c5c95909 (diff) | |
| parent | 46aa4c2672e2d0b1727dde5b80bd5039adbf96f6 (diff) | |
| download | mariadb-git-a708ba6524f27d0f0bc3bc4b4b9952f372d38bd0.tar.gz | |
Manual merge from mysql-next-mr.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables.sql | 2 | ||||
| -rw-r--r-- | scripts/mysql_system_tables_fix.sql | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables.sql b/scripts/mysql_system_tables.sql index c07686b793b..39c895cc6e6 100644 --- a/scripts/mysql_system_tables.sql +++ b/scripts/mysql_system_tables.sql @@ -22,7 +22,7 @@ set @had_user_table= @@warning_count != 0; CREATE TABLE IF NOT EXISTS func ( name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') COLLATE utf8_general_ci NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='User defined functions'; -CREATE TABLE IF NOT EXISTS plugin ( name char(64) binary DEFAULT '' NOT NULL, dl char(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_bin comment='MySQL plugins'; +CREATE TABLE IF NOT EXISTS plugin ( name varchar(64) DEFAULT '' NOT NULL, dl varchar(128) DEFAULT '' NOT NULL, PRIMARY KEY (name) ) engine=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci comment='MySQL plugins'; CREATE TABLE IF NOT EXISTS 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'; diff --git a/scripts/mysql_system_tables_fix.sql b/scripts/mysql_system_tables_fix.sql index a5a9d4e0a84..0343ffd348e 100644 --- a/scripts/mysql_system_tables_fix.sql +++ b/scripts/mysql_system_tables_fix.sql @@ -229,6 +229,11 @@ SET GLOBAL slow_query_log = 'OFF'; ALTER TABLE slow_log MODIFY COLUMN server_id INTEGER UNSIGNED NOT NULL; SET GLOBAL slow_query_log = @old_log_state; +ALTER TABLE plugin + MODIFY name varchar(64) COLLATE utf8_general_ci NOT NULL DEFAULT '', + MODIFY dl varchar(128) COLLATE utf8_general_ci NOT NULL DEFAULT '', + CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_ci; + # # Detect whether we had Create_view_priv # |