--- mysql_fix_privilege_tables--5051b.sql	2008-04-17 19:13:00.000000000 -0400
+++ mysql_fix_privilege_tables--trimmed.sql	2008-07-10 20:05:01.489224000 -0400
@@ -114,6 +114,12 @@
   ENGINE=MyISAM,
   CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
 
+UPDATE tables_priv SET
+  Host = REPLACE(Host, CHAR(0), ''),
+  Db = REPLACE(Db, CHAR(0), ''),
+  User = REPLACE(User, CHAR(0), ''),
+  Table_name = REPLACE(Table_name, CHAR(0), '');
+
 ALTER TABLE tables_priv
   MODIFY Column_priv set('Select','Insert','Update','References')
     COLLATE utf8_general_ci DEFAULT '' NOT NULL,
@@ -142,6 +148,13 @@
   CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin,
   COMMENT='Column privileges';
 
+UPDATE columns_priv SET
+  Host = REPLACE(Host, CHAR(0), ''),
+  Db = REPLACE(Db, CHAR(0), ''),
+  User = REPLACE(User, CHAR(0), ''),
+  Table_name = REPLACE(Table_name, CHAR(0), ''),
+  Column_name = REPLACE(Column_name, CHAR(0), '');
+
 ALTER TABLE columns_priv
   MODIFY Column_priv set('Select','Insert','Update','References')
     COLLATE utf8_general_ci DEFAULT '' NOT NULL;
@@ -208,6 +221,9 @@
   MODIFY Host char(60) NOT NULL default '',
   MODIFY User char(16) NOT NULL default '',
   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+UPDATE user SET
+  Host = REPLACE(Host, CHAR(0), ''),
+  User = REPLACE(User, CHAR(0), '');
 ALTER TABLE user
   MODIFY Password char(41) character set latin1 collate latin1_bin NOT NULL default '',
   MODIFY Select_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
@@ -238,6 +254,10 @@
   MODIFY Db char(64) NOT NULL default '',
   MODIFY User char(16) NOT NULL default '',
   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+UPDATE db SET
+  Host = REPLACE(Host, CHAR(0), ''),
+  Db = REPLACE(Db, CHAR(0), ''),
+  User = REPLACE(User, CHAR(0), '');
 ALTER TABLE db
   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,
@@ -256,6 +276,9 @@
   MODIFY Host char(60) NOT NULL default '',
   MODIFY Db char(64) NOT NULL default '',
   ENGINE=MyISAM, CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;
+UPDATE host SET
+  Host = REPLACE(Host, CHAR(0), ''),
+  Db = REPLACE(Db, CHAR(0), '');
 ALTER TABLE host
   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,