diff options
| author | unknown <kostja@oak.local> | 2003-08-07 13:29:25 +0400 |
|---|---|---|
| committer | unknown <kostja@oak.local> | 2003-08-07 13:29:25 +0400 |
| commit | 66ce8a88af874d033f2f489f0535de673fc69e42 (patch) | |
| tree | 954b5b9817e9a8bde65ef90eec43911130d55cbd /sql/set_var.h | |
| parent | e4477bcacf78741f5c1116cbba2174396f413b5e (diff) | |
| parent | 4acc45d78427c27d78b5a297f713eeae522f8945 (diff) | |
| download | mariadb-git-66ce8a88af874d033f2f489f0535de673fc69e42.tar.gz | |
Merge oak.local:/home/kostja/mysql/mysql-4.1-root
into oak.local:/home/kostja/mysql/mysql-4.1
BitKeeper/etc/logging_ok:
auto-union
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index 968687ad382..ee6c80bdf25 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -692,6 +692,9 @@ public: } }; +/* updated in sql_acl.cc */ + +extern sys_var_thd_bool sys_old_passwords; /* Prototypes for helper functions @@ -705,6 +708,7 @@ void fix_delay_key_write(THD *thd, enum_var_type type); ulong fix_sql_mode(ulong sql_mode); extern sys_var_str sys_charset_system; CHARSET_INFO *get_old_charset_by_name(const char *old_name); + gptr find_named(I_List<NAMED_LIST> *list, const char *name, uint length); void delete_elements(I_List<NAMED_LIST> *list, void (*free_element)(gptr)); |