mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
MariaDB 5.2 -> MariaDB 5.3 merge
This commit is contained in:
@ -69,6 +69,7 @@ typedef struct st_key_part_info { /* Info about a key part */
|
||||
uint8 null_bit; /* Position to null_bit */
|
||||
} KEY_PART_INFO ;
|
||||
|
||||
class engine_option_value;
|
||||
|
||||
typedef struct st_key {
|
||||
uint key_length; /* Tot length of key */
|
||||
@ -102,6 +103,9 @@ typedef struct st_key {
|
||||
int bdb_return_if_eq;
|
||||
} handler;
|
||||
struct st_table *table;
|
||||
/** reference to the list of options or NULL */
|
||||
engine_option_value *option_list;
|
||||
void *option_struct; /* structure with parsed options */
|
||||
} KEY;
|
||||
|
||||
|
||||
@ -200,7 +204,7 @@ extern const char *show_comp_option_name[];
|
||||
typedef int *(*update_var)(THD *, struct st_mysql_show_var *);
|
||||
|
||||
typedef struct st_lex_user {
|
||||
LEX_STRING user, host, password;
|
||||
LEX_STRING user, host, password, plugin, auth;
|
||||
} LEX_USER;
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user