diff options
author | unknown <serg@serg.mysql.com> | 2001-10-09 14:53:54 +0200 |
---|---|---|
committer | unknown <serg@serg.mysql.com> | 2001-10-09 14:53:54 +0200 |
commit | 736e5b0de2281ab75af2cf3d88480aa6db9a18d2 (patch) | |
tree | c39107b036ff091f557b03a1f37183735dcddbad /myisam/mi_write.c | |
parent | 734e2a8bcaa4a5d2de6059f4cdcac8e71bbb5d6d (diff) | |
download | mariadb-git-736e5b0de2281ab75af2cf3d88480aa6db9a18d2.tar.gz |
Boolean search passes _some_ tests
sql/ha_myisam.cc:
One more abstraction layer added (C++ emulated in C :).
include/ft_global.h:
boolean search code plugged in
mysql-test/r/fulltext_cache.result:
boolean search code plugged in
mysql-test/r/fulltext_left_join.result:
boolean search code plugged in
mysql-test/r/fulltext_multi.result:
boolean search code plugged in
mysql-test/r/fulltext_order_by.result:
boolean search code plugged in
sql/lex.h:
IN BOOLEAN MODE syntax
myisam/ft_nlq_search.c:
boolean search code plugged in
myisam/ftdefs.h:
boolean search code plugged in
sql/ha_myisam.h:
boolean search code plugged in
sql/handler.h:
boolean search code plugged in
include/my_base.h:
do_not_sort_keyseg feature for MyISAM
include/my_global.h:
#define comp(a,b) (((a) < (b)) ? -1 : ((a) > (b)) ? 1 : 0)
myisam/ft_boolean_search.c:
bugfixing
myisam/ft_parser.c:
cleanup
myisam/ft_static.c:
do_not_sort_keyseg feature for MyISAM
myisam/mi_search.c:
do_not_sort_keyseg feature for MyISAM
myisam/mi_write.c:
cleanup
mysql-test/t/fulltext.test:
boolean search tests added
BitKeeper/etc/ignore:
Added myisam/FT1.MYD myisam/FT1.MYI to the ignore list
sql/item_func.cc:
boolean search
sql/item_func.h:
boolean search
sql/sql_yacc.yy:
boolean search
Diffstat (limited to 'myisam/mi_write.c')
-rw-r--r-- | myisam/mi_write.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index 096d5829fed..322b0755015 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -774,7 +774,7 @@ static int keys_free(uchar *key, TREE_FREE mode, bulk_insert_param *param) keyinfo=param->info->s->keyinfo+param->keynr; keylen=_mi_keylength(keyinfo, key); memcpy(lastkey, key, keylen); - return _mi_ck_write_btree(param->info,param->keynr,lastkey, + return _mi_ck_write_btree(param->info,param->keynr,lastkey, keylen - param->info->s->rec_reflength); case free_end: if (param->info->s->concurrent_insert) @@ -794,7 +794,7 @@ int _mi_init_bulk_insert(MI_INFO *info) if (info->bulk_insert) return 0; - + for (i=num_keys=0 ; i < share->base.keys ; i++) { if (!(key[i].flag & HA_NOSAME) && share->base.auto_key != i+1 @@ -807,7 +807,7 @@ int _mi_init_bulk_insert(MI_INFO *info) if (!num_keys) return 0; - + info->bulk_insert=(TREE *) my_malloc((sizeof(TREE)*share->base.keys+ sizeof(bulk_insert_param)*num_keys),MYF(0)); @@ -822,13 +822,13 @@ int _mi_init_bulk_insert(MI_INFO *info) { params->info=info; params->keynr=i; - init_tree(& info->bulk_insert[i], 0, + init_tree(& info->bulk_insert[i], 0, myisam_bulk_insert_tree_size / num_keys, 0, (qsort_cmp2)keys_compare, 0, (tree_element_free) keys_free, (void *)params++); } else - info->bulk_insert[i].root=0; + info->bulk_insert[i].root=0; } return 0; |