mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
788ad30f08
Added missing DBUG_RETURN statements (in mysqldump.c) Added missing enums Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems. client/mysqldump.c: Fixed some compiler warnings Added some missing DBUG_RETURN Remove copying of 'cluster' database client/mysqlslap.c: Fixed compiler warnings client/mysqltest.c: After merge fix extra/yassl/taocrypt/include/algebra.hpp: Removed compiler warning mysql-test/include/im_check_env.inc: Fixed race condition (mysqld1 could report 'starting' or 'online' mysql-test/mysql-test-run.pl: After merge fixes Added missing directory to LD_LIBRARY_PATH mysql-test/r/ctype_cp1250_ch.result: After merge fix mysql-test/r/im_cmd_line.result: Fixed race condition mysql-test/r/im_daemon_life_cycle.result: Fixed race condition mysql-test/r/im_instance_conf.result: Fixed race condition mysql-test/r/im_life_cycle.result: Fixed race condition mysql-test/r/im_utils.result: Fixed race condition mysql-test/r/log_tables.result: Fixed wrong result mysql-test/t/disabled.def: Disabled ndb_restore_partion, as ndb_restore_compate caused it to fail, becasue of table 'cluster/def/schema' which is stored in ndb_backup50 mysys/my_compress.c: Removed compiler warnings mysys/my_getopt.c: Ensure we always have at least one space between option name and value plugin/fulltext/plugin_example.c: Removed compiler warnings server-tools/instance-manager/mysql_connection.cc: After merge fix sql/event_data_objects.cc: Fixed compiler warnings Fixed platform compatibility issues (%lld is not portable) sql/event_data_objects.h: Fixed compiler warnings sql/event_db_repository.cc: Fixed compiler warnings sql/event_queue.cc: Fixed compiler warnings sql/event_scheduler.cc: Fixed compiler warnings sql/events.cc: Fixed compiler warnings sql/field.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/ha_ndbcluster_binlog.cc: Fixed compiler warnings sql/ha_partition.cc: Fixed compiler warnings sql/handler.cc: Fixed compiler warnings sql/item_cmpfunc.cc: Fixed DBUG_PRINT style sql/item_func.cc: Fixed compiler warnings sql/log.cc: Fixed compiler warnings sql/log_event.cc: Fixed compiler warnings sql/mysqld.cc: Fixed compiler warnings sql/opt_range.cc: Fixed compiler warnings sql/repl_failsafe.cc: Indentation fixes sql/rpl_rli.cc: Fixed compiler warnings sql/rpl_tblmap.cc: Fixed compiler warnings sql/set_var.cc: Fixed compiler warnings sql/slave.cc: Fixed compiler warnings sql/sp_head.cc: Fixed compiler warnings sql/sql_base.cc: Fixed compiler warnings Fixed indentation sql/sql_binlog.cc: Fixed compiler warnings sql/sql_cache.cc: Fixed compiler warnings sql/sql_class.cc: Fixed compiler warnings sql/sql_handler.cc: Fixed compiler warnings sql/sql_lex.cc: Fixed compiler warnings sql/sql_parse.cc: Fixed compiler warnings sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Fixed compiler warnings sql/sql_table.cc: Fixed compiler warnings sql/sql_test.cc: Fixed DBUG_PRINT style sql/sql_trigger.cc: Fixed DBUG_PRINT style sql/table.cc: Fixed compiler warnings storage/federated/ha_federated.cc: Fixed compiler warnings storage/myisam/mi_rsamepos.c: Fixed compiler warnings storage/ndb/include/ndb_global.h.in: After merge fix storage/ndb/include/util/NdbOut.hpp: Inform gcc that ndbout_c takes a printf() string as argument storage/ndb/include/util/SimpleProperties.hpp: After merge fixes storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings Fixed usage of uninitialized value (Got help from Jonas with patch) storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/lgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/pgman.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/restore.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/suma/Suma.cpp: Fixed compiler warnings Added missing enum's to switch storage/ndb/src/kernel/vm/Configuration.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/DLHashTable.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/RWPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/WOPool.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warnings storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/DictCache.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbIndexStat.cpp: Initialize possible uninitialized variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbRecAttr.cpp: Added missing enum's (To avoid compiler warnings) storage/ndb/src/ndbapi/NdbScanOperation.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/ObjectMap.hpp: Fixed compiler warnings storage/ndb/tools/desc.cpp: Fixed compiler warnings storage/ndb/tools/restore/Restore.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings unittest/mytap/t/basic-t.c: Fixed compiler warnings unittest/mytap/tap.c: Fixed compiler warnings
285 lines
5.1 KiB
C++
285 lines
5.1 KiB
C++
#ifndef _EVENT_DATA_OBJECTS_H_
|
|
#define _EVENT_DATA_OBJECTS_H_
|
|
/* Copyright (C) 2004-2006 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 */
|
|
|
|
|
|
#define EVEX_GET_FIELD_FAILED -2
|
|
#define EVEX_COMPILE_ERROR -3
|
|
#define EVEX_GENERAL_ERROR -4
|
|
#define EVEX_BAD_PARAMS -5
|
|
#define EVEX_MICROSECOND_UNSUP -6
|
|
|
|
|
|
class sp_head;
|
|
class Sql_alloc;
|
|
|
|
|
|
class Event_basic
|
|
{
|
|
protected:
|
|
MEM_ROOT mem_root;
|
|
|
|
public:
|
|
LEX_STRING dbname;
|
|
LEX_STRING name;
|
|
LEX_STRING definer;// combination of user and host
|
|
|
|
Event_basic();
|
|
virtual ~Event_basic();
|
|
|
|
virtual int
|
|
load_from_row(TABLE *table) = 0;
|
|
|
|
protected:
|
|
bool
|
|
load_string_fields(Field **fields, ...);
|
|
};
|
|
|
|
|
|
|
|
class Event_queue_element : public Event_basic
|
|
{
|
|
protected:
|
|
bool status_changed;
|
|
bool last_executed_changed;
|
|
|
|
public:
|
|
enum enum_status
|
|
{
|
|
ENABLED = 1,
|
|
DISABLED
|
|
};
|
|
|
|
enum enum_on_completion
|
|
{
|
|
ON_COMPLETION_DROP = 1,
|
|
ON_COMPLETION_PRESERVE
|
|
};
|
|
|
|
enum enum_on_completion on_completion;
|
|
enum enum_status status;
|
|
TIME last_executed;
|
|
|
|
TIME execute_at;
|
|
TIME starts;
|
|
TIME ends;
|
|
my_bool starts_null;
|
|
my_bool ends_null;
|
|
my_bool execute_at_null;
|
|
|
|
longlong expression;
|
|
interval_type interval;
|
|
|
|
bool dropped;
|
|
|
|
uint execution_count;
|
|
|
|
Event_queue_element();
|
|
virtual ~Event_queue_element();
|
|
|
|
virtual int
|
|
load_from_row(TABLE *table);
|
|
|
|
bool
|
|
compute_next_execution_time();
|
|
|
|
int
|
|
drop(THD *thd);
|
|
|
|
void
|
|
mark_last_executed(THD *thd);
|
|
|
|
bool
|
|
update_timing_fields(THD *thd);
|
|
|
|
static void *operator new(size_t size)
|
|
{
|
|
void *p;
|
|
DBUG_ENTER("Event_queue_element::new(size)");
|
|
p= my_malloc(size, MYF(0));
|
|
DBUG_PRINT("info", ("alloc_ptr: 0x%lx", (long) p));
|
|
DBUG_RETURN(p);
|
|
}
|
|
|
|
static void operator delete(void *ptr, size_t size)
|
|
{
|
|
DBUG_ENTER("Event_queue_element::delete(ptr,size)");
|
|
DBUG_PRINT("enter", ("free_ptr: 0x%lx", (long) ptr));
|
|
TRASH(ptr, size);
|
|
my_free((gptr) ptr, MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
};
|
|
|
|
|
|
class Event_timed : public Event_queue_element
|
|
{
|
|
Event_timed(const Event_timed &); /* Prevent use of these */
|
|
void operator=(Event_timed &);
|
|
|
|
public:
|
|
LEX_STRING body;
|
|
|
|
LEX_STRING definer_user;
|
|
LEX_STRING definer_host;
|
|
|
|
LEX_STRING comment;
|
|
|
|
ulonglong created;
|
|
ulonglong modified;
|
|
|
|
ulong sql_mode;
|
|
|
|
Event_timed();
|
|
virtual ~Event_timed();
|
|
|
|
void
|
|
init();
|
|
|
|
virtual int
|
|
load_from_row(TABLE *table);
|
|
|
|
int
|
|
get_create_event(THD *thd, String *buf);
|
|
};
|
|
|
|
|
|
class Event_job_data : public Event_basic
|
|
{
|
|
public:
|
|
THD *thd;
|
|
sp_head *sphead;
|
|
|
|
LEX_STRING body;
|
|
LEX_STRING definer_user;
|
|
LEX_STRING definer_host;
|
|
|
|
ulong sql_mode;
|
|
|
|
uint execution_count;
|
|
|
|
Event_job_data();
|
|
virtual ~Event_job_data();
|
|
|
|
virtual int
|
|
load_from_row(TABLE *table);
|
|
|
|
int
|
|
execute(THD *thd);
|
|
|
|
int
|
|
compile(THD *thd, MEM_ROOT *mem_root);
|
|
private:
|
|
int
|
|
get_fake_create_event(THD *thd, String *buf);
|
|
|
|
Event_job_data(const Event_job_data &); /* Prevent use of these */
|
|
void operator=(Event_job_data &);
|
|
};
|
|
|
|
|
|
class Event_parse_data : public Sql_alloc
|
|
{
|
|
public:
|
|
enum enum_status
|
|
{
|
|
ENABLED = 1,
|
|
DISABLED
|
|
};
|
|
|
|
enum enum_on_completion
|
|
{
|
|
ON_COMPLETION_DROP = 1,
|
|
ON_COMPLETION_PRESERVE
|
|
};
|
|
enum enum_on_completion on_completion;
|
|
enum enum_status status;
|
|
|
|
const uchar *body_begin;
|
|
|
|
LEX_STRING dbname;
|
|
LEX_STRING name;
|
|
LEX_STRING definer;// combination of user and host
|
|
LEX_STRING body;
|
|
LEX_STRING comment;
|
|
|
|
Item* item_starts;
|
|
Item* item_ends;
|
|
Item* item_execute_at;
|
|
|
|
TIME starts;
|
|
TIME ends;
|
|
TIME execute_at;
|
|
my_bool starts_null;
|
|
my_bool ends_null;
|
|
my_bool execute_at_null;
|
|
|
|
sp_name *identifier;
|
|
Item* item_expression;
|
|
longlong expression;
|
|
interval_type interval;
|
|
|
|
static Event_parse_data *
|
|
new_instance(THD *thd);
|
|
|
|
bool
|
|
check_parse_data(THD *thd);
|
|
|
|
void
|
|
init_body(THD *thd);
|
|
|
|
private:
|
|
|
|
void
|
|
init_definer(THD *thd);
|
|
|
|
void
|
|
init_name(THD *thd, sp_name *spn);
|
|
|
|
int
|
|
init_execute_at(THD *thd);
|
|
|
|
int
|
|
init_interval(THD *thd);
|
|
|
|
int
|
|
init_starts(THD *thd);
|
|
|
|
int
|
|
init_ends(THD *thd);
|
|
|
|
Event_parse_data();
|
|
~Event_parse_data();
|
|
|
|
void
|
|
report_bad_value(const char *item_name, Item *bad_item);
|
|
|
|
Event_parse_data(const Event_parse_data &); /* Prevent use of these */
|
|
void operator=(Event_parse_data &);
|
|
};
|
|
|
|
|
|
/* Compares only the schema part of the identifier */
|
|
bool
|
|
event_basic_db_equal(LEX_STRING db, Event_basic *et);
|
|
|
|
/* Compares the whole identifier*/
|
|
bool
|
|
event_basic_identifier_equal(LEX_STRING db, LEX_STRING name, Event_basic *b);
|
|
|
|
|
|
#endif /* _EVENT_DATA_OBJECTS_H_ */
|