diff options
| author | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-11-18 13:47:27 +0200 |
| commit | cab1dc628c116f042a3fd8dbc505f7ca2df599a3 (patch) | |
| tree | 0a23d90c946c5f05a8c160fc7c6ef3f05505fc79 /sql/unireg.h | |
| parent | f277c9f88a4a2e392e44cfdb6b3f4785b6c730d0 (diff) | |
| download | mariadb-git-cab1dc628c116f042a3fd8dbc505f7ca2df599a3.tar.gz | |
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
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.
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 8d62959317d..2da25edd72a 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -68,7 +68,8 @@ #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-2) /* Max tables in join */ +#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 */ @@ -145,10 +146,10 @@ #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. - */ + 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 /* @@ -160,7 +161,9 @@ #define BIN_LOG_HEADER_SIZE 4 #define FLOATING_POINT_BUFFER 331 - /* Include prototypes for unireg */ +#define DEFAULT_KEY_CACHE_NAME "default" + +/* Include prototypes for unireg */ #include "mysqld_error.h" #include "structs.h" /* All structs we need */ |