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 | 7561bc9212a22e3d591033103b7b404503fe721b (patch) | |
tree | 56315491cf4cef28a3140a8445cc412749dac6d6 /sql/mysql_priv.h | |
parent | 405bd2af117384e009c3feffe1fd7d9019bf9d2b (diff) | |
parent | 1b8322c3c6f406bd119145c6f38ddeb802e1b9fc (diff) | |
download | mariadb-git-7561bc9212a22e3d591033103b7b404503fe721b.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 */ |