mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 07:14:17 +01:00
bc152db579
IN and CONVERT_TZ()" (with after review changes).
Now we add implicitly used time zone tables to global table list right
at the parsing stage instead of doing it later in mysql_execute_command()
or in check_prepared_statement().
No special test-case needed since this bug also manifests itself as
timezone2.test failure if one runs it with --ps-protocol option.
sql/sql_base.cc:
relink_tables_for_multidelete():
presence of implicitly used time zone tables is no longer condition for
propagation of TABLE pointers from global table list to local table
lists (since now global list is always created...)
sql/sql_lex.cc:
- Added LEX::add_time_zone_tables_to_query_tables() function which adds
implicitly used time zone tables to global table list.
- Definition of fake_time_zone_tables_list moved to tztime.cc, since
it is no longer used in parser.
sql/sql_lex.h:
- Since now we add implicitly used time zone tables right at parsing
stage, LEX::time_zone_tables_used is either zero or points to valid
time zone tables list. Updated its description to reflect that.
- Added LEX::add_time_zone_tables_to_query_tables() function which adds
implicitly used time zone tables to global table list.
- Declaration of fake_time_zone_tables_list moved to tztime.h,
since it is no longer used in parser.
sql/sql_parse.cc:
mysql_execute_command():
Removed adding list of implicitly used time zone tables to global table
list, since now we do this right at the parsing stage.
sql/sql_yacc.yy:
Let us add implicitly used time zone tables to global table list
right at the parsing stage instead of doing it later in
mysql_execute_command() or in check_prepared_statement().
sql/tztime.cc:
Moved fake_time_zone_tables_list definition from sql_lex.cc to
tztime.cc since now it is used only for error reporting from
my_tz_get_table_list() function.
sql/tztime.h:
Moved fake_time_zone_tables_list declaration from sql_lex.h to
tztime.h since now it is used only for error reporting from
my_tz_get_table_list() function.
103 lines
3.4 KiB
C++
103 lines
3.4 KiB
C++
/* Copyright (C) 2004 MySQL 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 */
|
|
|
|
|
|
#ifdef __GNUC__
|
|
#pragma interface /* gcc class interface */
|
|
#endif
|
|
|
|
#if !defined(TESTTIME) && !defined(TZINFO2SQL)
|
|
|
|
/*
|
|
This class represents abstract time zone and provides
|
|
basic interface for TIME <-> my_time_t conversion.
|
|
Actual time zones which are specified by DB, or via offset
|
|
or use system functions are its descendants.
|
|
*/
|
|
class Time_zone: public Sql_alloc
|
|
{
|
|
public:
|
|
/*
|
|
Converts local time in broken down TIME representation to
|
|
my_time_t (UTC seconds since Epoch) represenation.
|
|
Returns 0 in case of error. Sets in_dst_time_gap to true if date provided
|
|
falls into spring time-gap (or lefts it untouched otherwise).
|
|
*/
|
|
virtual my_time_t TIME_to_gmt_sec(const TIME *t,
|
|
bool *in_dst_time_gap) const = 0;
|
|
/*
|
|
Converts time in my_time_t representation to local time in
|
|
broken down TIME representation.
|
|
*/
|
|
virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const = 0;
|
|
/*
|
|
Because of constness of String returned by get_name() time zone name
|
|
have to be already zeroended to be able to use String::ptr() instead
|
|
of c_ptr().
|
|
*/
|
|
virtual const String * get_name() const = 0;
|
|
|
|
/*
|
|
We need this only for surpressing warnings, objects of this type are
|
|
allocated on MEM_ROOT and should not require destruction.
|
|
*/
|
|
virtual ~Time_zone() {};
|
|
};
|
|
|
|
extern Time_zone * my_tz_UTC;
|
|
extern Time_zone * my_tz_SYSTEM;
|
|
extern TABLE_LIST * my_tz_get_table_list(THD *thd, TABLE_LIST ***global_next_ptr);
|
|
extern Time_zone * my_tz_find(const String *name, TABLE_LIST *tz_tables);
|
|
extern my_bool my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap);
|
|
extern void my_tz_free();
|
|
|
|
extern TABLE_LIST fake_time_zone_tables_list;
|
|
|
|
/*
|
|
Check if we have pointer to the beggining of list of implictly used
|
|
time zone tables and fast-forward to its end.
|
|
|
|
SYNOPSIS
|
|
my_tz_check_n_skip_implicit_tables()
|
|
table - (in/out) pointer to element of table list to check
|
|
tz_tables - list of implicitly used time zone tables received
|
|
from my_tz_get_table_list() function.
|
|
|
|
NOTE
|
|
This function relies on my_tz_get_table_list() implementation.
|
|
|
|
RETURN VALUE
|
|
TRUE - if table points to the beggining of tz_tables list
|
|
FALSE - otherwise.
|
|
*/
|
|
inline bool my_tz_check_n_skip_implicit_tables(TABLE_LIST **table,
|
|
TABLE_LIST *tz_tables)
|
|
{
|
|
if (*table == tz_tables)
|
|
{
|
|
(*table)+= 3;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
/*
|
|
Maximum length of time zone name that we support
|
|
(Time zone name is char(64) in db)
|
|
*/
|
|
#define MAX_TIME_ZONE_NAME_LENGTH 72
|
|
|
|
#endif /* !defined(TESTTIME) && !defined(TZINFO2SQL) */
|