- renamed "rnd" to "my_rnd" as the name was too generic (and is an exported

   symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)

1 files changed, 3 insertions, 3 deletions

diff --git a/sql/sql_crypt.cc b/sql/sql_crypt.cc
index f2e4a8934be..930ecfffef7 100644
--- a/sql/sql_crypt.cc
+++ b/sql/sql_crypt.cc
@@ -46,7 +46,7 @@ void SQL_CRYPT::crypt_init(ulong *rand_nr)
 
   for (i=0 ; i<= 255 ; i++)
   {
-    int idx= (uint) (rnd(&rand)*255.0);
+    int idx= (uint) (my_rnd(&rand)*255.0);
     char a= decode_buff[idx];
     decode_buff[idx]= decode_buff[i];
     decode_buff[+i]=a;
@@ -62,7 +62,7 @@ void SQL_CRYPT::encode(char *str,uint length)
 {
   for (uint i=0; i < length; i++)
   {
-    shift^=(uint) (rnd(&rand)*255.0);
+    shift^=(uint) (my_rnd(&rand)*255.0);
     uint idx= (uint) (uchar) str[0];
     *str++ = (char) ((uchar) encode_buff[idx] ^ shift);
     shift^= idx;
@@ -74,7 +74,7 @@ void SQL_CRYPT::decode(char *str,uint length)
 {
   for (uint i=0; i < length; i++)
   {
-    shift^=(uint) (rnd(&rand)*255.0);
+    shift^=(uint) (my_rnd(&rand)*255.0);
     uint idx= (uint) ((unsigned char) str[0] ^ shift);
     *str = decode_buff[idx];
     shift^= (uint) (uchar) *str++;