Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_crypt.h b/sql/sql_crypt.h
index 8d5a761cbdf..dd1cba9ee0c 100644
--- a/sql/sql_crypt.h
+++ b/sql/sql_crypt.h
@@ -26,15 +26,15 @@ class SQL_CRYPT :public Sql_alloc
   struct rand_struct rand,org_rand;
   char decode_buff[256],encode_buff[256];
   uint shift;
-  void crypt_init(ulong *seed);
  public:
-  SQL_CRYPT(const char *seed, uint length);
+  SQL_CRYPT() {}
   SQL_CRYPT(ulong *seed)
   {
-    crypt_init(seed);
+    init(seed);
   }
   ~SQL_CRYPT() {}
-  void init() { shift=0; rand=org_rand; }
+  void init(ulong *seed);
+  void reinit() { shift=0; rand=org_rand; }
   void encode(char *str, uint length);
   void decode(char *str, uint length);
 };