mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Added support for key_block_size for key and table level (WL#602)
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
This commit is contained in:
@@ -280,6 +280,7 @@ enum enum_binlog_command {
|
||||
#define HA_CREATE_USED_COMMENT (1L << 16)
|
||||
#define HA_CREATE_USED_PASSWORD (1L << 17)
|
||||
#define HA_CREATE_USED_CONNECTION (1L << 18)
|
||||
#define HA_CREATE_USED_KEY_BLOCK_SIZE (1L << 19)
|
||||
|
||||
typedef ulonglong my_xid; // this line is the same as in log_event.h
|
||||
#define MYSQL_XID_PREFIX "MySQLXid"
|
||||
@@ -653,6 +654,7 @@ typedef struct st_ha_create_information
|
||||
ulong table_options;
|
||||
ulong avg_row_length;
|
||||
ulong used_fields;
|
||||
ulong key_block_size;
|
||||
SQL_LIST merge_list;
|
||||
handlerton *db_type;
|
||||
enum row_type row_type;
|
||||
@@ -666,6 +668,15 @@ typedef struct st_ha_create_information
|
||||
bool store_on_disk; /* 1 if table stored on disk */
|
||||
} HA_CREATE_INFO;
|
||||
|
||||
|
||||
typedef struct st_key_create_information
|
||||
{
|
||||
enum ha_key_alg algorithm;
|
||||
ulong block_size;
|
||||
LEX_STRING parser_name;
|
||||
} KEY_CREATE_INFO;
|
||||
|
||||
|
||||
/*
|
||||
Class for maintaining hooks used inside operations on tables such
|
||||
as: create table functions, delete table functions, and alter table
|
||||
@@ -700,6 +711,7 @@ private:
|
||||
|
||||
typedef struct st_savepoint SAVEPOINT;
|
||||
extern ulong savepoint_alloc_size;
|
||||
extern KEY_CREATE_INFO default_key_create_info;
|
||||
|
||||
/* Forward declaration for condition pushdown to storage engine */
|
||||
typedef class Item COND;
|
||||
|
Reference in New Issue
Block a user