Manual merge.

This commit is contained in:
Alexey Kopytov 2009-06-01 16:00:38 +04:00
commit 7561bc9212
7 changed files with 90 additions and 21 deletions

View file

@ -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 */