mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
6b3478ec12
Change bool in C code to my_bool Added to mysqltest --enable_parsning and --disable_parsing to avoid to have to comment parts of tests Added comparison of LEX_STRING's and use this to compare file types for view and trigger files. client/client_priv.h: Added OPT_TRIGGERS (to get rid of compiler warning) client/mysql.cc: Added cast to get rid of compiler warning client/mysqldump.c: Added OPT_TRIGGERS (to get rid of compiler warning) Abort if we can't write to outfile (even if --ignore-errors is given) client/mysqltest.c: Added --enable_parsning and --disable_parsing to avoid to have to comment parts of tests include/my_sys.h: Make my_progname const include/my_time.h: Avoid using 'bool' in C programs mysql-test/lib/init_db.sql: Align with mysql_create_system_tables (Ideally this file should be auto-generated from the above script) mysql-test/r/mysqltest.result: Test for --enable_parsing mysql-test/r/variables.result: Update results after fix for overflow checking of max_heap_table_size mysql-test/t/information_schema.test: USe --enable/disable parsing instead of comments mysql-test/t/mysqltest.test: Test for --enable_parsing mysql-test/t/sp.test: USe --enable/disable parsing instead of comments mysql-test/t/variables.test: Portability fix for 64 bit systems mysql-test/t/view.test: USe --enable/disable parsing instead of comments mysys/my_init.c: May my_progname const mysys/my_static.c: May my_progname const mysys/thr_lock.c: Remove not needed casts sql-common/my_time.c: Change bool -> my_bool as bool is not portable in C programs sql/field.cc: Test number_to_datetime() for -1 instead of < 0 (Safety fix) New prototype for TIME_to_timestamp() sql/item.h: Don't have prototypes for both uint32 and ulong as these 'may' be the same thing sql/item_timefunc.cc: New prototype for TIME_to_timestamp() sql/log.cc: Remove compiler warnings sql/mysql_priv.h: New prototype for TIME_to_timestamp() Added function for comparing LEX_STRING sql/set_var.cc: Added overflow checking when setting ulong variable sql/sql_base.cc: Added function is_equal() Changed strncmp -> is_equal() as strncmp() to not match "V" (instead of "VIEW") sql/sql_class.cc: Added comment sql/sql_select.cc: Portability fixes After review fixes sql/sql_trigger.cc: Use 'tables_alias_charset' for comparing database name Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly) sql/sql_view.cc: Use 'is_equal()' to compare file type. (Old code didn't do the comparison correctly) sql/time.cc: New prototype for TIME_to_timestamp() to allow easyer mapping to C function sql/tztime.cc: bool -> my_bool (to allow calling C code from C++ code) sql/tztime.h: bool -> my_bool (to allow calling C code from C++ code)
100 lines
3.4 KiB
C++
100 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 USE_PRAGMA_INTERFACE
|
|
#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,
|
|
my_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 Time_zone * my_tz_find_with_opening_tz_tables(THD *thd, const String *name);
|
|
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 begining of list of implicitly used time
|
|
zone tables, set SELECT_ACL for them 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)
|
|
{
|
|
for (int i= 0; i < 4; i++)
|
|
(*table)[i].grant.privilege= SELECT_ACL;
|
|
(*table)+= 3;
|
|
return TRUE;
|
|
}
|
|
return FALSE;
|
|
}
|
|
|
|
#endif /* !defined(TESTTIME) && !defined(TZINFO2SQL) */
|