diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
| commit | a3828081cde644ab551c21a621b8e6ab69923e6a (patch) | |
| tree | 4b29146428c84ab3e10e4007d26e3c0b4b2b1074 /myisam | |
| parent | 1065f2bbd66ac4b1161f5c188171a54cbad5b422 (diff) | |
| download | mariadb-git-a3828081cde644ab551c21a621b8e6ab69923e6a.tar.gz | |
After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
client/client_priv.h:
Added option 'create_options' for mysqldump
client/mysqldump.c:
Changed '--all' to '--create-options' as the old name was meaningless
innobase/buf/buf0buf.c:
After merge fixes
innobase/buf/buf0lru.c:
After merge fixes
innobase/buf/buf0rea.c:
After merge fixes
innobase/dict/dict0load.c:
After merge fixes
innobase/fil/fil0fil.c:
After merge fixes
innobase/ibuf/ibuf0ibuf.c:
After merge fixes
innobase/include/fil0fil.h:
After merge fixes
innobase/include/row0mysql.h:
After merge fixes
innobase/include/ut0mem.h:
After merge fixes
innobase/log/log0recv.c:
After merge fixes
innobase/row/row0mysql.c:
After merge fixes
innobase/row/row0sel.c:
After merge fixes
innobase/srv/srv0start.c:
After merge fixes
innobase/sync/sync0rw.c:
After merge fixes
innobase/sync/sync0sync.c:
After merge fixes
myisam/ft_boolean_search.c:
After merge fixes
myisam/ft_nlq_search.c:
After merge fixes
mysql-test/r/mysqldump.result:
After merge fixes
mysql-test/t/mysqldump.test:
Make result file smaller
Some new tests
sql/ha_innodb.cc:
After merge fixes
sql/set_var.cc:
Removed compiler warning
sql/slave.cc:
After merge fixes
sql/slave.h:
After merge fixes
sql/sql_show.cc:
Type -> Engine
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/ft_boolean_search.c | 5 | ||||
| -rw-r--r-- | myisam/ft_nlq_search.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c index f6092921a02..2a1c07acf0b 100644 --- a/myisam/ft_boolean_search.c +++ b/myisam/ft_boolean_search.c @@ -224,8 +224,9 @@ static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search) /* Skip rows inserted by concurrent insert */ while (!r && info->lastpos >= info->state->data_file_length) - r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, - SEARCH_BIGGER, keyroot); + r= _mi_search_next(info, ftbw->keyinfo, info->lastkey, + info->lastkey_length, + SEARCH_BIGGER, ftbw->key_root); if (!r && !ftbw->off) { diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index b79bf8a2baa..f8ca7e96564 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -89,8 +89,8 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) doc_cnt=0; /* Skip rows inserted by current inserted */ - for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root) - !r && info->lastpos >= info->state->data_file_length; + for (r=_mi_search(info, keyinfo, keybuff, keylen, SEARCH_FIND, key_root) ; + !r && info->lastpos >= info->state->data_file_length ; r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, SEARCH_BIGGER, key_root)) ; @@ -159,8 +159,8 @@ static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio) SEARCH_BIGGER, key_root); while (!r && info->lastpos >= info->state->data_file_length) - r= _mi_search(info, keyinfo, info->lastkey, info->lastkey_length, - SEARCH_BIGGER, key_root); + r= _mi_search_next(info, keyinfo, info->lastkey, info->lastkey_length, + SEARCH_BIGGER, key_root); } word->weight=gweight; |