diff options
| author | jan@hundin.mysql.fi <> | 2004-12-21 07:49:38 +0200 |
|---|---|---|
| committer | jan@hundin.mysql.fi <> | 2004-12-21 07:49:38 +0200 |
| commit | 198dc7a8ec6e220c348bb47e59a2ac7532be18b8 (patch) | |
| tree | 5d3767a8558fd05da17b5d4e3f361ef643d3a9b8 /sql/mysql_priv.h | |
| parent | c187798fcbdb055bc69ec727c81840a132481cbe (diff) | |
| parent | 88b63ab6690bd453a1b841968b468759898cd94a (diff) | |
| download | mariadb-git-198dc7a8ec6e220c348bb47e59a2ac7532be18b8.tar.gz | |
Content merge.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 963ba484cea..2fc82e05f31 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1028,6 +1028,8 @@ extern uint opt_crash_binlog_innodb; extern char *shared_memory_base_name, *mysqld_unix_port; extern bool opt_enable_shared_memory; extern char *default_tz_name; +extern my_bool opt_large_pages; +extern uint opt_large_page_size; extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log; extern FILE *bootstrap_file; @@ -1071,6 +1073,7 @@ extern struct my_option my_long_options[]; extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db; extern SHOW_COMP_OPTION have_example_db, have_archive_db, have_csv_db; +extern SHOW_COMP_OPTION have_federated_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_geometry, have_rtree_keys; @@ -1140,8 +1143,6 @@ my_time_t TIME_to_timestamp(THD *thd, const TIME *t, bool *not_exist); bool str_to_time_with_warn(const char *str,uint length,TIME *l_time); timestamp_type str_to_datetime_with_warn(const char *str, uint length, TIME *l_time, uint flags); -longlong number_to_TIME(longlong nr, TIME *time_res, bool fuzzy_date, - int *was_cut); void localtime_to_TIME(TIME *to, struct tm *from); void calc_time_from_sec(TIME *to, long seconds, long microseconds); @@ -1163,10 +1164,6 @@ void make_date(const DATE_TIME_FORMAT *format, const TIME *l_time, String *str); void make_time(const DATE_TIME_FORMAT *format, const TIME *l_time, String *str); -ulonglong TIME_to_ulonglong_datetime(const TIME *time); -ulonglong TIME_to_ulonglong_date(const TIME *time); -ulonglong TIME_to_ulonglong_time(const TIME *time); -ulonglong TIME_to_ulonglong(const TIME *time); int test_if_number(char *str,int *res,bool allow_wildcards); void change_byte(byte *,uint,char,char); |