mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Merge
This commit is contained in:
monty@mysql.com
@ -323,6 +323,14 @@ void debug_sync_point(const char* lock_name, uint lock_timeout);
|
||||
#define WEEK_MONDAY_FIRST 1
|
||||
#define WEEK_YEAR 2
|
||||
#define WEEK_FIRST_WEEKDAY 4
|
||||
/*
|
||||
Required buffer length for make_date, make_time, make_datetime
|
||||
and TIME_to_string functions. Note, that the caller is still
|
||||
responsible to check that given TIME structure has values
|
||||
in valid ranges, otherwise size of the buffer could be not
|
||||
enough.
|
||||
*/
|
||||
#define MAX_DATE_REP_LENGTH 30
|
||||
|
||||
struct st_table;
|
||||
class THD;
|
||||
@ -375,6 +383,7 @@ inline THD *_current_thd(void)
|
||||
#include "sql_list.h"
|
||||
#include "sql_map.h"
|
||||
#include "handler.h"
|
||||
#include "parse_file.h"
|
||||
#include "table.h"
|
||||
#include "field.h" /* Field definitions */
|
||||
#include "protocol.h"
|
||||
@ -386,6 +395,18 @@ void free_items(Item *item);
|
||||
void cleanup_items(Item *item);
|
||||
class THD;
|
||||
void close_thread_tables(THD *thd, bool locked=0, bool skip_derived=0);
|
||||
int check_one_table_access(THD *thd, ulong privilege,
|
||||
TABLE_LIST *tables);
|
||||
bool check_merge_table_access(THD *thd, char *db,
|
||||
TABLE_LIST *table_list);
|
||||
int multi_update_precheck(THD *thd, TABLE_LIST *tables);
|
||||
int multi_delete_precheck(THD *thd, TABLE_LIST *tables, uint *table_count);
|
||||
int insert_select_precheck(THD *thd, TABLE_LIST *tables);
|
||||
int update_precheck(THD *thd, TABLE_LIST *tables);
|
||||
int delete_precheck(THD *thd, TABLE_LIST *tables);
|
||||
int insert_precheck(THD *thd, TABLE_LIST *tables, bool update);
|
||||
int create_table_precheck(THD *thd, TABLE_LIST *tables,
|
||||
TABLE_LIST *create_table);
|
||||
#include "sql_class.h"
|
||||
#include "opt_range.h"
|
||||
|
||||
@ -527,6 +548,11 @@ int mysql_handle_derived(LEX *lex);
|
||||
Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
|
||||
Item ***copy_func, Field **from_field,
|
||||
bool group,bool modify_item);
|
||||
int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,
|
||||
List<create_field> &fields,
|
||||
List<Key> &keys, uint &db_options,
|
||||
handler *file, KEY *&key_info_buffer,
|
||||
uint &key_count, int select_field_count);
|
||||
int mysql_create_table(THD *thd,const char *db, const char *table_name,
|
||||
HA_CREATE_INFO *create_info,
|
||||
List<create_field> &fields, List<Key> &keys,
|
||||
@ -541,13 +567,10 @@ int mysql_alter_table(THD *thd, char *new_db, char *new_name,
|
||||
HA_CREATE_INFO *create_info,
|
||||
TABLE_LIST *table_list,
|
||||
List<create_field> &fields,
|
||||
List<Key> &keys,List<Alter_drop> &drop_list,
|
||||
List<Alter_column> &alter_list,
|
||||
uint order_num, ORDER *order,
|
||||
List<Key> &keys,
|
||||
uint order_num, ORDER *order,
|
||||
enum enum_duplicates handle_duplicates,
|
||||
enum enum_enable_or_disable keys_onoff=LEAVE_AS_IS,
|
||||
enum tablespace_op_type tablespace_op=NO_TABLESPACE_OP,
|
||||
bool simple_alter=0);
|
||||
ALTER_INFO *alter_info);
|
||||
int mysql_create_like_table(THD *thd, TABLE_LIST *table,
|
||||
HA_CREATE_INFO *create_info,
|
||||
Table_ident *src_table);
|
||||
@ -558,7 +581,10 @@ bool mysql_rename_table(enum db_type base,
|
||||
const char * new_name);
|
||||
int mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys);
|
||||
int mysql_drop_index(THD *thd, TABLE_LIST *table_list,
|
||||
List<Alter_drop> &drop_list);
|
||||
ALTER_INFO *alter_info);
|
||||
int mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
|
||||
TABLE_LIST *update_table_list,
|
||||
Item **conds, uint order_num, ORDER *order);
|
||||
int mysql_update(THD *thd,TABLE_LIST *tables,List<Item> &fields,
|
||||
List<Item> &values,COND *conds,
|
||||
uint order_num, ORDER *order, ha_rows limit,
|
||||
@ -568,9 +594,15 @@ int mysql_multi_update(THD *thd, TABLE_LIST *table_list,
|
||||
COND *conds, ulong options,
|
||||
enum enum_duplicates handle_duplicates,
|
||||
SELECT_LEX_UNIT *unit, SELECT_LEX *select_lex);
|
||||
int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
|
||||
TABLE_LIST *insert_table_list, TABLE *table,
|
||||
List<Item> &fields, List_item *values,
|
||||
List<Item> &update_fields,
|
||||
List<Item> &update_values, enum_duplicates duplic);
|
||||
int mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
|
||||
List<List_item> &values, List<Item> &update_fields,
|
||||
List<Item> &update_values, enum_duplicates flag);
|
||||
int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds);
|
||||
int mysql_delete(THD *thd, TABLE_LIST *table, COND *conds, SQL_LIST *order,
|
||||
ha_rows rows, ulong options);
|
||||
int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok=0);
|
||||
@ -654,6 +686,7 @@ void mysql_stmt_reset(THD *thd, char *packet);
|
||||
void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length);
|
||||
int check_insert_fields(THD *thd,TABLE *table,List<Item> &fields,
|
||||
List<Item> &values, ulong counter);
|
||||
void reset_stmt_for_execute(THD *thd, LEX *lex);
|
||||
|
||||
/* sql_error.cc */
|
||||
MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code,
|
||||
@ -761,17 +794,20 @@ extern "C" pthread_handler_decl(handle_manager, arg);
|
||||
void print_where(COND *cond,const char *info);
|
||||
void print_cached_tables(void);
|
||||
void TEST_filesort(SORT_FIELD *sortorder,uint s_length);
|
||||
void print_plan(JOIN* join, double read_time, double record_count,
|
||||
uint idx, const char *info);
|
||||
#endif
|
||||
void mysql_print_status(THD *thd);
|
||||
/* key.cc */
|
||||
int find_ref_key(TABLE *form,Field *field, uint *offset);
|
||||
void key_copy(byte *key,TABLE *form,uint index,uint key_length);
|
||||
void key_restore(TABLE *form,byte *key,uint index,uint key_length);
|
||||
int key_cmp(TABLE *form,const byte *key,uint index,uint key_length);
|
||||
bool key_cmp_if_same(TABLE *form,const byte *key,uint index,uint key_length);
|
||||
void key_unpack(String *to,TABLE *form,uint index);
|
||||
bool check_if_key_used(TABLE *table, uint idx, List<Item> &fields);
|
||||
bool init_errmessage(void);
|
||||
int key_cmp(KEY_PART_INFO *key_part, const byte *key, uint key_length);
|
||||
|
||||
bool init_errmessage(void);
|
||||
void sql_perror(const char *message);
|
||||
void sql_print_error(const char *format,...)
|
||||
__attribute__ ((format (printf, 1, 2)));
|
||||
@ -809,7 +845,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create);
|
||||
extern time_t start_time;
|
||||
extern char *mysql_data_home,server_version[SERVER_VERSION_LENGTH],
|
||||
mysql_real_data_home[], *opt_mysql_tmpdir, mysql_charsets_dir[],
|
||||
opt_ft_boolean_syntax[sizeof(ft_boolean_syntax)];
|
||||
def_ft_boolean_syntax[sizeof(ft_boolean_syntax)];
|
||||
#define mysql_tmpdir (my_tmpdir(&mysql_tmpdir_list))
|
||||
extern MY_TMPDIR mysql_tmpdir_list;
|
||||
extern const char *command_name[];
|
||||
@ -828,6 +864,7 @@ extern char language[LIBLEN],reg_ext[FN_EXTLEN];
|
||||
extern char glob_hostname[FN_REFLEN], mysql_home[FN_REFLEN];
|
||||
extern char pidfile_name[FN_REFLEN], time_zone[30], *opt_init_file;
|
||||
extern char log_error_file[FN_REFLEN];
|
||||
extern double last_query_cost;
|
||||
extern double log_10[32];
|
||||
extern ulonglong log_10_int[20];
|
||||
extern ulonglong keybuff_size;
|
||||
@ -850,7 +887,7 @@ extern ulong server_id, concurrency;
|
||||
extern ulong ha_read_count, ha_write_count, ha_delete_count, ha_update_count;
|
||||
extern ulong ha_read_key_count, ha_read_next_count, ha_read_prev_count;
|
||||
extern ulong ha_read_first_count, ha_read_last_count;
|
||||
extern ulong ha_read_rnd_count, ha_read_rnd_next_count;
|
||||
extern ulong ha_read_rnd_count, ha_read_rnd_next_count, ha_discover_count;
|
||||
extern ulong ha_commit_count, ha_rollback_count,table_cache_size;
|
||||
extern ulong max_connections,max_connect_errors, connect_timeout;
|
||||
extern ulong slave_net_timeout;
|
||||
@ -869,7 +906,7 @@ extern uint protocol_version, mysqld_port, dropping_tables;
|
||||
extern uint delay_key_write_options, lower_case_table_names;
|
||||
extern bool opt_endinfo, using_udf_functions, locked_in_memory;
|
||||
extern bool opt_using_transactions, mysql_embedded;
|
||||
extern bool using_update_log, opt_large_files;
|
||||
extern bool using_update_log, opt_large_files, server_id_supplied;
|
||||
extern bool opt_log, opt_update_log, opt_bin_log, opt_slow_log, opt_error_log;
|
||||
extern bool opt_disable_networking, opt_skip_show_db;
|
||||
extern bool volatile abort_loop, shutdown_in_progress, grant_option;
|
||||
@ -905,6 +942,7 @@ extern SHOW_VAR init_vars[],status_vars[], internal_vars[];
|
||||
extern SHOW_COMP_OPTION have_isam;
|
||||
extern SHOW_COMP_OPTION have_innodb;
|
||||
extern SHOW_COMP_OPTION have_berkeley_db;
|
||||
extern SHOW_COMP_OPTION have_ndbcluster;
|
||||
extern struct system_variables global_system_variables;
|
||||
extern struct system_variables max_system_variables;
|
||||
extern struct rand_struct sql_rand;
|
||||
@ -922,7 +960,7 @@ extern struct my_option my_long_options[];
|
||||
|
||||
/* optional things, have_* variables */
|
||||
|
||||
extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db;
|
||||
extern SHOW_COMP_OPTION have_isam, have_innodb, have_berkeley_db, have_example_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;
|
||||
@ -963,6 +1001,10 @@ void unlock_table_names(THD *thd, TABLE_LIST *table_list,
|
||||
|
||||
void unireg_init(ulong options);
|
||||
void unireg_end(void);
|
||||
bool mysql_create_frm(THD *thd, my_string file_name,
|
||||
HA_CREATE_INFO *create_info,
|
||||
List<create_field> &create_field,
|
||||
uint key_count,KEY *key_info,handler *db_type);
|
||||
int rea_create_table(THD *thd, my_string file_name,HA_CREATE_INFO *create_info,
|
||||
List<create_field> &create_field,
|
||||
uint key_count,KEY *key_info);
|
||||
@ -970,6 +1012,10 @@ int format_number(uint inputflag,uint max_length,my_string pos,uint length,
|
||||
my_string *errpos);
|
||||
int openfrm(const char *name,const char *alias,uint filestat,uint prgflag,
|
||||
uint ha_open_flags, TABLE *outparam);
|
||||
int readfrm(const char *name, const void** data, uint* length);
|
||||
int writefrm(const char* name, const void* data, uint len);
|
||||
int create_table_from_handler(const char *db, const char *name,
|
||||
bool create_if_found);
|
||||
int closefrm(TABLE *table);
|
||||
db_type get_table_type(const char *name);
|
||||
int read_string(File file, gptr *to, uint length);
|
||||
@ -1002,9 +1048,17 @@ const char *get_date_time_format_str(KNOWN_DATE_TIME_FORMAT *format,
|
||||
timestamp_type type);
|
||||
extern bool make_date_time(DATE_TIME_FORMAT *format, TIME *l_time,
|
||||
timestamp_type type, String *str);
|
||||
extern void make_time(DATE_TIME_FORMAT *format, TIME *l_time, String *str);
|
||||
void make_date(DATE_TIME_FORMAT *format, TIME *l_time, String *str);
|
||||
void make_datetime(DATE_TIME_FORMAT *format, TIME *l_time, String *str);
|
||||
void make_datetime(const DATE_TIME_FORMAT *format, const TIME *l_time,
|
||||
String *str);
|
||||
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);
|
||||
void TIME_to_string(const TIME *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);
|
||||
@ -1047,8 +1101,7 @@ void reset_host_errors(struct in_addr *in);
|
||||
bool hostname_cache_init();
|
||||
void hostname_cache_free();
|
||||
void hostname_cache_refresh(void);
|
||||
bool get_interval_info(const char *str,uint length,uint count,
|
||||
long *values);
|
||||
|
||||
/* sql_cache.cc */
|
||||
extern bool sql_cache_init();
|
||||
extern void sql_cache_free();
|
||||
|
||||
Reference in New Issue
Block a user