diff options
| author | unknown <serg@serg.mylan> | 2005-09-30 09:40:49 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-09-30 09:40:49 +0200 |
| commit | 203bb8bc914afa24d0c0c1ead89b89316df6e3a5 (patch) | |
| tree | e0ca4a5e8d1433f06675703a38970e9313c6cfa0 /scripts | |
| parent | 3a806cd674deca9288f7555c03172afa4ada01ac (diff) | |
| parent | f4ec1ed519bbfdab91866e7d7779fbf91fcf5ade (diff) | |
| download | mariadb-git-203bb8bc914afa24d0c0c1ead89b89316df6e3a5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
mysql-test/r/mysqldump.result:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index 383f8b80dc8..babf3a1c83f 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -123,7 +123,7 @@ then c_u="$c_u CREATE TABLE user (" c_u="$c_u Host char(60) binary DEFAULT '' NOT NULL," c_u="$c_u User char(16) binary DEFAULT '' NOT NULL," - c_u="$c_u Password char(41) binary DEFAULT '' NOT NULL," + c_u="$c_u Password binary(41) DEFAULT '' NOT NULL," c_u="$c_u Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL," c_u="$c_u Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL," c_u="$c_u Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL," diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 45f3b8533b5..7dba854e313 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -156,9 +156,9 @@ alter table columns_priv comment='Column privileges'; ALTER TABLE user MODIFY Host char(60) NOT NULL default '', MODIFY User char(16) NOT NULL default '', - MODIFY Password char(41) NOT NULL default '', ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin; ALTER TABLE user + MODIFY Password binary(41) NOT NULL default '', MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Insert_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, MODIFY Update_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL, |