Commit 4252b11a authored by unknown's avatar unknown
Browse files

mysql.user.password doesn't need utf8

parent 526a1a92

scripts/mysql_create_system_tables.sh

+1 −1
Original line number Diff line number Diff line
@@ -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,"

scripts/mysql_fix_privilege_tables.sql

+1 −1
Original line number Diff line number Diff line
@@ -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,