diff options
author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
commit | bdcce95f1347c9e24257a21096cc6f4e6c085c9e (patch) | |
tree | 56315491cf4cef28a3140a8445cc412749dac6d6 /sql/mysql_priv.h | |
parent | 9cc4cb0ea1f429983ce7ee8783504fa7fb5c2d7f (diff) | |
parent | 2df531fdc44a1bf410a79624932533ecb44f84ce (diff) | |
download | mariadb-git-bdcce95f1347c9e24257a21096cc6f4e6c085c9e.tar.gz |
Manual merge.
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 69a789284b0..036dde18ea8 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2311,6 +2311,12 @@ extern void turn_parser_debug_on(); SQL_CRYPT *get_crypt_for_frm(void); #endif +/* password.c */ +extern "C" void my_make_scrambled_password_323(char *to, const char *password, + size_t pass_len); +extern "C" void my_make_scrambled_password(char *to, const char *password, + size_t pass_len); + #include "sql_view.h" /* Some inline functions for more speed */ |