summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <lenz@mysql.com>2003-03-18 22:14:02 +0100
committerunknown <lenz@mysql.com>2003-03-18 22:14:02 +0100
commitf04be0b9c5621b95c6e0f4d8b113ca919201fc08 (patch)
tree92beef04c0b6256679ee496d44e0187ab6809cb8 /include
parent71aa1f6d56130ff37912d7182e9f1039133f9347 (diff)
downloadmariadb-git-f04be0b9c5621b95c6e0f4d8b113ca919201fc08.tar.gz
- 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) BitKeeper/deleted/.del-password.c~c036d4f8b3280843: Delete: client/password.c BitKeeper/deleted/.del-password.c~76f30876e68eddb4: Delete: libmysql/password.c include/mysql_com.h: - replaced "rnd" with "my_rnd" libmysql/Makefile.am: - removed dead piece of code ($qs was not defined) - symlink password.c from the sql directory libmysqld/Makefile.am: - use password.c from the sql directory instead sql/item_func.cc: - replaced "rnd" with "my_rnd" sql/mysqld.cc: - replaced "rnd" with "my_rnd" sql/password.c: - replaced "rnd" with "my_rnd" sql/sql_class.cc: - replaced "rnd" with "my_rnd" sql/sql_crypt.cc: - replaced "rnd" with "my_rnd"
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index 963c1212794..945372563b0 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -228,7 +228,7 @@ extern unsigned long net_buffer_length;
void randominit(struct rand_struct *,unsigned long seed1,
unsigned long seed2);
-double rnd(struct rand_struct *);
+double my_rnd(struct rand_struct *);
void make_scrambled_password(char *to,const char *password);
void get_salt_from_password(unsigned long *res,const char *password);
void make_password_from_salt(char *to, unsigned long *hash_res);