mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
35da5e43fb
Fixed compiler warnings (IRIX C compiler and VC++) VC++Files/client/mysqlclient.dsp: Add missing file to project VC++Files/libmysql/libmysql.dsp: Add missing file to project VC++Files/myisam/myisam.dsp: Add missing file to project VC++Files/mysys/mysys.dsp: Add missing file to project heap/hp_test1.c: Fixed wrong call to heap_rkey() heap/hp_test2.c: Fixed wrong call to heap_rkey() include/hash.h: Move not used (internal) struct to hash.c include/my_pthread.h: Made some structs 'const char*' to avoid warnings include/my_sys.h: Moved key cache structs and functions to keycache.h include/myisam.h: Merge key cache structures to one include/mysql.h: Remove STDCALL from internal functions include/sql_common.h: Remove STDCALL from internal functions include/violite.h: Fixed compiler warning isam/_locking.c: Merge key cache structures to one isam/_page.c: Merge key cache structures to one isam/close.c: Merge key cache structures to one isam/extra.c: Merge key cache structures to one isam/isamchk.c: Merge key cache structures to one isam/isamdef.h: Merge key cache structures to one isam/isamlog.c: Merge key cache structures to one isam/panic.c: Merge key cache structures to one isam/test2.c: Merge key cache structures to one isam/test3.c: Merge key cache structures to one libmysql/client_settings.h: Remove STDCALL from internal functions libmysql/libmysql.c: Remove STDCALL from internal functions myisam/ft_boolean_search.c: Fixed compiler warning myisam/ft_dump.c: Fixed compiler warnings (%qx is not portable) myisam/ft_update.c: Fixed compiler warnings myisam/mi_check.c: Merge key cache structures to one myisam/mi_close.c: Merge key cache structures to one myisam/mi_delete_all.c: Merge key cache structures to one myisam/mi_extra.c: Merge key cache structures to one myisam/mi_keycache.c: Merge key cache structures to one myisam/mi_locking.c: Merge key cache structures to one myisam/mi_page.c: Merge key cache structures to one myisam/mi_panic.c: Merge key cache structures to one myisam/mi_preload.c: Merge key cache structures to one myisam/mi_test1.c: Merge key cache structures to one myisam/mi_test2.c: Merge key cache structures to one myisam/mi_test3.c: Merge key cache structures to one myisam/myisamchk.c: Merge key cache structures to one myisam/myisamdef.h: Merge key cache structures to one myisam/myisamlog.c: Merge key cache structures to one Removed not used option myisam/sort.c: Fixed compiler warnings myisam/sp_test.c: Fixed compiler warnings mysql-test/r/case.result: Updated results after fix of correct NULL detection in WHEN mysql-test/r/date_formats.result: Updated results after fixing date handling mysql-test/r/symlink.result: Updated results after adding DEFAULT CHARSET mysql-test/t/case.test: New test mysql-test/t/symlink.test: Updated error numbers mysys/hash.c: Made HASH_LINK struct local mysys/mf_keycache.c: Merge key cache structures to one Fixed key_cache_read() and key_cache_write() to be resize-safe. mysys/mf_keycaches.c: Merge key cache structures to one mysys/thr_mutex.c: Added test if mutex is initalized sql-common/client.c: Remove STDCALL from internal functions sql/derror.cc: Added comment sql/field.cc: Removed not used variables sql/ha_innodb.cc: Fixed compiler warnings (removed not used variables) sql/ha_myisam.cc: Merge key cache structures to one sql/ha_myisammrg.cc: Removed not used variables sql/handler.cc: Merge key cache structures to one sql/handler.h: Merge key cache structures to one sql/item.cc: Fixed compiler warning sql/item_cmpfunc.cc: Remove not used variables sql/item_func.cc: Remove not used variables sql/item_strfunc.cc: Removed not used variables sql/item_sum.cc: Removed not used variables Moved setting of item_thd to fix_fields() sql/item_timefunc.cc: Removed not used variables sql/mysql_priv.h: Merge key cache structures to one sql/mysqld.cc: Merge key cache structures to one init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used sql/opt_sum.cc: Remove not used variables sql/protocol.cc: Don't send errors after ok has been sent sql/protocol_cursor.cc: Remove not used variable Simple optimization sql/repl_failsafe.cc: Remove not used variables sql/set_var.cc: Merge key cache structures to one sql/set_var.h: Merge key cache structures to one sql/sql_acl.cc: Remove not used variables sql/sql_base.cc: Remove not used function sql/sql_db.cc: Remove not used variables sql/sql_handler.cc: Remove not used variables sql/sql_insert.cc: More DBUG statements Simple code cleanup sql/sql_lex.cc: Remove not used variables sql/sql_parse.cc: Remove not used variables sql/sql_prepare.cc: Remove not used variables sql/sql_repl.cc: Remove not used variables sql/sql_select.cc: Remove not used variables sql/sql_show.cc: Remove not used variables sql/sql_table.cc: Merge key cache structures to one Removed not used variables sql/sql_test.cc: Merge key cache structures to one sql/strfunc.cc: Fixed that find_type() returns correct value for partly matched words. (This fixed the error found by date_formats.test) sql/time.cc: Remove not used variables strings/my_strtoll10.c: Fixed compiler warnings
204 lines
6.7 KiB
C
204 lines
6.7 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
* Vio Lite.
|
|
* Purpose: include file for Vio that will work with C and C++
|
|
*/
|
|
|
|
#ifndef vio_violite_h_
|
|
#define vio_violite_h_
|
|
|
|
#include "my_net.h" /* needed because of struct in_addr */
|
|
|
|
|
|
/* Simple vio interface in C; The functions are implemented in violite.c */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
enum enum_vio_type
|
|
{
|
|
VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET, VIO_TYPE_NAMEDPIPE,
|
|
VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY
|
|
};
|
|
|
|
Vio* vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost);
|
|
#ifdef __WIN__
|
|
Vio* vio_new_win32pipe(HANDLE hPipe);
|
|
Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map,
|
|
HANDLE handle_map,
|
|
HANDLE event_server_wrote,
|
|
HANDLE event_server_read,
|
|
HANDLE event_client_wrote,
|
|
HANDLE event_client_read);
|
|
int vio_read_pipe(Vio *vio, gptr buf, int size);
|
|
int vio_write_pipe(Vio *vio, const gptr buf, int size);
|
|
int vio_close_pipe(Vio * vio);
|
|
#else
|
|
#define HANDLE void *
|
|
#endif /* __WIN__ */
|
|
|
|
void vio_delete(Vio* vio);
|
|
int vio_close(Vio* vio);
|
|
|
|
#ifdef EMBEDDED_LIBRARY
|
|
void vio_reset(Vio *vio);
|
|
#else
|
|
void vio_reset(Vio* vio, enum enum_vio_type type,
|
|
my_socket sd, HANDLE hPipe, my_bool localhost);
|
|
#endif
|
|
|
|
int vio_read(Vio *vio, gptr buf, int size);
|
|
int vio_write(Vio *vio, const gptr buf, int size);
|
|
int vio_blocking(Vio *vio, my_bool onoff, my_bool *old_mode);
|
|
my_bool vio_is_blocking(Vio *vio);
|
|
/* setsockopt TCP_NODELAY at IPPROTO_TCP level, when possible */
|
|
int vio_fastsend(Vio *vio);
|
|
/* setsockopt SO_KEEPALIVE at SOL_SOCKET level, when possible */
|
|
int vio_keepalive(Vio *vio, my_bool onoff);
|
|
/* Whenever we should retry the last read/write operation. */
|
|
my_bool vio_should_retry(Vio *vio);
|
|
/* Short text description of the socket for those, who are curious.. */
|
|
const char* vio_description(Vio *vio);
|
|
/* Return the type of the connection */
|
|
enum enum_vio_type vio_type(Vio* vio);
|
|
/* Return last error number */
|
|
int vio_errno(Vio*vio);
|
|
/* Get socket number */
|
|
my_socket vio_fd(Vio*vio);
|
|
/* Remote peer's address and name in text form */
|
|
my_bool vio_peer_addr(Vio* vio, char *buf, uint16 *port);
|
|
/* Remotes in_addr */
|
|
void vio_in_addr(Vio *vio, struct in_addr *in);
|
|
my_bool vio_poll_read(Vio *vio,uint timeout);
|
|
void vio_timeout(Vio *vio,uint timeout);
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
#define HEADER_DES_LOCL_H dummy_something
|
|
#include <openssl/ssl.h>
|
|
#include <openssl/err.h>
|
|
|
|
struct st_VioSSLAcceptorFd
|
|
{
|
|
SSL_CTX *ssl_context;
|
|
SSL_METHOD *ssl_method;
|
|
struct st_VioSSLAcceptorFd *session_id_context;
|
|
};
|
|
|
|
/* One copy for client */
|
|
struct st_VioSSLConnectorFd
|
|
{
|
|
SSL_CTX *ssl_context;
|
|
/* function pointers which are only once for SSL client */
|
|
SSL_METHOD *ssl_method;
|
|
};
|
|
|
|
int sslaccept(struct st_VioSSLAcceptorFd*, Vio *, long timeout);
|
|
int sslconnect(struct st_VioSSLConnectorFd*, Vio *, long timeout);
|
|
|
|
struct st_VioSSLConnectorFd
|
|
*new_VioSSLConnectorFd(const char *key_file, const char *cert_file,
|
|
const char *ca_file, const char *ca_path,
|
|
const char *cipher);
|
|
struct st_VioSSLAcceptorFd
|
|
*new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
|
|
const char *ca_file,const char *ca_path,
|
|
const char *cipher);
|
|
Vio *new_VioSSL(struct st_VioSSLAcceptorFd *fd, Vio *sd, int state);
|
|
#endif /* HAVE_OPENSSL */
|
|
|
|
#ifdef HAVE_SMEM
|
|
int vio_read_shared_memory(Vio *vio, gptr buf, int size);
|
|
int vio_write_shared_memory(Vio *vio, const gptr buf, int size);
|
|
int vio_close_shared_memory(Vio * vio);
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO)
|
|
#define vio_delete(vio) (vio)->viodelete(vio)
|
|
#define vio_errno(vio) (vio)->vioerrno(vio)
|
|
#define vio_read(vio, buf, size) (vio)->read(vio,buf,size)
|
|
#define vio_write(vio, buf, size) (vio)->write(vio, buf, size)
|
|
#define vio_blocking(vio, set_blocking_mode, old_mode)\
|
|
(vio)->vioblocking(vio, set_blocking_mode, old_mode)
|
|
#define vio_is_blocking(vio) (vio)->is_blocking(vio)
|
|
#define vio_fastsend(vio) (vio)->fastsend(vio)
|
|
#define vio_keepalive(vio, set_keep_alive) (vio)->viokeepalive(vio, set_keep_alive)
|
|
#define vio_should_retry(vio) (vio)->should_retry(vio)
|
|
#define vio_close(vio) ((vio)->vioclose)(vio)
|
|
#define vio_peer_addr(vio, buf, prt) (vio)->peer_addr(vio, buf, prt)
|
|
#define vio_in_addr(vio, in) (vio)->in_addr(vio, in)
|
|
#define vio_timeout(vio, seconds) (vio)->timeout(vio, seconds)
|
|
#endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */
|
|
|
|
/* This enumerator is used in parser - should be always visible */
|
|
enum SSL_type
|
|
{
|
|
SSL_TYPE_NOT_SPECIFIED= -1,
|
|
SSL_TYPE_NONE,
|
|
SSL_TYPE_ANY,
|
|
SSL_TYPE_X509,
|
|
SSL_TYPE_SPECIFIED
|
|
};
|
|
|
|
|
|
/* HFTODO - hide this if we don't want client in embedded server */
|
|
/* This structure is for every connection on both sides */
|
|
struct st_vio
|
|
{
|
|
my_socket sd; /* my_socket - real or imaginary */
|
|
HANDLE hPipe;
|
|
my_bool localhost; /* Are we from localhost? */
|
|
int fcntl_mode; /* Buffered fcntl(sd,F_GETFL) */
|
|
struct sockaddr_in local; /* Local internet address */
|
|
struct sockaddr_in remote; /* Remote internet address */
|
|
enum enum_vio_type type; /* Type of connection */
|
|
char desc[30]; /* String description */
|
|
#ifdef HAVE_VIO
|
|
/* function pointers. They are similar for socket/SSL/whatever */
|
|
void (*viodelete)(Vio*);
|
|
int (*vioerrno)(Vio*);
|
|
int (*read)(Vio*, gptr, int);
|
|
int (*write)(Vio*, const gptr, int);
|
|
int (*vioblocking)(Vio*, my_bool, my_bool *);
|
|
my_bool (*is_blocking)(Vio*);
|
|
int (*viokeepalive)(Vio*, my_bool);
|
|
int (*fastsend)(Vio*);
|
|
my_bool (*peer_addr)(Vio*, char *, uint16*);
|
|
void (*in_addr)(Vio*, struct in_addr*);
|
|
my_bool (*should_retry)(Vio*);
|
|
int (*vioclose)(Vio*);
|
|
void (*timeout)(Vio*, unsigned int timeout);
|
|
void *ssl_arg;
|
|
#ifdef HAVE_SMEM
|
|
HANDLE handle_file_map;
|
|
char *handle_map;
|
|
HANDLE event_server_wrote;
|
|
HANDLE event_server_read;
|
|
HANDLE event_client_wrote;
|
|
HANDLE event_client_read;
|
|
long shared_memory_remain;
|
|
char *shared_memory_pos;
|
|
NET *net;
|
|
#endif /* HAVE_SMEM */
|
|
#endif /* HAVE_VIO */
|
|
};
|
|
#endif /* vio_violite_h_ */
|