Merge lp:~vlad-lesin/percona-server/5.5-bug-1322218 into lp:percona-server/5.5

[Vlad Lesin]

Bug #1322218 fix. See the bug description and commit comments.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1045/

[lp:~vlad-lesin/percona-server/5.5-bug-1322218]

692. By Vlad Lesin on 2014-09-11

Bug #1322218 fix.

Merged from 5.1.

The difference between this and 5.1 fix is in preventing floating point error
in the case if "users" table is not created.

[Laurynas Biveinis (laurynas-biveinis)]

    - Same comments as for the 5.1 fix, and
    - Is it feasible to create a MTR testcase? I.e. create a new temp
    instance, truncate mysql.user, start and shutdown the server,
    destroy the instance?

review: Needs Information

Unmerged revisions

692. By Vlad Lesin on 2014-09-11

Bug #1322218 fix.

Merged from 5.1.

The difference between this and 5.1 fix is in preventing floating point error
in the case if "users" table is not created.

=== modified file 'scripts/mysql_install_db.pl.in'
--- scripts/mysql_install_db.pl.in	2014-04-18 04:02:37 +0000
+++ scripts/mysql_install_db.pl.in	2014-09-11 11:26:18 +0000
@@ -466,7 +466,20 @@
 
     print PIPE $_;
   }
-  close PIPE;
+  if (!close PIPE)
+  {
+     if ($!)
+     {
+       error($opt, "Error closing mysqld pipe: $!");
+     }
+     else
+     {
+       error($opt,
+         "Installation of system tables failed!",
+         "mysqld returned $? exit status",
+         "Examine the logs in $opt->{ldata} for more information.");
+     }
+  };
   close SQL;
   close SQL2;
 
@@ -487,7 +500,20 @@
     {
       print PIPE $_;
     }
-    close PIPE;
+    if (!close PIPE)
+    {
+      if ($!)
+      {
+        error($opt, "Error closing mysqld pipe: $!");
+      }
+      else
+      {
+        error($opt,
+          "Installation of system tables failed!",
+          "mysqld returned $? exit status",
+          "Examine the logs in $opt->{ldata} for more information.");
+      }
+    };
     close SQL;
 
     report_verbose($opt,"OK");

=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2014-08-22 09:58:37 +0000
+++ sql/sql_acl.cc	2014-09-11 11:26:18 +0000
@@ -8688,10 +8688,34 @@
       Pretend the user exists; let the plugin decide how to handle
       bad credentials.
     */
+<<<<<<< TREE
     LEX_STRING usr= { mpvio->auth_info.user_name,
                       mpvio->auth_info.user_name_length };
     mpvio->acl_user= decoy_user(usr, mpvio->mem_root);
     mpvio->acl_user_plugin= mpvio->acl_user->plugin;
+=======
+    ulong nr1=1, nr2=4;
+    CHARSET_INFO *cs= &my_charset_latin1;
+    cs->coll->hash_sort(cs, (uchar*) mpvio->auth_info.user_name,
+                        mpvio->auth_info.user_name_length, &nr1, &nr2);
+
+    mysql_mutex_lock(&acl_cache->lock);
+    if (!acl_users.elements)
+    {
+      mysql_mutex_unlock(&acl_cache->lock);
+      DBUG_RETURN(1);
+    }
+    uint i= nr1 % acl_users.elements;
+    ACL_USER *acl_user_tmp= dynamic_element(&acl_users, i, ACL_USER*);
+    mpvio->acl_user= acl_user_tmp->copy(mpvio->mem_root);
+    make_lex_string_root(mpvio->mem_root, 
+                         &mpvio->acl_user_plugin, 
+                         acl_user_tmp->plugin.str, 
+                         acl_user_tmp->plugin.length, 0);
+    mysql_mutex_unlock(&acl_cache->lock);
+
+    mpvio->make_it_fail= true;
+>>>>>>> MERGE-SOURCE
   }
 
   /* user account requires non-default plugin and the client is too old */