diff options
| author | monty@hundin.mysql.fi <> | 2001-12-13 15:53:18 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-12-13 15:53:18 +0200 |
| commit | 1d3e058c4bd555a830d492c138bdca6521834253 (patch) | |
| tree | dc20d248b63f5dc477b5701978425924a376f6ff /sql/mysql_priv.h | |
| parent | f66a9d87028f9fc6da564cbc43b2596cc21f438b (diff) | |
| download | mariadb-git-1d3e058c4bd555a830d492c138bdca6521834253.tar.gz | |
Added FLUSH DES_KEY_FILE.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index a6859e31bde..fece60dd49c 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -263,7 +263,7 @@ bool mysql_rename_tables(THD *thd, TABLE_LIST *table_list); bool mysql_change_db(THD *thd,const char *name); void mysql_parse(THD *thd,char *inBuf,uint length); void mysql_init_select(LEX *lex); -void mysql_new_select(LEX *lex); +bool mysql_new_select(LEX *lex); void init_max_user_conn(void); void free_max_user_conn(void); pthread_handler_decl(handle_one_connection,arg); @@ -405,9 +405,11 @@ struct st_des_keyschedule { des_key_schedule ks1, ks2, ks3; }; +extern char *des_key_file; extern struct st_des_keyschedule des_keyschedule[10]; extern uint des_default_key; -void load_des_key_file(const char *file_name); +extern pthread_mutex_t LOCK_des_key_file; +bool load_des_key_file(const char *file_name); #endif /* HAVE_OPENSSL */ /* sql_list.c */ |