diff options
| author | unknown <serg@serg.mysql.com> | 2000-11-28 18:46:07 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-11-28 18:46:07 +0100 |
| commit | c1fdd5b55afab11e981929519b96294cac4f1e04 (patch) | |
| tree | 0968edd40e6ddc5d6f67600003d0fdcfc10afeb9 /sql/ha_myisam.cc | |
| parent | 6fbd5b896bf0d032bb976073168cf4a6112b2bae (diff) | |
| parent | b865c72adb710c9cd5378e4b55eda0ffc9352303 (diff) | |
| download | mariadb-git-c1fdd5b55afab11e981929519b96294cac4f1e04.tar.gz | |
Merge
sql/ha_myisam.cc:
merged
sql/share/russian/errmsg.txt:
merged
Diffstat (limited to 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 229c24df107..21cfab6b701 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -1094,7 +1094,17 @@ int ha_myisam::ft_read(byte * buf) if (error=ft_read_next((FT_DOCLIST *) ft_handler,(char*) buf)) ft_handler=NULL; // Magic here ! See Item_func_match::val() - + // and ha_myisam::index_init() table->status=error ? STATUS_NOT_FOUND: 0; return error; } + +int ha_myisam::index_init(uint idx) +{ + if (idx != active_index) + ft_handler=NULL; // Magic here ! + + active_index=idx; + return 0; +} + |