diff options
| author | unknown <patg@radha.myhome.westell.com> | 2006-12-11 11:44:03 -0500 |
|---|---|---|
| committer | unknown <patg@radha.myhome.westell.com> | 2006-12-11 11:44:03 -0500 |
| commit | 6206af42fd544b39d26d78d3f00258dee3516370 (patch) | |
| tree | 3fbd268e39ebc373a8c49453e9ed3009572c2286 /scripts | |
| parent | c60024b04d0381fbff2fcd510c605faac3103244 (diff) | |
| download | mariadb-git-6206af42fd544b39d26d78d3f00258dee3516370.tar.gz | |
WL #3031
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
mysql-test/include/system_db_struct.inc:
WL# 3031
Added servers table to inc file used in system_mysql_db* tests
mysql-test/lib/init_db.sql:
WL# 3031
Added UTF charset to table def
mysql-test/r/mysql.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/rpl_sp.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/sp.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/sp_gis.result:
WL# 3031
New result files, new error messages shifted error #s up by two
mysql-test/r/system_mysql_db.result:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix30020.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix40123.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
mysql-test/t/system_mysql_db_fix50030.test:
WL #3031
New system_mysql_db tests required adding servers table creation. Some more
comments in these tests would have been nice to explain what they do ;)
scripts/mysql_create_system_tables.sh:
WL# 3031
Added utf8 charset to table def
scripts/mysql_fix_privilege_tables.sql:
WL# 3031
Added servers table to mysql_fix_privilege_tables
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 16 |
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 ( |