List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:November 19 2010 2:54pm
Subject:bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3370 to 3371)
View as plain text  
 3371 Georgi Kodinov	2010-11-19 [merge]
      merge

    modified:
      sql/sql_acl.cc
 3370 Georgi Kodinov	2010-11-19 [merge]
      merge

    modified:
      sql-common/client_plugin.c
=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2010-11-19 14:36:26 +0000
+++ b/sql/sql_acl.cc	2010-11-19 14:53:42 +0000
@@ -339,7 +339,7 @@ public:
         (hostname_requires_resolving(host.hostname) ||
          hostname_requires_resolving(proxied_host.hostname)))
     {
-      sql_print_warning("'proxes_priv' entry '%s@%s %s@%s' "
+      sql_print_warning("'proxies_priv' entry '%s@%s %s@%s' "
                         "ignored in --skip-name-resolve mode.",
                         proxied_user ? proxied_user : "",
                         proxied_host.hostname ? proxied_host.hostname : "",

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3370 to 3371) Georgi Kodinov19 Nov