diff options
| author | unknown <serg@serg.mylan> | 2004-03-19 18:09:32 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-03-19 18:09:32 +0100 |
| commit | fd15d5ae1f6f103c90594b5ee0c320aaada3c1cb (patch) | |
| tree | 8e4c536fee9dad37cf83eb36af735ec899257c6c /scripts | |
| parent | c56697f0953f8e7a47d123f019ee78aa21928d80 (diff) | |
| parent | 86ae07cd2477506513a47a8c0d7600f59422c7e1 (diff) | |
| download | mariadb-git-fd15d5ae1f6f103c90594b5ee0c320aaada3c1cb.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 2 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 1dac3ebc725..f5f641525cc 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -116,7 +116,7 @@ $cmd <<END_OF_DATA alter table user change password password char(16) NOT NULL; alter table user add File_priv enum('N','Y') NOT NULL; CREATE TABLE if not exists func ( - name char(64) DEFAULT '' NOT NULL, + name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') NOT NULL, diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 6d76a7b0f46..bfff05151e5 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -7,7 +7,7 @@ -- On unix, you should use the mysql_fix_privilege_tables script to execute -- this sql script. --- On windows you should do 'mysql --force < mysql_fix_privilege_tables.sql' +-- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql' USE mysql; ALTER TABLE user type=MyISAM; @@ -19,7 +19,7 @@ ALTER TABLE tables_priv type=MyISAM; ALTER TABLE user change Password Password char(41) not null; ALTER TABLE user add File_priv enum('N','Y') NOT NULL; CREATE TABLE IF NOT EXISTS func ( - name char(64) DEFAULT '' NOT NULL, + name char(64) binary DEFAULT '' NOT NULL, ret tinyint(1) DEFAULT '0' NOT NULL, dl char(128) DEFAULT '' NOT NULL, type enum ('function','aggregate') NOT NULL, @@ -56,10 +56,10 @@ ALTER TABLE user MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL; -- CREATE TABLE IF NOT EXISTS tables_priv ( - Host char(60) DEFAULT '' NOT NULL, - Db char(60) DEFAULT '' NOT NULL, - User char(16) DEFAULT '' NOT NULL, - Table_name char(60) DEFAULT '' NOT NULL, + Host char(60) binary DEFAULT '' NOT NULL, + Db char(64) binary DEFAULT '' NOT NULL, + User char(16) binary DEFAULT '' NOT NULL, + Table_name char(64) binary DEFAULT '' NOT NULL, Grantor char(77) DEFAULT '' NOT NULL, Timestamp timestamp(14), Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL, |