SCRUM

WL#1284 (warnings about --skip-name-resolve)
Messages corrected

sql/share/czech/errmsg.txt

@@ -296,4 +296,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/danish/errmsg.txt

@@ -290,4 +290,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/dutch/errmsg.txt

@@ -298,4 +298,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/english/errmsg.txt

@@ -287,4 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/estonian/errmsg.txt

@@ -292,4 +292,4 @@ character-set=latin7
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/french/errmsg.txt

@@ -287,4 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/german/errmsg.txt

@@ -299,4 +299,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/greek/errmsg.txt

@@ -287,4 +287,4 @@ character-set=greek
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/hungarian/errmsg.txt

@@ -289,4 +289,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/italian/errmsg.txt

@@ -287,4 +287,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/japanese/errmsg.txt

@@ -289,4 +289,4 @@ character-set=ujis
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/korean/errmsg.txt

@@ -287,4 +287,4 @@ character-set=euckr
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/norwegian-ny/errmsg.txt

@@ -289,4 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/norwegian/errmsg.txt

@@ -289,4 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/polish/errmsg.txt

@@ -291,4 +291,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/portuguese/errmsg.txt

@@ -288,4 +288,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/romanian/errmsg.txt

@@ -291,4 +291,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/russian/errmsg.txt

@@ -289,4 +289,4 @@ character-set=koi8r
 "      %lu,     - %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/serbian/errmsg.txt

@@ -282,4 +282,4 @@ character-set=cp1250
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/slovak/errmsg.txt

@@ -295,4 +295,4 @@ character-set=latin2
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/spanish/errmsg.txt

@@ -289,4 +289,4 @@ character-set=latin1
 "Query cache failed to set size %lu, new query cache size is %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/swedish/errmsg.txt

@@ -287,4 +287,4 @@ character-set=latin1
 "Storleken av "Query cache" kunde inte sättas till %lu, ny storlek är %lu",
 "Kolumn '%-.64s' kan inte vara del av ett FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/share/ukrainian/errmsg.txt

@@ -292,4 +292,4 @@ character-set=koi8u
 " Ԧ   ͦ %lu,  ͦ  Ԧ - %lu",
 "Column '%-.64s' cannot be part of FULLTEXT index",
 "Unknown key cache '%-.100s'",
-"Can't resolve '%s' if --skip-name-resolve active",
+"MySQL is started in --skip-name-resolve mode. You need to restart it without this switch for this grant to work",

sql/sql_acl.cc

@@ -202,8 +202,8 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
     host.sort=	 get_sort(2,host.host.hostname,host.db);
     if (check_no_resolve && hostname_requires_resolving(host.host.hostname))
     {
-      sql_print_error("Error in table 'host' entry '%s|%s'. "
-		      "Can't resolve '%s' if --skip-name-resolve active. Skipped",
+      sql_print_error("Warning: 'host' entry '%s|%s' "
+		      "ignored in --skip-name-resolve mode.",
 		      host.host.hostname, host.db, host.host.hostname);
       continue;
     }
@@ -270,8 +270,8 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
     user.user= get_field(&mem, table->field[1]);
     if (check_no_resolve && hostname_requires_resolving(user.host.hostname))
     {
-      sql_print_error("Error in table 'user' entry '%s@%s'. "
-		      "Can't resolve '%s' if --skip-name-resolve active. Skipped",
+      sql_print_error("Warning: 'user' entry '%s@%s' "
+		      "ignored in --skip-name-resolve mode.",
 		      user.user, user.host.hostname, user.host.hostname);
       continue;
     }
@@ -372,8 +372,8 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
     db.user=get_field(&mem, table->field[2]);
     if (check_no_resolve && hostname_requires_resolving(db.host.hostname))
     {
-      sql_print_error("Error in table 'db' entry '%s %s@%s'. "
-		      "Can't resolve '%s' if --skip-name-resolve active. Skipped",
+      sql_print_error("Warning: 'db' entry '%s %s@%s' "
+		      "ignored in --skip-name-resolve mode.",
 		      db.db, db.user, db.host.hostname, db.host.hostname);
       continue;
     }
@@ -2549,8 +2549,8 @@ my_bool grant_init(THD *org_thd)
       if (hostname_requires_resolving(mem_check->host))
       {
 	char buff[MAX_FIELD_WIDTH];
-	sql_print_error("Error in table 'tables_priv' entry '%s %s@%s'. "
-			"Can't resolve '%s' if --skip-name-resolve active. Skipped",
+	sql_print_error("Warning: 'tables_priv' entry '%s %s@%s' "
+			"ignored in --skip-name-resolve mode.",
 			mem_check->tname, mem_check->user, 
 			mem_check->host, mem_check->host);
 	continue;