mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 11:31:51 +01:00
bee5d9d462
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats. This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings Changed flag argument to str_to_TIME() and get_date() from bool to uint Removed THD from str_to_xxxx functions and Item class. Fixed core dump when doing --print-defaults Move some common string functions to strfunc.cc Dates as strings are now of type my_charset_bin instead of default_charset() Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128) Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums Renamed some TIMESTAMP_xxx enums to more appropriate names Use defines instead of integers for date/time/datetime string lengths Added to build system and use the new my_strtoll10() function. BUILD/compile-pentium-valgrind-max: Remove double printing of warning VC++Files/libmysqld/libmysqld.dsp: Added strfunc.cc VC++Files/sql/mysqld.dsp: Added strfunc.cc VC++Files/sql/mysqldmax.dsp: Added strfunc.cc VC++Files/strings/strings.dsp: added my_strtoll10.c include/m_ctype.h: Removed MY_LEX_FOUND_IDENT (not used) include/m_string.h: Added my_strtoll10() include/mysqld_error.h: simplified 'wrong xxx name' error messages include/sql_state.h: simplified 'wrong xxx name' error messages libmysqld/Makefile.am: Added strfunc.cc mysql-test/mysql-test-run.sh: Simplified some options changed $@ to "$@" in an attempt to handle options with space (Didn't succeed; Problem will disappear when mysql-test-run is rewritten in C) mysql-test/r/ctype_latin1_de.result: Added new tests mysql-test/r/ctype_recoding.result: Extended tests mysql-test/r/date_formats.result: Cleaned up tests Disabled some tests that can't yet be run mysql-test/r/func_compress.result: New error message mysql-test/r/rpl_temporary.result: Added new test mysql-test/t/create.test: Changed error numbers mysql-test/t/ctype_latin1_de.test: New tests mysql-test/t/ctype_recoding.test: Extended tests mysql-test/t/date_formats-master.opt: Removed datetime_format as we can't handle options with space in mysql-test-run mysql-test/t/date_formats.test: Cleaned up tests Disabled some tests that can't yet be run mysql-test/t/rpl_temporary.test: Added testing of open temporary table on slave shutdown mysql-test/t/symlink.test: Fixed error numbers mysys/default.c: Fixed core dump when doing --print-defaults sql/Makefile.am: Added strfunc.cc sql/derror.cc: Fixed compiler warning sql/field.cc: Changed argument to str_to_TIME() from bool to uint Removed THD argument from str_to_TIME() Moved find_enum() and find_set() to strfunc.cc sql/field.h: Changed type of last argument to get_date() to be able to handle more options sql/init.cc: Remove not used variable dayord sql/item.cc: Changed type of last argument to get_date() to be able to handle more options Removed THD* element from item. Don't use make_date_time() to generate date/time/datetimes sql/item.h: Changed type of last argument to get_date() to be able to handle more options Removed THD* from Item sql/item_create.cc: Indentation cleanup sql/item_func.cc: Use new find_type() sql/item_func.h: Changed type of last argument to get_date() to be able to handle more options sql/item_strfunc.h: space change sql/item_timefunc.cc: Changed month_names[] to be easier to use Moved check_names[] to strfunc.cc Added back old make_datetime() function Optimized extract_date_time() Use my_strtoll10() insetad of my_strntoll() Optimized make_date_time() Replaced short variable names with long ones. Use new functions make_time(), make_date() and make_datetime() Dates as strings are now of type my_charset_bin instead of default_charset() Changed Item_func_str_to_date() to by default return a date. sql/item_timefunc.h: Changed charset for date string from default_charset() to my_charset_bin Changed type of last argument to get_date() to be able to handle more options Use defines instead of integers for date/time/datetime string lengths sql/mysql_priv.h: Fixed/added new prototypes sql/mysqld.cc: Removed opt_datetime_format_names Cleaned up handling of date_time format handling. (Fixed core dump when mysqld had error on startup) Removed some unnecessary double init of collation variables sql/protocol.cc: Changed back protocol functions to always return dates in ISO format sql/set_var.cc: Added variables time_format, date_format and datetime_format This had to be recoded becasue checking was done in 'update' method and not in 'check' method. sql/set_var.h: Removed class sys_var_datetime_format() as this defined a variable (which doesn't work) instead of updating a variable sql/share/czech/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/danish/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/dutch/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/english/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/estonian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/french/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/german/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/greek/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/hungarian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/italian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/japanese/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/korean/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/norwegian-ny/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/norwegian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/polish/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/portuguese/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/romanian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/russian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/serbian/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/slovak/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/spanish/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/swedish/errmsg.txt: simplified 'wrong xxx name' error messages sql/share/ukrainian/errmsg.txt: simplified 'wrong xxx name' error messages sql/sql_base.cc: Use new find_type() sql/sql_class.cc: Allocate/free date_time format variables sql/sql_class.h: Define datetime_format variables sql/sql_db.cc: Use new ER_WRONG_NAME error sql/sql_lex.cc: Change lex to generate IDENT_QUOTED for quoted identifiers or identifers that are using characters > 128. This enabled us to not have to copy and convert the identifier to utf8 for simpe identifiers sql/sql_parse.cc: Use new ER_WRONG_NAME error Use new find_type() function sql/sql_prepare.cc: Use new defines sql/sql_table.cc: Use new ER_WRONG_NAME error sql/sql_yacc.yy: Don't copy and convert simple identifiers to utf8. Replace __FORMAT_TYPE defines with TIMESTAMP... defines sql/structs.h: Renamed DATETIME_FORMAT to DATE_TIME format to indicate that it's for date/time/datetime formats Renamed WRONT_TIMESTAMP_FULL to TIMESTAMP_DATETIME_ERROR and TIMESTAMP_FULL to TIMESTAMP_DATETIME Added KNOWN_DATE_TIME_FORMAT struct for Item_func_get_format sql/time.cc: Prepare str_to_TIME and str_to_time() for general date/time handling Removed THD from str_to... functions Renamed date/time/datetime functions to use 'date_time' instead of 'datetime' Added functions to make and copy DATE_TIME_FORMAT's Added trivial functions 'make_time()', 'make_date()' and 'make_datetime()' strings/Makefile.am: Added my_strtoll10() strings/ctype-bin.c: Cleared upper part of binary state map to be able to easily identify simple identifiers strings/my_vsnprintf.c: F
228 lines
7 KiB
C++
228 lines
7 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 */
|
|
|
|
|
|
/* The old structures from unireg */
|
|
|
|
struct st_table;
|
|
class Field;
|
|
|
|
typedef struct lex_string {
|
|
char *str;
|
|
uint length;
|
|
} LEX_STRING;
|
|
|
|
|
|
typedef struct st_date_time_format {
|
|
uchar positions[8];
|
|
char time_separator; /* Separator between hour and minute */
|
|
uint flag; /* For future */
|
|
LEX_STRING format;
|
|
} DATE_TIME_FORMAT;
|
|
|
|
|
|
typedef struct st_keyfile_info { /* used with ha_info() */
|
|
byte ref[MAX_REFLENGTH]; /* Pointer to current row */
|
|
byte dupp_ref[MAX_REFLENGTH]; /* Pointer to dupp row */
|
|
uint ref_length; /* Length of ref (1-8) */
|
|
uint block_size; /* index block size */
|
|
File filenr; /* (uniq) filenr for table */
|
|
ha_rows records; /* Records i datafilen */
|
|
ha_rows deleted; /* Deleted records */
|
|
ulonglong data_file_length; /* Length off data file */
|
|
ulonglong max_data_file_length; /* Length off data file */
|
|
ulonglong index_file_length;
|
|
ulonglong max_index_file_length;
|
|
ulonglong delete_length; /* Free bytes */
|
|
ulonglong auto_increment_value;
|
|
int errkey,sortkey; /* Last errorkey and sorted by */
|
|
time_t create_time; /* When table was created */
|
|
time_t check_time;
|
|
time_t update_time;
|
|
ulong mean_rec_length; /* physical reclength */
|
|
} KEYFILE_INFO;
|
|
|
|
|
|
typedef struct st_key_part_info { /* Info about a key part */
|
|
Field *field;
|
|
uint offset; /* offset in record (from 0) */
|
|
uint null_offset; /* Offset to null_bit in record */
|
|
uint16 length; /* Length of key_part */
|
|
uint16 store_length;
|
|
uint16 key_type;
|
|
uint16 fieldnr; /* Fieldnum in UNIREG */
|
|
uint8 key_part_flag; /* 0 or HA_REVERSE_SORT */
|
|
uint8 type;
|
|
uint8 null_bit; /* Position to null_bit */
|
|
} KEY_PART_INFO ;
|
|
|
|
|
|
typedef struct st_key {
|
|
uint key_length; /* Tot length of key */
|
|
uint flags; /* dupp key and pack flags */
|
|
uint key_parts; /* How many key_parts */
|
|
uint extra_length;
|
|
uint usable_key_parts; /* Should normally be = key_parts */
|
|
enum ha_key_alg algorithm;
|
|
KEY_PART_INFO *key_part;
|
|
char *name; /* Name of key */
|
|
ulong *rec_per_key; /* Key part distribution */
|
|
union {
|
|
int bdb_return_if_eq;
|
|
} handler;
|
|
} KEY;
|
|
|
|
|
|
struct st_join_table;
|
|
|
|
typedef struct st_reginfo { /* Extra info about reg */
|
|
struct st_join_table *join_tab; /* Used by SELECT() */
|
|
enum thr_lock_type lock_type; /* How database is used */
|
|
bool not_exists_optimize;
|
|
bool impossible_range;
|
|
} REGINFO;
|
|
|
|
|
|
struct st_read_record; /* For referense later */
|
|
class SQL_SELECT;
|
|
class THD;
|
|
class handler;
|
|
|
|
typedef struct st_read_record { /* Parameter to read_record */
|
|
struct st_table *table; /* Head-form */
|
|
handler *file;
|
|
struct st_table **forms; /* head and ref forms */
|
|
int (*read_record)(struct st_read_record *);
|
|
THD *thd;
|
|
SQL_SELECT *select;
|
|
uint cache_records;
|
|
uint ref_length,struct_length,reclength,rec_cache_size,error_offset;
|
|
uint index;
|
|
byte *ref_pos; /* pointer to form->refpos */
|
|
byte *record;
|
|
byte *rec_buf; /* to read field values after filesort */
|
|
byte *cache,*cache_pos,*cache_end,*read_positions;
|
|
IO_CACHE *io_cache;
|
|
bool print_error, ignore_not_found_rows;
|
|
} READ_RECORD;
|
|
|
|
|
|
enum timestamp_type
|
|
{
|
|
TIMESTAMP_NONE= -2, TIMESTAMP_DATETIME_ERROR= -1,
|
|
TIMESTAMP_DATE= 0, TIMESTAMP_DATETIME= 1, TIMESTAMP_TIME= 2
|
|
};
|
|
|
|
/* Parameters to str_to_TIME */
|
|
#define TIME_FUZZY_DATE 1
|
|
#define TIME_DATETIME_ONLY 2
|
|
|
|
|
|
typedef struct st_time {
|
|
uint year,month,day,hour,minute,second;
|
|
ulong second_part;
|
|
bool neg;
|
|
timestamp_type time_type;
|
|
} TIME;
|
|
|
|
|
|
typedef struct {
|
|
long year,month,day,hour,minute,second,second_part;
|
|
bool neg;
|
|
} INTERVAL;
|
|
|
|
|
|
typedef struct st_known_date_time_format {
|
|
const char *format_name;
|
|
const char *date_format;
|
|
const char *datetime_format;
|
|
const char *time_format;
|
|
} KNOWN_DATE_TIME_FORMAT;
|
|
|
|
|
|
enum SHOW_TYPE
|
|
{
|
|
SHOW_UNDEF,
|
|
SHOW_LONG, SHOW_LONGLONG, SHOW_INT, SHOW_CHAR, SHOW_CHAR_PTR, SHOW_BOOL,
|
|
SHOW_MY_BOOL, SHOW_OPENTABLES, SHOW_STARTTIME, SHOW_QUESTION,
|
|
SHOW_LONG_CONST, SHOW_INT_CONST, SHOW_HAVE, SHOW_SYS, SHOW_HA_ROWS,
|
|
#ifdef HAVE_OPENSSL
|
|
SHOW_SSL_CTX_SESS_ACCEPT, SHOW_SSL_CTX_SESS_ACCEPT_GOOD,
|
|
SHOW_SSL_GET_VERSION, SHOW_SSL_CTX_GET_SESSION_CACHE_MODE,
|
|
SHOW_SSL_CTX_SESS_CB_HITS, SHOW_SSL_CTX_SESS_ACCEPT_RENEGOTIATE,
|
|
SHOW_SSL_CTX_SESS_NUMBER, SHOW_SSL_SESSION_REUSED,
|
|
SHOW_SSL_CTX_SESS_GET_CACHE_SIZE, SHOW_SSL_GET_CIPHER,
|
|
SHOW_SSL_GET_DEFAULT_TIMEOUT, SHOW_SSL_GET_VERIFY_MODE,
|
|
SHOW_SSL_CTX_GET_VERIFY_MODE, SHOW_SSL_GET_VERIFY_DEPTH,
|
|
SHOW_SSL_CTX_GET_VERIFY_DEPTH, SHOW_SSL_CTX_SESS_CONNECT,
|
|
SHOW_SSL_CTX_SESS_CONNECT_RENEGOTIATE, SHOW_SSL_CTX_SESS_CONNECT_GOOD,
|
|
SHOW_SSL_CTX_SESS_HITS, SHOW_SSL_CTX_SESS_MISSES,
|
|
SHOW_SSL_CTX_SESS_TIMEOUTS, SHOW_SSL_CTX_SESS_CACHE_FULL,
|
|
SHOW_SSL_GET_CIPHER_LIST,
|
|
#endif /* HAVE_OPENSSL */
|
|
SHOW_RPL_STATUS, SHOW_SLAVE_RUNNING
|
|
};
|
|
|
|
enum SHOW_COMP_OPTION { SHOW_OPTION_YES, SHOW_OPTION_NO, SHOW_OPTION_DISABLED};
|
|
|
|
extern const char *show_comp_option_name[];
|
|
|
|
typedef int *(*update_var)(THD *, struct show_var_st *);
|
|
|
|
|
|
typedef struct show_var_st {
|
|
const char *name;
|
|
char *value;
|
|
SHOW_TYPE type;
|
|
} SHOW_VAR;
|
|
|
|
|
|
typedef struct st_lex_user {
|
|
LEX_STRING user, host, password;
|
|
} LEX_USER;
|
|
|
|
|
|
typedef struct user_resources {
|
|
uint questions, updates, connections, bits;
|
|
} USER_RESOURCES;
|
|
|
|
typedef struct user_conn {
|
|
char *user, *host;
|
|
uint len, connections, conn_per_hour, updates, questions, user_len;
|
|
USER_RESOURCES user_resources;
|
|
time_t intime;
|
|
} USER_CONN;
|
|
/* Bits in form->update */
|
|
#define REG_MAKE_DUPP 1 /* Make a copy of record when read */
|
|
#define REG_NEW_RECORD 2 /* Write a new record if not found */
|
|
#define REG_UPDATE 4 /* Uppdate record */
|
|
#define REG_DELETE 8 /* Delete found record */
|
|
#define REG_PROG 16 /* User is updateing database */
|
|
#define REG_CLEAR_AFTER_WRITE 32
|
|
#define REG_MAY_BE_UPDATED 64
|
|
#define REG_AUTO_UPDATE 64 /* Used in D-forms for scroll-tables */
|
|
#define REG_OVERWRITE 128
|
|
#define REG_SKIP_DUP 256
|
|
|
|
/* Bits in form->status */
|
|
#define STATUS_NO_RECORD (1+2) /* Record isn't usably */
|
|
#define STATUS_GARBAGE 1
|
|
#define STATUS_NOT_FOUND 2 /* No record in database when needed */
|
|
#define STATUS_NO_PARENT 4 /* Parent record wasn't found */
|
|
#define STATUS_NOT_READ 8 /* Record isn't read */
|
|
#define STATUS_UPDATED 16 /* Record is updated by formula */
|
|
#define STATUS_NULL_ROW 32 /* table->null_row is set */
|
|
#define STATUS_DELETED 64
|