=== modified file 'sql/sql_acl.cc'
--- sql/sql_acl.cc	2013-08-28 05:49:53 +0000
+++ sql/sql_acl.cc	2013-10-26 17:24:02 +0000
@@ -9358,10 +9358,11 @@
   if (thd->scramble[SCRAMBLE_LENGTH])
   {
     create_random_string(thd->scramble, SCRAMBLE_LENGTH, &thd->rand);
-    /* and send it to the client */
-    if (mpvio->write_packet(mpvio, (uchar*)thd->scramble, SCRAMBLE_LENGTH + 1))
-      DBUG_RETURN(CR_ERROR);
   }
+  /* and send it to the client */
+  if (mpvio->write_packet(mpvio, (uchar*)thd->scramble, SCRAMBLE_LENGTH + 1))
+    DBUG_RETURN(CR_ERROR);
+
 
   /* reply and authenticate */