Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1

into zim.(none):/home/brian/mysql/mysql-5.1

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/mysql-5.1
499f12fa · brian@zim.(none) · 39eceb9a · 5c248d51 · 499f12fa
Commit 499f12fa authored Mar 17, 2005 by brian@zim.(none)
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

scripts/mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sql +6 -2

No files found.
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -131,8 +131,12 @@ ALTER TABLE db
 ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
 ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
 ALTER TABLE host
-ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
-ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+<<<<<<< gca scripts/mysql_fix_privilege_tables.sql 1.9.1.14
+ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
+ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
+<<<<<<< local scripts/mysql_fix_privilege_tables.sql 1.12
+ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
+ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;

 #
 # Create VIEWs privrlages (v5.1)