diff options
| author | unknown <kent@mysql.com> | 2005-05-15 07:38:42 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-05-15 07:38:42 +0200 |
| commit | 3f53fa149a4499cc72aa2aec3f576274e1c624d6 (patch) | |
| tree | dbeeef8d0b1a701737f06c04547adcc87312ef0d /mysql-test/lib/init_db.sql | |
| parent | aa778612f7dadb1a55b8a2c7ed5ec1e15cca640c (diff) | |
| parent | 657469bab80c56d97e375903c61c755103b36058 (diff) | |
| download | mariadb-git-3f53fa149a4499cc72aa2aec3f576274e1c624d6.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/lib/init_db.sql:
Auto merged
Diffstat (limited to 'mysql-test/lib/init_db.sql')
| -rw-r--r-- | mysql-test/lib/init_db.sql | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/lib/init_db.sql b/mysql-test/lib/init_db.sql index 97fa6fb955c..18699497b64 100644 --- a/mysql-test/lib/init_db.sql +++ b/mysql-test/lib/init_db.sql @@ -1,4 +1,5 @@ -USE mysql; +use mysql; +set table_type=myisam; CREATE TABLE db ( Host char(60) binary DEFAULT '' NOT NULL, @@ -206,7 +207,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES CREATE TABLE time_zone ( Time_zone_id int unsigned NOT NULL auto_increment, - Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL, + Use_leap_seconds enum('Y','N') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, PRIMARY KEY TzId (Time_zone_id) ) engine=MyISAM CHARACTER SET utf8 |