mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
e72124c4cc
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables. ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set) Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib) New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones) Removed compiler warnings Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag. BUILD/compile-pentium-valgrind-max: Add test of isam client/mysql.cc: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS include/my_base.h: Remove HA_EXTRA_SET_KEY_CACHE include/my_no_pthread.h: Add defines to ignore rw-locks when running without threads include/my_sys.h: Added function for multi-key-caches include/myisam.h: Added function to handle multi-key-caches include/mysql.h: Added mysql_set_server_option include/mysql_com.h: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS Added enum_mysql_set_option include/mysqld_error.h: Added error message for unknown key cache innobase/srv/srv0start.c: Removed warning that is confused for MySQL users libmysql/libmysql.c: Added mysql_set_server_option() libmysql/libmysql.def: Added mysql_set_server_option() myisam/ft_nlq_search.c: Removed compiler warning myisam/ft_static.c: Removed compiler warning and fixed wrong return value myisam/mi_check.c: Clean up multi-key-cache usage myisam/mi_checksum.c: Removed not used variable myisam/mi_close.c: keycache -> key_cache myisam/mi_delete_all.c: keycache -> key_cache myisam/mi_extra.c: keycache -> key_cache Removed HA_EXTRA_SET_KEY_CACHE myisam/mi_keycache.c: Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level myisam/mi_locking.c: Don't change key cache on unlock (must be done before) myisam/mi_open.c: Fetch key cache to use from multi_key_cache_search() myisam/mi_page.c: keycache -> key_cache myisam/mi_panic.c: keycache -> key_cache myisam/mi_preload.c: keycache -> key_cache myisam/mi_test1.c: Use KEY_CACHE_BLOCK_SIZE myisam/mi_test2.c: Always test resize_key_cache() myisam/mi_test3.c: Use KEY_CACHE_BLOCK_SIZE instead of 512 myisam/myisamchk.c: update for multiple key caches myisam/myisamdef.h: Remove reg_keycache Add unique_name_length for storing length of unique_file_name myisam/myisamlog.c: Change how end_key_cache() is called mysql-test/mysql-test-run.sh: Fixed web link Added name of failed test to abort row. mysql-test/r/alter_table.result: Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET mysql-test/r/case.result: Update result for DEFAULT CHARSET... mysql-test/r/cast.result: Update result for DEFAULT CHARSET... mysql-test/r/create.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_collate.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_latin1_de.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_many.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_mb.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_recoding.result: Update result for DEFAULT CHARSET... mysql-test/r/ctype_ucs.result: Update result for DEFAULT CHARSET... mysql-test/r/derived.result: Use STRAIGHT_JOIN to make join order predictable mysql-test/r/fulltext.result: Update result for DEFAULT CHARSET... mysql-test/r/func_str.result: Update result for DEFAULT CHARSET... mysql-test/r/func_system.result: Update result for DEFAULT CHARSET... mysql-test/r/gis-rtree.result: Update result for DEFAULT CHARSET... mysql-test/r/innodb.result: Update result for DEFAULT CHARSET... mysql-test/r/key_cache.result: Update test for new key cache syntax. Added more tests mysql-test/r/merge.result: Update result for DEFAULT CHARSET... mysql-test/r/preload.result: New syntax mysql-test/r/show_check.result: Update result for DEFAULT CHARSET... mysql-test/r/sql_mode.result: Update result for DEFAULT CHARSET... mysql-test/r/subselect.result: Update result for DEFAULT CHARSET... mysql-test/r/type_blob.result: Update result for DEFAULT CHARSET... mysql-test/r/type_enum.result: Update result for DEFAULT CHARSET... mysql-test/r/type_nchar.result: Update result for DEFAULT CHARSET... mysql-test/r/type_set.result: Update result for DEFAULT CHARSET... mysql-test/r/union.result: Use STRAIGHT_JOIN to make join order predictable mysql-test/t/alter_table.test: Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET mysql-test/t/ctype_many.test: Update result for DEFAULT CHARSET... mysql-test/t/derived.test: Use STRAIGHT_JOIN to make join order predictable mysql-test/t/isam.test: Use disable warnings for test loop mysql-test/t/join.test: Update test now when we only support 61 tables in join mysql-test/t/key_cache.test: Update test for new key cache syntax. Added more tests mysql-test/t/preload.test: Update for new syntax mysql-test/t/union.test: Use STRAIGHT_JOIN to make join order predictable mysys/Makefile.am: Added mf_keycaches.c mysys/hash.c: TRUE -> 1 mysys/mf_keycache.c: Removed compiler warnings Striped end space Fixed indentation and improved function comments TRUE -> 1 Changed parameters to end_key_cache() to make it easer to use Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data) Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks() mysys/my_bitmap.c: More debugging Safe bitmap_free() Fixed indentation mysys/my_getopt.c: Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR mysys/my_thr_init.c: Remove not used mutex THR_LOCK_keycache mysys/typelib.c: Fixed function comments sql-common/client.c: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS Fixed the multi_result flag is set also on SELECT;s sql/ha_myisam.cc: Fixed multiple key_cache handling (Now done on MyISAM level) sql/ha_myisammrg.cc: Fixed multiple key_cache handling (Now done on MyISAM level) sql/handler.cc: New multi key cache handling sql/handler.h: New multi key cache handling Added support for default character set sql/item.h: Added function cleanup() (Needed for prepared statements / cursors) sql/item_cmpfunc.h: Added cleanup function sql/item_func.cc: Indentation cleanup sql/mysql_priv.h: New multi-key-cache functions Removed LOCK_assign sql/mysqld.cc: New multi-key-cache handling Fixed that variable have_compress is set correctly sql/protocol.cc: SELECT didn't work reliable in multi-statements sql/set_var.cc: Support for new key cache variables sql/set_var.h: Support for new key cache variables sql/share/czech/errmsg.txt: New error messages sql/share/danish/errmsg.txt: New error messages sql/share/dutch/errmsg.txt: New error messages sql/share/english/errmsg.txt: New error messages sql/share/estonian/errmsg.txt: New error messages sql/share/french/errmsg.txt: New error messages sql/share/german/errmsg.txt: New error messages sql/share/greek/errmsg.txt: New error messages sql/share/hungarian/errmsg.txt: New error messages sql/share/italian/errmsg.txt: New error messages sql/share/japanese/errmsg.txt: New error messages sql/share/korean/errmsg.txt: New error messages sql/share/norwegian-ny/errmsg.txt: New error messages sql/share/norwegian/errmsg.txt: New error messages sql/share/polish/errmsg.txt: New error messages sql/share/portuguese/errmsg.txt: New error messages sql/share/romanian/errmsg.txt: New error messages sql/share/russian/errmsg.txt: New error messages sql/share/serbian/errmsg.txt: New error messages sql/share/slovak/errmsg.txt: New error messages sql/share/spanish/errmsg.txt: New error messages sql/share/swedish/errmsg.txt: New error messages sql/share/ukrainian/errmsg.txt: New error messages sql/sql_base.cc: Removed all key_cache handling (this is now done on MyISAM level) Change table_charset -> default_table_charset sql/sql_db.cc: table_charset -> default_table_charset sql/sql_delete.cc: table_charset -> default_table_charset sql/sql_lex.cc: CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS sql/sql_lex.h: New option to store a name and length sql/sql_parse.cc: Support for mysql_set_server_option() Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later) sql/sql_show.cc: Add DEFAULT before CHARSET (for table character sets) Fetch key cache variables from 'sql_key_cache' sql/sql_table.cc: table_charset -> default_table_charset New multi-key-cache handling sql/sql_test.cc: Write information from all key caches sql/sql_yacc.yy: Changed syntax for CACHE INDEX ... Force user to use DEFAULT before database/table level character sets sql/structs.h: Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache) sql/table.cc: table_charset -> default_table_charset sql/table.h: New key cache handling (this is now done in mysys/mf_keycaches.c) sql/unireg.h: A
171 lines
6.6 KiB
C
171 lines
6.6 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
|
|
/* Extra functions used by unireg library */
|
|
|
|
#ifndef _unireg_h
|
|
|
|
#ifndef NO_ALARM_LOOP
|
|
#define NO_ALARM_LOOP /* lib5 and popen can't use alarm */
|
|
#endif
|
|
|
|
/* These paths are converted to other systems (WIN95) before use */
|
|
|
|
#define LANGUAGE "english/"
|
|
#define ERRMSG_FILE "errmsg.sys"
|
|
#define TEMP_PREFIX "MY"
|
|
#define LOG_PREFIX "ML"
|
|
#define PROGDIR "bin/"
|
|
#ifndef DATADIR
|
|
#define DATADIR "data/"
|
|
#endif
|
|
#ifndef SHAREDIR
|
|
#define SHAREDIR "share/"
|
|
#endif
|
|
|
|
#define ER(X) errmesg[(X)-1000]
|
|
#define ER_SAFE(X) (((X) >= 1000 && (X) < ER_ERROR_MESSAGES + 1000) ? ER(X) : "Invalid error code")
|
|
|
|
|
|
#define ERRMAPP 1 /* Errormap f|r my_error */
|
|
#define LIBLEN FN_REFLEN-FN_LEN /* Max l{ngd p} dev */
|
|
#define MAX_DBKEY_LENGTH (FN_LEN*2+1+1+4+4) /* extra 4+4 bytes for slave tmp
|
|
* tables */
|
|
#define MAX_ALIAS_NAME 256
|
|
#define MAX_FIELD_NAME 34 /* Max colum name length +2 */
|
|
#define MAX_SYS_VAR_LENGTH 32
|
|
#define MAX_KEY 32 /* Max used keys */
|
|
#define MAX_REF_PARTS 16 /* Max parts used as ref */
|
|
#define MAX_KEY_LENGTH 1024 /* max possible key */
|
|
#if SIZEOF_OFF_T > 4
|
|
#define MAX_REFLENGTH 8 /* Max length for record ref */
|
|
#else
|
|
#define MAX_REFLENGTH 4 /* Max length for record ref */
|
|
#endif
|
|
#define MAX_HOSTNAME 61 /* len+1 in mysql.user */
|
|
|
|
#define MAX_MBWIDTH 3 /* Max multibyte sequence */
|
|
#define MAX_FIELD_CHARLENGTH 255
|
|
/* Max column width +1 */
|
|
#define MAX_FIELD_WIDTH (MAX_FIELD_CHARLENGTH*MAX_MBWIDTH+1)
|
|
|
|
#define MAX_DATE_WIDTH 10 /* YYYY-MM-DD */
|
|
#define MAX_TIME_WIDTH 23 /* -DDDDDD HH:MM:SS.###### */
|
|
#define MAX_DATETIME_FULL_WIDTH 29 /* YYYY-MM-DD HH:MM:SS.###### AM */
|
|
#define MAX_DATETIME_WIDTH 19 /* YYYY-MM-DD HH:MM:SS */
|
|
|
|
#define MAX_TABLES (sizeof(table_map)*8-3) /* Max tables in join */
|
|
#define PARAM_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-3))
|
|
#define OUTER_REF_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-2))
|
|
#define RAND_TABLE_BIT (((table_map) 1) << (sizeof(table_map)*8-1))
|
|
#define MAX_FIELDS 4096 /* Limit in the .frm file */
|
|
|
|
#define MAX_SORT_MEMORY (2048*1024-MALLOC_OVERHEAD)
|
|
#define MIN_SORT_MEMORY (32*1024-MALLOC_OVERHEAD)
|
|
|
|
/* Memory allocated when parsing a statement / saving a statement */
|
|
#define MEM_ROOT_BLOCK_SIZE 8192
|
|
#define MEM_ROOT_PREALLOC 8192
|
|
#define TRANS_MEM_ROOT_BLOCK_SIZE 4096
|
|
#define TRANS_MEM_ROOT_PREALLOC 4096
|
|
|
|
#define DEFAULT_ERROR_COUNT 64
|
|
#define DEFAULT_PREP_STMT_COUNT 64
|
|
#define EXTRA_RECORDS 10 /* Extra records in sort */
|
|
#define SCROLL_EXTRA 5 /* Extra scroll-rows. */
|
|
#define FIELD_NAME_USED ((uint) 32768) /* Bit set if fieldname used */
|
|
#define FORM_NAME_USED ((uint) 16384) /* Bit set if formname used */
|
|
#define FIELD_NR_MASK 16383 /* To get fieldnumber */
|
|
#define FERR -1 /* Error from my_functions */
|
|
#define CREATE_MODE 0 /* Default mode on new files */
|
|
#define NAMES_SEP_CHAR '\377' /* Char to sep. names */
|
|
|
|
#define READ_RECORD_BUFFER (uint) (IO_SIZE*8) /* Pointer_buffer_size */
|
|
#define DISK_BUFFER_SIZE (uint) (IO_SIZE*16) /* Size of diskbuffer */
|
|
#define POSTFIX_ERROR DBL_MAX
|
|
|
|
#define ME_INFO (ME_HOLDTANG+ME_OLDWIN+ME_NOREFRESH)
|
|
#define ME_ERROR (ME_BELL+ME_OLDWIN+ME_NOREFRESH)
|
|
#define MYF_RW MYF(MY_WME+MY_NABP) /* Vid my_read & my_write */
|
|
|
|
#define SPECIAL_USE_LOCKS 1 /* Lock used databases */
|
|
#define SPECIAL_NO_NEW_FUNC 2 /* Skip new functions */
|
|
#define SPECIAL_SKIP_SHOW_DB 4 /* Don't allow 'show db' */
|
|
#define SPECIAL_WAIT_IF_LOCKED 8 /* Wait if locked database */
|
|
#define SPECIAL_SAME_DB_NAME 16 /* form name = file name */
|
|
#define SPECIAL_ENGLISH 32 /* English error messages */
|
|
#define SPECIAL_NO_RESOLVE 64 /* Don't use gethostname */
|
|
#define SPECIAL_NO_PRIOR 128 /* Don't prioritize threads */
|
|
#define SPECIAL_BIG_SELECTS 256 /* Don't use heap tables */
|
|
#define SPECIAL_NO_HOST_CACHE 512 /* Don't cache hosts */
|
|
#define SPECIAL_SHORT_LOG_FORMAT 1024
|
|
#define SPECIAL_SAFE_MODE 2048
|
|
#define SPECIAL_LOG_QUERIES_NOT_USING_INDEXES 4096 /* Log q not using indexes */
|
|
|
|
/* Extern defines */
|
|
#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->reclength)
|
|
#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->reclength)
|
|
#define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->reclength)
|
|
#define empty_record(A) { \
|
|
restore_record((A),default_values); \
|
|
bfill((A)->null_flags,(A)->null_bytes,255);\
|
|
}
|
|
|
|
/* Defines for use with openfrm, openprt and openfrd */
|
|
|
|
#define READ_ALL 1 /* openfrm: Read all parameters */
|
|
#define CHANGE_FRM 2 /* openfrm: open .frm as O_RDWR */
|
|
#define READ_KEYINFO 4 /* L{s nyckeldata fr}n filen */
|
|
#define EXTRA_RECORD 8 /* Reservera plats f|r extra record */
|
|
#define DONT_OPEN_TABLES 8 /* Don't open database-files (frd) */
|
|
#define DONT_OPEN_MASTER_REG 16 /* Don't open first reg-file (prt) */
|
|
#define EXTRA_LONG_RECORD 16 /* Plats f|r dubbel s|k-record */
|
|
#define COMPUTE_TYPES 32 /* Kontrollera type f|r f{ltena */
|
|
#define SEARCH_PRG 64 /* S|k efter registret i 'prg_dev' */
|
|
#define READ_USED_NAMES 128 /* L{s anv{nda formul{rnamn */
|
|
#define DONT_GIVE_ERROR 256 /* Don't do frm_error on openfrm */
|
|
#define READ_SCREENS 1024 /* Read screens, info and helpfile */
|
|
#define DELAYED_OPEN 4096 /* Open table later */
|
|
|
|
#define SC_INFO_LENGTH 4 /* Form format constant */
|
|
#define TE_INFO_LENGTH 3
|
|
#define MTYP_NOEMPTY_BIT 128
|
|
|
|
/*
|
|
Minimum length pattern before Turbo Boyer-Moore is used
|
|
for SELECT "text" LIKE "%pattern%", excluding the two
|
|
wildcards in class Item_func_like.
|
|
*/
|
|
#define MIN_TURBOBM_PATTERN_LEN 3
|
|
|
|
/*
|
|
Defines for binary logging.
|
|
Do not decrease the value of BIN_LOG_HEADER_SIZE.
|
|
Do not even increase it before checking code.
|
|
*/
|
|
|
|
#define BIN_LOG_HEADER_SIZE 4
|
|
#define FLOATING_POINT_BUFFER 331
|
|
|
|
#define DEFAULT_KEY_CACHE_NAME "default"
|
|
|
|
/* Include prototypes for unireg */
|
|
|
|
#include "mysqld_error.h"
|
|
#include "structs.h" /* All structs we need */
|
|
|
|
#endif
|