diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2010-06-26 14:05:41 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2010-06-26 14:05:41 +0400 |
| commit | 27f9fc063c54ad8c9c0e35e78bbbb14a3e2419af (patch) | |
| tree | af692374b15c7e8186406a1009e678cfedc3e78b /sql/structs.h | |
| parent | 7754be7f4c19d442564d8fef6853e711aa0e3cec (diff) | |
| parent | 50cc6c9d8a7d68ace0802702f3bc10cb2afb3730 (diff) | |
| download | mariadb-git-27f9fc063c54ad8c9c0e35e78bbbb14a3e2419af.tar.gz | |
MariaDB 5.2 -> MariaDB 5.3 merge
Diffstat (limited to 'sql/structs.h')
| -rw-r--r-- | sql/structs.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/structs.h b/sql/structs.h index d9294a75f86..fbbafafe3ea 100644 --- a/sql/structs.h +++ b/sql/structs.h @@ -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; /* |