diff options
| author | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-07-31 17:11:52 +0400 |
| commit | 4acc45d78427c27d78b5a297f713eeae522f8945 (patch) | |
| tree | a08ffe6a07c8efcc13a357c5478274972fd673b0 /sql/mysql_priv.h | |
| parent | 79fea68bd7da9735fdbb9d6e4c40879d0e72ff70 (diff) | |
| parent | 2c3cba310aa401842996a52abdbde95bb950fcc5 (diff) | |
| download | mariadb-git-4acc45d78427c27d78b5a297f713eeae522f8945.tar.gz | |
manual merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_parse.cc:
merge commit
convert of database to utf8 in case of cahnge_user added
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 2c41d973f2e..8a5bf991c49 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -74,9 +74,6 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset; ****************************************************************************/ #define ACL_CACHE_SIZE 256 -/* Password lengh for 4.1 version previous versions had 16 bytes password hash */ -#define HASH_PASSWORD_LENGTH 45 -#define HASH_OLD_PASSWORD_LENGTH 16 #define HOST_CACHE_SIZE 128 #define MAX_ACCEPT_RETRY 10 // Test accept this many times #define MAX_FIELDS_BEFORE_HASH 32 @@ -757,7 +754,7 @@ extern my_bool opt_safe_show_db, opt_local_infile, lower_case_table_names; extern my_bool opt_slave_compressed_protocol, use_temp_pool; extern my_bool opt_readonly; extern my_bool opt_enable_named_pipe; -extern my_bool opt_old_passwords, use_old_passwords; +extern my_bool opt_secure_auth; extern char *shared_memory_base_name, *mysqld_unix_port; extern bool opt_enable_shared_memory; |