Merge branch 'mysql-5.6' into mysql-5.7

harinvadodaria · Hery Ramilison · commit d93b7b8f871c · 2017-12-08T19:27:21.000+01:00
(cherry picked from commit 0147646416c97d883ec7c22ef9173f0e166922fa)
diff --git a/include/crypt_genhash_impl.h b/include/crypt_genhash_impl.h
@@ -17,7 +17,7 @@
 #define CRYPT_HASHGEN_IMPL_H
 #define	ROUNDS_DEFAULT	5000
 #define	ROUNDS_MIN	1000
-#define	ROUNDS_MAX	999999999
+#define	ROUNDS_MAX	ROUNDS_DEFAULT
 #define	MIXCHARS	32
 #define CRYPT_SALT_LENGTH  20
 #define CRYPT_MAGIC_LENGTH  3
