diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 09:02:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 09:02:51 +0200 |
| commit | c97ddd06f4c9eceac9b698f07eb5cc168b1006b6 (patch) | |
| tree | bbd008d05f1c1111676b46f092fde8257666d9c2 /sql/mysql_priv.h | |
| parent | 3595556335b31d908555da9abaa669d3cfcce1e2 (diff) | |
| parent | 88b405c4e21162b73077e000a9b8f7ffe9d6d251 (diff) | |
| download | mariadb-git-c97ddd06f4c9eceac9b698f07eb5cc168b1006b6.tar.gz | |
merge
include/my_sys.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
innobase/btr/btr0cur.c:
Use local file
scripts/make_binary_distribution.sh:
Add mysql_waitpid
sql/mysqld.cc:
Simple cleanup
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 5a957514d28..5d8afbc6149 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -397,7 +397,7 @@ int mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &list,COND *conds, ulong select_type,select_result *result); int mysql_union(THD *thd,LEX *lex,select_result *result); Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type, - Item_result_field ***copy_func, Field **from_field, + Item ***copy_func, Field **from_field, bool group,bool modify_item); int mysql_create_table(THD *thd,const char *db, const char *table_name, HA_CREATE_INFO *create_info, @@ -474,6 +474,7 @@ extern struct st_des_keyschedule des_keyschedule[10]; extern uint des_default_key; extern pthread_mutex_t LOCK_des_key_file; bool load_des_key_file(const char *file_name); +void free_des_key_file(); #endif /* HAVE_OPENSSL */ /* sql_do.cc */ @@ -701,6 +702,7 @@ extern struct rand_struct sql_rand; extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db; extern SHOW_COMP_OPTION have_raid, have_openssl, have_symlink; extern SHOW_COMP_OPTION have_query_cache, have_berkeley_db, have_innodb; +extern SHOW_COMP_OPTION have_crypt; #ifndef __WIN__ extern pthread_t signal_thread; |