mirror of
https://github.com/MariaDB/server.git
synced 2026-05-09 16:44:29 +02:00
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
This commit is contained in:
parent
a6f5375cb0
commit
cdf64f0f57
23 changed files with 1104 additions and 84 deletions
|
|
@ -89,6 +89,15 @@ typedef struct st_key {
|
|||
uint extra_length;
|
||||
uint usable_key_parts; /* Should normally be = key_parts */
|
||||
enum ha_key_alg algorithm;
|
||||
/*
|
||||
Note that parser is used when the table is opened for use, and
|
||||
parser_name is used when the table is being created.
|
||||
*/
|
||||
union
|
||||
{
|
||||
struct st_plugin_int *parser; /* Fulltext [pre]parser */
|
||||
LEX_STRING *parser_name; /* Fulltext [pre]parser name */
|
||||
};
|
||||
KEY_PART_INFO *key_part;
|
||||
char *name; /* Name of key */
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue