mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
d50ae16569
Added support for key_block_size to MyISAM. Simplify interface to 'new Key' to make it easier to add new key options. mysqld option --new is used to define where key options are printed. (In 5.3 we should move all key options to after key part definition to avoid problem with reserved names) Fixed some compiler warnings and a memory leak in ssl include/my_base.h: Added flag to check if block size for key was secified include/my_sys.h: Added new support function to round up to a power of two include/myisam.h: Rename block_size -> block_size_index to avoid confusion with 'block_size' include/violite.h: Added function to free memory after new_VioSSLAcceptorFd (Will rename all vio_ssl functions in a future changeset) mysql-test/mysql-test-run.pl: Don't print port number info when we use --extern mysql-test/r/myisam.result: Added test for key_block_size mysql-test/t/myisam.test: Added test for key_block_size mysys/mf_keycache.c: Simplify code mysys/my_bit.c: Added new support function to round up to a power of two sql/ha_myisam.cc: Tell MyISAM to use the specified key_block_size MyISAM also updates the global key_block_size from the used values. sql/handler.cc: Added 'default_key_create_info' to be used as 'dummy' argument to 'new Key' sql/handler.h: Added KEY_CREATE_INFO, to be used as for general options for KEY's sql/item_func.h: Removed compiler warning sql/lex.h: Added new symbol sql/mysqld.cc: Fixed memory leak in ssl (new_VioSSLAcceptorFd) sql/sql_class.h: Change 'new Key' to use KEY_CREATE_INFO instead of 'algoritm', parser, key_page_size. This makes it easier to add new key options in the future. sql/sql_lex.h: Added key create options sql/sql_parse.cc: Use new interface to 'new Key' sql/sql_show.cc: Added support for key_block_size If --new is used, key options are printed after the key part definition. sql/sql_table.cc: Use new interface to 'new Key' Add support for key_block_size sql/sql_yacc.yy: Add support for key_block_size Allow key options before and after key_parts (In future they should be always after the key_part defintion) Use new interface to 'new Key' sql/structs.h: Added block_size to keys sql/table.cc: Remmeber and read key_block_size for table and key level sql/table.h: Added default key_block_size for table sql/unireg.cc: Remember key_block_size for key storage/myisam/ft_eval.c: Set block_length to 0 to get default key page size storage/myisam/ft_test1.c: Set block_length to 0 to get default key page size storage/myisam/mi_check.c: block_size -> block_size_index storage/myisam/mi_create.c: Added support for block size per key. Block size is rounded up to next power of two and enforced between MIN and MAX KEY_BLOCK_LENGTH. Align start of key block to start at an even offset of max_key_block_length to ensure key cache works good if all key pages are of same size. storage/myisam/mi_open.c: block_size -> block_size_index storage/myisam/mi_page.c: block_size -> block_size_index storage/myisam/mi_test1.c: Set block_length to 0 to get default key page size storage/myisam/mi_test2.c: Set block_length to 0 to get default key page size storage/myisam/mi_test3.c: Set block_length to 0 to get default key page size storage/myisam/myisamdef.h: block_size -> block_size_index to avoid confusion with 'block_size' in MySQL Added block_size as argument to MI_BLOCK_SIZE Added missing prototypes to get rid of compiler warnings storage/myisam/myisampack.c: Removed compiler warning block_size -> block_size_index vio/viosslfactories.c: Fixed memory leak in ssl (new_VioSSLAcceptorFd) mysql-test/r/myisam-system.result: New BitKeeper file ``mysql-test/r/myisam-system.result'' mysql-test/t/myisam-system.test: New BitKeeper file ``mysql-test/t/myisam-system.test''
222 lines
7.9 KiB
C
222 lines
7.9 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
|
|
};
|
|
|
|
|
|
#define VIO_LOCALHOST 1 /* a localhost connection */
|
|
#define VIO_BUFFERED_READ 2 /* use buffered read */
|
|
#define VIO_READ_BUFFER_SIZE 16384 /* size of read buffer */
|
|
|
|
Vio* vio_new(my_socket sd, enum enum_vio_type type, uint flags);
|
|
#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,
|
|
HANDLE event_conn_closed);
|
|
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);
|
|
void vio_reset(Vio* vio, enum enum_vio_type type,
|
|
my_socket sd, HANDLE hPipe, uint flags);
|
|
int vio_read(Vio *vio, gptr buf, int size);
|
|
int vio_read_buff(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);
|
|
/* Check that operation was timed out */
|
|
my_bool vio_was_interrupted(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 which, uint timeout);
|
|
|
|
#ifdef HAVE_OPENSSL
|
|
#include <openssl/opensslv.h>
|
|
#if OPENSSL_VERSION_NUMBER < 0x0090700f
|
|
#define DES_cblock des_cblock
|
|
#define DES_key_schedule des_key_schedule
|
|
#define DES_set_key_unchecked(k,ks) des_set_key_unchecked((k),*(ks))
|
|
#define DES_ede3_cbc_encrypt(i,o,l,k1,k2,k3,iv,e) des_ede3_cbc_encrypt((i),(o),(l),*(k1),*(k2),*(k3),(iv),(e))
|
|
#endif
|
|
|
|
#define HEADER_DES_LOCL_H dummy_something
|
|
#define YASSL_MYSQL_COMPATIBLE
|
|
#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);
|
|
void free_vio_ssl_acceptor_fd(struct st_VioSSLAcceptorFd *fd);
|
|
#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(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_was_interrupted(vio) (vio)->was_interrupted(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, which, seconds) (vio)->timeout(vio, which, seconds)
|
|
#endif /* !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 */
|
|
char *read_buffer; /* buffer for vio_read_buff */
|
|
char *read_pos; /* start of unfetched data in the
|
|
read buffer */
|
|
char *read_end; /* end of unfetched data */
|
|
/* 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*);
|
|
my_bool (*was_interrupted)(Vio*);
|
|
int (*vioclose)(Vio*);
|
|
void (*timeout)(Vio*, unsigned int which, 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;
|
|
HANDLE event_conn_closed;
|
|
long shared_memory_remain;
|
|
char *shared_memory_pos;
|
|
NET *net;
|
|
#endif /* HAVE_SMEM */
|
|
};
|
|
#endif /* vio_violite_h_ */
|