mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
32b28f9298
Final version of patch. Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW() clauses for TIMESTAMP field definition. Current implementation allows only one such field per table and uses several unireg types for storing info about this properties of field. It should be replaced with better implementation when new .frm format is introduced. include/mysqld_error.h: Added error codes for case when we have more than one column with NOW() in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. mysql-test/r/create.result: Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with non-TIMESTAMP fields. mysql-test/r/show_check.result: Updated test results to reflect new default look of TIMESTAMP fields in SHOW CREATE TABLE. mysql-test/r/system_mysql_db.result: Updated test results to reflect new default look of TIMESTAMP fields in SHOW CREATE TABLE. mysql-test/r/type_ranges.result: Updated test results to reflect new default look of TIMESTAMP fields in SHOW COLUMNS. mysql-test/r/type_timestamp.result: Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP fields definitions. mysql-test/t/create.test: Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with non-TIMESTAMP fields. mysql-test/t/type_timestamp.test: Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP fields definitions. sql/field.cc: Added support for various combinations of DEFAULT and ON UPDATE clauses for TIMESTAMP field. Setting TABLE::timestamp* members for TIMESTAMP fields with auto-set option taking into account their unireg type (which corresponds to various DEFAULT/ON UPDATE values combinations). Replaced TABLE::time_stamp with TABLE::timestamp_default_now/on_update_now couple moved their setup to separate method set_timestamp_offsets(), which now is called from open_table instead of Field_timestamp cons. sql/field.h: Added more unireg types for handling of DEFAULT NOW() and ON UPDATE NOW() for TIMESTAMP fields. Fixed value corresponding to DEFAULT item for TIMESTAMP field. sql/ha_berkeley.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_heap.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_innodb.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_isam.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_isammrg.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_myisam.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/ha_myisammrg.cc: Now TIMESTAMP column with auto-set property could be updated during INSERT or/and UPDATE independently. sql/item_func.h: We need to distinguish NOW() from other function for using in DEFAULT and in ON UPDATE clauses. sql/item_timefunc.h: We need to distinguish NOW() from other function for using in DEFAULT and in ON UPDATE clauses. sql/mysql_priv.h: Added parameter for ON UPDATE value to add_field_to_list() function. sql/share/czech/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/danish/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/dutch/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/english/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/estonian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/french/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/german/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/greek/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/hungarian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/italian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/japanese/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/korean/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/norwegian-ny/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/norwegian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/polish/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/portuguese/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/romanian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/russian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/serbian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/slovak/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/spanish/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/swedish/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/share/ukrainian/errmsg.txt: Added error messages for case when we have more than one column with NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE clause with wrong type. sql/sql_base.cc: Added setup of TABLE::timestamp_default_now/on_update_now pair for each statement to open_table(). sql/sql_insert.cc: Using TABLE::timestamp_default_now/on_update_now pair instead of old TABLE::time_stamp. Added check for case then REPLACE could not be converted to UPDATE because of different DEFAULT/ON UPDATE values for TIMESTAMP field. sql/sql_lex.h: Added member for value used in ON UPDATE clause to st_lex. sql/sql_load.cc: Using TABLE::timestamp_default_now/on_update_now pair instead of old TABLE::time_stamp. We don't need to restore these members since they are set up for each statement in open_table(). sql/sql_parse.cc: Added handling of DEFAULT NOW() and ON UPDATE NOW() clauses for TIMESTAMP fields to add_field_to_list() function. sql/sql_show.cc: Added support for DEFAULT CURRENT_TIMESTAMP (aka NOW() ) and ON UPDATE CURRENT_TIMESTAMP to SHOW CREATE TABLE and SHOW COLUMNS. sql/sql_table.cc: mysql_create_table() function - added check for number of TIMESTAMP fields with auto-set values and replacing of old style TIMESTAMPs with their newer analogs. mysql_alter_table(): Using TABLE::timestamp_default_now/on_update_now pair instead of old TABLE::time_stamp. We don't need to restore these members since they are set up for each statement in open_table(). sql/sql_update.cc: Left only setting of TABLE::timestamp_default_now/on_update_now to 0 since they should be already set up in open_table(). sql/sql_yacc.yy: Added support for DEFAULT NOW() and ON UPDATE NOW() in field definitions. sql/table.h: Replaced TABLE::time_stamp withTABLE::timestamp_default_now/timestamp_on_update_now pair which allows to distinguish TIMESTAMP's with various DEFAULT/ON UPDATE clauses and optimize checks if TIMESTAMP field should be set to NOW() in handlers. sql/unireg.cc: Now we are marking only TIMESTAMP fields with NOW() as default or as on update value as special field for unireg.
211 lines
7.6 KiB
C++
211 lines
7.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 */
|
|
|
|
|
|
/* Structs that defines the TABLE */
|
|
|
|
class Item; /* Needed by ORDER */
|
|
class GRANT_TABLE;
|
|
class st_select_lex_unit;
|
|
|
|
/* Order clause list element */
|
|
|
|
typedef struct st_order {
|
|
struct st_order *next;
|
|
Item **item; /* Point at item in select fields */
|
|
bool asc; /* true if ascending */
|
|
bool free_me; /* true if item isn't shared */
|
|
bool in_field_list; /* true if in select field list */
|
|
Field *field; /* If tmp-table group */
|
|
char *buff; /* If tmp-table group */
|
|
table_map used,depend_map;
|
|
} ORDER;
|
|
|
|
typedef struct st_grant_info
|
|
{
|
|
GRANT_TABLE *grant_table;
|
|
uint version;
|
|
ulong privilege;
|
|
ulong want_privilege;
|
|
} GRANT_INFO;
|
|
|
|
enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2};
|
|
|
|
typedef struct st_filesort_info
|
|
{
|
|
IO_CACHE *io_cache; /* If sorted through filebyte */
|
|
byte *addon_buf; /* Pointer to a buffer if sorted with fields */
|
|
uint addon_length; /* Length of the buffer */
|
|
struct st_sort_addon_field *addon_field; /* Pointer to the fields info */
|
|
void (*unpack)(struct st_sort_addon_field *, byte *); /* To unpack back */
|
|
byte *record_pointers; /* If sorted in memory */
|
|
ha_rows found_records; /* How many records in sort */
|
|
} FILESORT_INFO;
|
|
|
|
|
|
/* Table cache entry struct */
|
|
|
|
class Field_timestamp;
|
|
class Field_blob;
|
|
|
|
struct st_table {
|
|
handler *file;
|
|
Field **field; /* Pointer to fields */
|
|
Field_blob **blob_field; /* Pointer to blob fields */
|
|
/* hash of field names (contains pointers to elements of field array) */
|
|
HASH name_hash;
|
|
byte *record[2]; /* Pointer to records */
|
|
byte *default_values; /* Default values for INSERT */
|
|
byte *insert_values; /* used by INSERT ... UPDATE */
|
|
uint fields; /* field count */
|
|
uint reclength; /* Recordlength */
|
|
uint rec_buff_length;
|
|
uint keys,key_parts,primary_key,max_key_length,max_unique_length;
|
|
uint total_key_length;
|
|
uint uniques;
|
|
uint null_fields; /* number of null fields */
|
|
uint blob_fields; /* number of blob fields */
|
|
key_map keys_in_use, keys_for_keyread, read_only_keys;
|
|
key_map quick_keys, used_keys, keys_in_use_for_query;
|
|
KEY *key_info; /* data of keys in database */
|
|
TYPELIB keynames; /* Pointers to keynames */
|
|
ha_rows max_rows; /* create information */
|
|
ha_rows min_rows; /* create information */
|
|
ulong avg_row_length; /* create information */
|
|
ulong raid_chunksize;
|
|
TYPELIB fieldnames; /* Pointer to fieldnames */
|
|
TYPELIB *intervals; /* pointer to interval info */
|
|
enum db_type db_type; /* table_type for handler */
|
|
enum row_type row_type; /* How rows are stored */
|
|
uint db_create_options; /* Create options from database */
|
|
uint db_options_in_use; /* Options in use */
|
|
uint db_record_offset; /* if HA_REC_IN_SEQ */
|
|
uint db_stat; /* mode of file as in handler.h */
|
|
uint raid_type,raid_chunks;
|
|
uint status; /* Used by postfix.. */
|
|
uint system; /* Set if system record */
|
|
|
|
/*
|
|
These two members hold offset in record + 1 for TIMESTAMP field
|
|
with NOW() as default value or/and with ON UPDATE NOW() option.
|
|
If 0 then such field is absent in this table or auto-set for default
|
|
or/and on update should be temporaly disabled for some reason.
|
|
These values is setup to offset value for each statement in open_table()
|
|
and turned off in statement processing code (see mysql_update as example).
|
|
*/
|
|
ulong timestamp_default_now;
|
|
ulong timestamp_on_update_now;
|
|
/* Index of auto-updated TIMESTAMP field in field array */
|
|
uint timestamp_field_offset;
|
|
|
|
uint next_number_index;
|
|
uint blob_ptr_size; /* 4 or 8 */
|
|
uint next_number_key_offset;
|
|
int current_lock; /* Type of lock on table */
|
|
enum tmp_table_type tmp_table;
|
|
my_bool copy_blobs; /* copy_blobs when storing */
|
|
my_bool null_row; /* All columns are null */
|
|
my_bool maybe_null,outer_join; /* Used with OUTER JOIN */
|
|
my_bool force_index;
|
|
my_bool distinct,const_table,no_rows;
|
|
my_bool key_read, bulk_insert;
|
|
my_bool crypted;
|
|
my_bool db_low_byte_first; /* Portable row format */
|
|
my_bool locked_by_flush;
|
|
my_bool locked_by_name;
|
|
my_bool fulltext_searched;
|
|
my_bool crashed;
|
|
my_bool is_view;
|
|
my_bool no_keyread, no_cache;
|
|
my_bool clear_query_id; /* To reset query_id for tables and cols */
|
|
my_bool auto_increment_field_not_null;
|
|
Field *next_number_field, /* Set if next_number is activated */
|
|
*found_next_number_field, /* Set on open */
|
|
*rowid_field;
|
|
Field_timestamp *timestamp_field;
|
|
my_string comment; /* Comment about table */
|
|
CHARSET_INFO *table_charset; /* Default charset of string fields */
|
|
REGINFO reginfo; /* field connections */
|
|
MEM_ROOT mem_root;
|
|
GRANT_INFO grant;
|
|
|
|
char *table_cache_key;
|
|
char *table_name,*real_name,*path;
|
|
uint key_length; /* Length of key */
|
|
uint tablenr,used_fields,null_bytes;
|
|
table_map map; /* ID bit of table (1,2,4,8,16...) */
|
|
ulong version,flush_version;
|
|
uchar *null_flags;
|
|
FILESORT_INFO sort;
|
|
ORDER *group;
|
|
ha_rows quick_rows[MAX_KEY];
|
|
uint quick_key_parts[MAX_KEY];
|
|
key_part_map const_key_parts[MAX_KEY];
|
|
ulong query_id;
|
|
|
|
union /* Temporary variables */
|
|
{
|
|
uint temp_pool_slot; /* Used by intern temp tables */
|
|
struct st_table_list *pos_in_table_list;
|
|
};
|
|
/* number of select if it is derived table */
|
|
uint derived_select_number;
|
|
THD *in_use; /* Which thread uses this */
|
|
struct st_table *next,*prev;
|
|
};
|
|
|
|
|
|
#define JOIN_TYPE_LEFT 1
|
|
#define JOIN_TYPE_RIGHT 2
|
|
|
|
typedef struct st_table_list
|
|
{
|
|
struct st_table_list *next;
|
|
char *db, *alias, *real_name;
|
|
char *option; /* Used by cache index */
|
|
Item *on_expr; /* Used with outer join */
|
|
struct st_table_list *natural_join; /* natural join on this table*/
|
|
/* ... join ... USE INDEX ... IGNORE INDEX */
|
|
List<String> *use_index, *ignore_index;
|
|
TABLE *table; /* opened table */
|
|
st_table_list *table_list; /* pointer to node of list of all tables */
|
|
class st_select_lex_unit *derived; /* SELECT_LEX_UNIT of derived table */
|
|
GRANT_INFO grant;
|
|
thr_lock_type lock_type;
|
|
uint outer_join; /* Which join type */
|
|
uint shared; /* Used in multi-upd */
|
|
uint32 db_length, real_name_length;
|
|
bool straight; /* optimize with prev table */
|
|
bool updating; /* for replicate-do/ignore table */
|
|
bool force_index; /* Prefer index over table scan */
|
|
bool ignore_leaves; /* Preload only non-leaf nodes */
|
|
} TABLE_LIST;
|
|
|
|
typedef struct st_changed_table_list
|
|
{
|
|
struct st_changed_table_list *next;
|
|
char *key;
|
|
uint32 key_length;
|
|
} CHANGED_TABLE_LIST;
|
|
|
|
typedef struct st_open_table_list
|
|
{
|
|
struct st_open_table_list *next;
|
|
char *db,*table;
|
|
uint32 in_use,locked;
|
|
} OPEN_TABLE_LIST;
|
|
|
|
|