diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-02-19 11:01:25 +0200 |
| commit | 945fa0d913a65c447306e945c44f50828903445b (patch) | |
| tree | 5178630451a60c8da965c19e0c339eb4f629de2f /include/maria.h | |
| parent | 8526274c21ce0fd7eedac5275cb210cd2b048dc5 (diff) | |
| parent | 6a1bc662d67cdb7716480654ddd63d504508b4fa (diff) | |
| download | mariadb-git-945fa0d913a65c447306e945c44f50828903445b.tar.gz | |
Merge with mysql-maria tree
mysql-test/t/variables.test:
Reset delay_key_write, otherwise maria.maria test may fail
sql/set_var.cc:
Reset ha_open_options if one resets the delay_key_write variable.
Before there was no way to reset it without restarting mysqld, which caused some tests to fail
Diffstat (limited to 'include/maria.h')
| -rw-r--r-- | include/maria.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/maria.h b/include/maria.h index d8b98bb6401..3c2fc08d9a8 100644 --- a/include/maria.h +++ b/include/maria.h @@ -192,7 +192,7 @@ typedef struct st_maria_keydef /* Key definition with open & info */ uint16 maxlength; /* max length of (packed) key (auto) */ uint32 write_comp_flag; /* compare flag for write key (auto) */ uint32 version; /* For concurrent read/write */ - uint32 ftparser_nr; /* distinct ftparser number */ + uint32 ftkey_nr; /* full-text index number */ HA_KEYSEG *seg, *end; struct st_mysql_ftparser *parser; /* Fulltext [pre]parser */ |