diff options
author | unknown <monty@hundin.mysql.fi> | 2001-12-10 00:08:24 +0200 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2001-12-10 00:08:24 +0200 |
commit | f939a6b635846216778bb4abd96ba6fef229908e (patch) | |
tree | 3e69c63ee516f0cf84e4f42523b616db0f833200 /myisam/ft_nlq_search.c | |
parent | b05520526e75ea6fbe17aad0c256851bccd33054 (diff) | |
download | mariadb-git-f939a6b635846216778bb4abd96ba6fef229908e.tar.gz |
Removed compiler warnings.
Added new operators to be used with gcc 3.0.x
Update of query cache code.
Added semaphores for Windows (not yet in use)
Added pthread_mutex_trylock for windows.
Docs/manual.texi:
Update of query cache info.
Docs/section.Comparisons.texi:
Added indexing.
client/mysqlbinlog.cc:
Removed compiler warnings.
client/mysqltest.c:
Added enable_result_log/disable_result_log
include/config-win.h:
Added support of semaphores on Windows.
include/my_pthread.h:
Added pthread_mutex_trylock for windows.
include/my_sys.h:
Cleanup
libmysql/libmysql.c:
Fixed bug in mysql_use_result() (When reusing connections).
myisam/ft_boolean_search.c:
Removed compiler warnings
myisam/ft_nlq_search.c:
Removed compiler warnings
myisam/ft_update.c:
Removed compiler warnings
mysql-test/r/query_cache.result:
New tests
mysql-test/t/query_cache-master.opt:
New tests
mysql-test/t/query_cache.test:
New tests
mysys/Makefile.am:
Added new operators to be used with gcc 3.0.x
sql/filesort.cc:
Removed compiler warnings
sql/item_func.cc:
Removed compiler warnings
sql/mysql_priv.h:
Removed compiler warnings
sql/mysqld.cc:
Update of query cache code.
sql/slave.cc:
Removed compiler warnings.
Code cleanup (Indentation)
sql/sql_cache.cc:
Updated code
sql/sql_cache.h:
Updated code
sql/sql_repl.cc:
Removed compiler warnings
sql/sql_yacc.yy:
Updated query cache
Diffstat (limited to 'myisam/ft_nlq_search.c')
-rw-r--r-- | myisam/ft_nlq_search.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 5bb2ffab939..ac9fa5a9a8c 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -248,7 +248,8 @@ int ft_nlq_read_next(FT_INFO *handler, char *record) } float ft_nlq_find_relevance(FT_INFO *handler, - byte *record __attribute__((unused)), uint length __attribute__((unused))) + byte *record __attribute__((unused)), + uint length __attribute__((unused))) { int a,b,c; FT_DOC *docs=handler->doc; @@ -267,7 +268,7 @@ float ft_nlq_find_relevance(FT_INFO *handler, a=c; } if (docs[a].dpos == docid) - return docs[a].weight; + return (float) docs[a].weight; else return 0.0; } @@ -279,7 +280,7 @@ void ft_nlq_close_search(FT_INFO *handler) float ft_nlq_get_relevance(FT_INFO *handler) { - return handler->doc[handler->curdoc].weight; + return (float) handler->doc[handler->curdoc].weight; } void ft_nlq_reinit_search(FT_INFO *handler) |