diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-05 01:04:08 +0200 |
| commit | d18a6cc33a220e056dfa1633b928ac0b1415789d (patch) | |
| tree | 1750cfa3cfd660f20d5055a78caff42a53363247 /myisam/ft_nlq_search.c | |
| parent | cec36f0f14b6c885aabe4eb989fb9ff4a4ae6a7c (diff) | |
| download | mariadb-git-d18a6cc33a220e056dfa1633b928ac0b1415789d.tar.gz | |
Fixes up things after merge from 3.23.44
Portability fixes.
Don't delete temporary tables on FLUSH tables.
client/client_priv.h:
Fix after merge
client/mysqldump.c:
Fix after merge
include/my_global.h:
Change CMP -> CMP_NUM because CMP was used in other places
include/violite.h:
Added missing prototype
myisam/ft_boolean_search.c:
Removed warnings
myisam/ft_nlq_search.c:
Removed warnings
myisam/mi_search.c:
CMP -> CMP_NUM
mysql-test/mysql-test-run.sh:
Write all logs to log directory
mysql-test/r/func_time.result:
Fix test results after merge
mysql-test/r/having.result:
Fix test results after merge
mysql-test/r/join.result:
Fix test results after merge
mysql-test/r/rpl000012.result:
Fix test results after merge
mysys/mf_iocache.c:
Allow multiple call to end_iocache.
sql/ha_innobase.cc:
Removed possible problem with using uninitialized variable
sql/log_event.cc:
Don't delete temporary tables on FLUSH tables.
(Needs to be fixed properly)
Diffstat (limited to 'myisam/ft_nlq_search.c')
| -rw-r--r-- | myisam/ft_nlq_search.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c index 93c63369ecc..a806361fc0a 100644 --- a/myisam/ft_nlq_search.c +++ b/myisam/ft_nlq_search.c @@ -205,7 +205,7 @@ FT_INFO *ft_init_nlq_search(MI_INFO *info, uint keynr, byte *query, if(!dlist) goto err2; - dlist->please=& _ft_vft_nlq; + dlist->please= (struct _ft_vft *) & _ft_vft_nlq; dlist->ndocs=aio.dtree.elements_in_tree; dlist->curdoc=-1; dlist->info=aio.info; |