diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-11-07 00:14:43 +0200 |
| commit | 228408a8c54e34922832082c0e36c1e87f224873 (patch) | |
| tree | 159482f3548d082a75cf857a65f76395451f47da /include | |
| parent | 8547d05ccc9c00450ae8b226cb38f53f90162958 (diff) | |
| parent | e49cf66e07b2b3abdceb63beed09ea9045c2dbb8 (diff) | |
| download | mariadb-git-228408a8c54e34922832082c0e36c1e87f224873.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/ft_global.h | 1 | ||||
| -rw-r--r-- | include/queues.h | 1 | ||||
| -rw-r--r-- | include/sslopt-case.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/include/ft_global.h b/include/ft_global.h index f08b6cea6ab..9870e0854c1 100644 --- a/include/ft_global.h +++ b/include/ft_global.h @@ -35,7 +35,6 @@ struct _ft_vft { float (*find_relevance)(FT_INFO *, my_off_t, byte *); void (*close_search)(FT_INFO *); float (*get_relevance)(FT_INFO *); - my_off_t (*get_docid)(FT_INFO *); void (*reinit_search)(FT_INFO *); }; diff --git a/include/queues.h b/include/queues.h index 66125e650ca..d9d8091c9ef 100644 --- a/include/queues.h +++ b/include/queues.h @@ -53,6 +53,7 @@ void delete_queue(QUEUE *queue); void queue_insert(QUEUE *queue,byte *element); byte *queue_remove(QUEUE *queue,uint idx); void _downheap(QUEUE *queue,uint idx); +void queue_fix(QUEUE *queue); #define is_queue_inited(queue) ((queue)->root != 0) #ifdef __cplusplus diff --git a/include/sslopt-case.h b/include/sslopt-case.h index b801e5e73c7..61e0846ab86 100644 --- a/include/sslopt-case.h +++ b/include/sslopt-case.h @@ -36,7 +36,7 @@ break; case OPT_SSL_CAPATH: opt_use_ssl = 1; /* true */ - my_free(opt_ssl_ca, MYF(MY_ALLOW_ZERO_PTR)); + my_free(opt_ssl_capath, MYF(MY_ALLOW_ZERO_PTR)); opt_ssl_capath = my_strdup(optarg, MYF(0)); break; case OPT_SSL_CIPHER: |