mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 14:32:34 +01:00
70823e1d91
The reason for the failure was a bug in an include file on debian that causes 'struct stat' to have different sized depending on the environment. This patch fixes so that we always include my_global.h or my_config.h before we include any other files. Other things: - Removed #include <my_global.h> in some include files; Better to always do this at the top level to have as few "always-include-this-file-first' files as possible. - Removed usage of some include files that where already included by my_global.h or by other files. client/mysql_plugin.c: Use my_global.h first client/mysqlslap.c: Remove duplicated include files extra/comp_err.c: Remove duplicated include files include/m_string.h: Remove duplicated include files include/maria.h: Remove duplicated include files libmysqld/emb_qcache.cc: Use my_global.h first plugin/semisync/semisync.h: Use my_pthread.h first sql/datadict.cc: Use my_global.h first sql/debug_sync.cc: Use my_global.h first sql/derror.cc: Use my_global.h first sql/des_key_file.cc: Use my_global.h first sql/discover.cc: Use my_global.h first sql/event_data_objects.cc: Use my_global.h first sql/event_db_repository.cc: Use my_global.h first sql/event_parse_data.cc: Use my_global.h first sql/event_queue.cc: Use my_global.h first sql/event_scheduler.cc: Use my_global.h first sql/events.cc: Use my_global.h first sql/field.cc: Use my_global.h first Remove duplicated include files sql/field_conv.cc: Use my_global.h first sql/filesort.cc: Use my_global.h first Remove duplicated include files sql/gstream.cc: Use my_global.h first sql/ha_ndbcluster.cc: Use my_global.h first sql/ha_ndbcluster_binlog.cc: Use my_global.h first sql/ha_ndbcluster_cond.cc: Use my_global.h first sql/ha_partition.cc: Use my_global.h first sql/handler.cc: Use my_global.h first sql/hash_filo.cc: Use my_global.h first sql/hostname.cc: Use my_global.h first sql/init.cc: Use my_global.h first sql/item.cc: Use my_global.h first sql/item_buff.cc: Use my_global.h first sql/item_cmpfunc.cc: Use my_global.h first sql/item_create.cc: Use my_global.h first sql/item_geofunc.cc: Use my_global.h first sql/item_inetfunc.cc: Use my_global.h first sql/item_row.cc: Use my_global.h first sql/item_strfunc.cc: Use my_global.h first sql/item_subselect.cc: Use my_global.h first sql/item_sum.cc: Use my_global.h first sql/item_timefunc.cc: Use my_global.h first sql/item_xmlfunc.cc: Use my_global.h first sql/key.cc: Use my_global.h first sql/lock.cc: Use my_global.h first sql/log.cc: Use my_global.h first sql/log_event.cc: Use my_global.h first sql/log_event_old.cc: Use my_global.h first sql/mf_iocache.cc: Use my_global.h first sql/mysql_install_db.cc: Remove duplicated include files sql/mysqld.cc: Remove duplicated include files sql/net_serv.cc: Remove duplicated include files sql/opt_range.cc: Use my_global.h first sql/opt_subselect.cc: Use my_global.h first sql/opt_sum.cc: Use my_global.h first sql/parse_file.cc: Use my_global.h first sql/partition_info.cc: Use my_global.h first sql/procedure.cc: Use my_global.h first sql/protocol.cc: Use my_global.h first sql/records.cc: Use my_global.h first sql/records.h: Don't include my_global.h Better to do this at the upper level sql/repl_failsafe.cc: Use my_global.h first sql/rpl_filter.cc: Use my_global.h first sql/rpl_gtid.cc: Use my_global.h first sql/rpl_handler.cc: Use my_global.h first sql/rpl_injector.cc: Use my_global.h first sql/rpl_record.cc: Use my_global.h first sql/rpl_record_old.cc: Use my_global.h first sql/rpl_reporting.cc: Use my_global.h first sql/rpl_rli.cc: Use my_global.h first sql/rpl_tblmap.cc: Use my_global.h first sql/rpl_utility.cc: Use my_global.h first sql/set_var.cc: Added comment sql/slave.cc: Use my_global.h first sql/sp.cc: Use my_global.h first sql/sp_cache.cc: Use my_global.h first sql/sp_head.cc: Use my_global.h first sql/sp_pcontext.cc: Use my_global.h first sql/sp_rcontext.cc: Use my_global.h first sql/spatial.cc: Use my_global.h first sql/sql_acl.cc: Use my_global.h first sql/sql_admin.cc: Use my_global.h first sql/sql_analyse.cc: Use my_global.h first sql/sql_audit.cc: Use my_global.h first sql/sql_base.cc: Use my_global.h first sql/sql_binlog.cc: Use my_global.h first sql/sql_bootstrap.cc: Use my_global.h first Use my_global.h first sql/sql_cache.cc: Use my_global.h first sql/sql_class.cc: Use my_global.h first sql/sql_client.cc: Use my_global.h first sql/sql_connect.cc: Use my_global.h first sql/sql_crypt.cc: Use my_global.h first sql/sql_cursor.cc: Use my_global.h first sql/sql_db.cc: Use my_global.h first sql/sql_delete.cc: Use my_global.h first sql/sql_derived.cc: Use my_global.h first sql/sql_do.cc: Use my_global.h first sql/sql_error.cc: Use my_global.h first sql/sql_explain.cc: Use my_global.h first sql/sql_expression_cache.cc: Use my_global.h first sql/sql_handler.cc: Use my_global.h first sql/sql_help.cc: Use my_global.h first sql/sql_insert.cc: Use my_global.h first sql/sql_lex.cc: Use my_global.h first sql/sql_load.cc: Use my_global.h first sql/sql_locale.cc: Use my_global.h first sql/sql_manager.cc: Use my_global.h first sql/sql_parse.cc: Use my_global.h first sql/sql_partition.cc: Use my_global.h first sql/sql_plugin.cc: Added comment sql/sql_prepare.cc: Use my_global.h first sql/sql_priv.h: Added error if we use this before including my_global.h This check is here becasue so many files includes sql_priv.h first. sql/sql_profile.cc: Use my_global.h first sql/sql_reload.cc: Use my_global.h first sql/sql_rename.cc: Use my_global.h first sql/sql_repl.cc: Use my_global.h first sql/sql_select.cc: Use my_global.h first sql/sql_servers.cc: Use my_global.h first sql/sql_show.cc: Added comment sql/sql_signal.cc: Use my_global.h first sql/sql_statistics.cc: Use my_global.h first sql/sql_table.cc: Use my_global.h first sql/sql_tablespace.cc: Use my_global.h first sql/sql_test.cc: Use my_global.h first sql/sql_time.cc: Use my_global.h first sql/sql_trigger.cc: Use my_global.h first sql/sql_udf.cc: Use my_global.h first sql/sql_union.cc: Use my_global.h first sql/sql_update.cc: Use my_global.h first sql/sql_view.cc: Use my_global.h first sql/sys_vars.cc: Added comment sql/table.cc: Use my_global.h first sql/thr_malloc.cc: Use my_global.h first sql/transaction.cc: Use my_global.h first sql/uniques.cc: Use my_global.h first sql/unireg.cc: Use my_global.h first sql/unireg.h: Removed inclusion of my_global.h storage/archive/ha_archive.cc: Added comment storage/blackhole/ha_blackhole.cc: Use my_global.h first storage/csv/ha_tina.cc: Use my_global.h first storage/csv/transparent_file.cc: Use my_global.h first storage/federated/ha_federated.cc: Use my_global.h first storage/federatedx/federatedx_io.cc: Use my_global.h first storage/federatedx/federatedx_io_mysql.cc: Use my_global.h first storage/federatedx/federatedx_io_null.cc: Use my_global.h first storage/federatedx/federatedx_txn.cc: Use my_global.h first storage/heap/ha_heap.cc: Use my_global.h first storage/innobase/handler/handler0alter.cc: Use my_global.h first storage/maria/ha_maria.cc: Use my_global.h first storage/maria/unittest/ma_maria_log_cleanup.c: Remove duplicated include files storage/maria/unittest/test_file.c: Added comment storage/myisam/ha_myisam.cc: Move sql_plugin.h first as this includes my_global.h storage/myisammrg/ha_myisammrg.cc: Use my_global.h first storage/oqgraph/oqgraph_thunk.cc: Use my_config.h and my_global.h first One could not include my_global.h before oqgraph_thunk.h (don't know why) storage/spider/ha_spider.cc: Use my_global.h first storage/spider/hs_client/config.cpp: Use my_global.h first storage/spider/hs_client/escape.cpp: Use my_global.h first storage/spider/hs_client/fatal.cpp: Use my_global.h first storage/spider/hs_client/hstcpcli.cpp: Use my_global.h first storage/spider/hs_client/socket.cpp: Use my_global.h first storage/spider/hs_client/string_util.cpp: Use my_global.h first storage/spider/spd_conn.cc: Use my_global.h first storage/spider/spd_copy_tables.cc: Use my_global.h first storage/spider/spd_db_conn.cc: Use my_global.h first storage/spider/spd_db_handlersocket.cc: Use my_global.h first storage/spider/spd_db_mysql.cc: Use my_global.h first storage/spider/spd_db_oracle.cc: Use my_global.h first storage/spider/spd_direct_sql.cc: Use my_global.h first storage/spider/spd_i_s.cc: Use my_global.h first storage/spider/spd_malloc.cc: Use my_global.h first storage/spider/spd_param.cc: Use my_global.h first storage/spider/spd_ping_table.cc: Use my_global.h first storage/spider/spd_sys_table.cc: Use my_global.h first storage/spider/spd_table.cc: Use my_global.h first storage/spider/spd_trx.cc: Use my_global.h first storage/xtradb/handler/handler0alter.cc: Use my_global.h first storage/xtradb/handler/i_s.cc: Use my_global.h first
292 lines
6.7 KiB
C++
292 lines
6.7 KiB
C++
|
|
// vim:sw=2:ai
|
|
|
|
/*
|
|
* Copyright (C) 2010-2011 DeNA Co.,Ltd.. All rights reserved.
|
|
* Copyright (C) 2011 Kentoku SHIBA
|
|
* See COPYRIGHT.txt for details.
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include "mysql_version.h"
|
|
#if MYSQL_VERSION_ID < 50500
|
|
#include "mysql_priv.h"
|
|
#include <mysql/plugin.h>
|
|
#else
|
|
#include "sql_priv.h"
|
|
#include "probes_mysql.h"
|
|
#endif
|
|
|
|
#include "config.hpp"
|
|
|
|
namespace dena {
|
|
|
|
unsigned int verbose_level = 0;
|
|
|
|
uchar *
|
|
conf_get_key(
|
|
conf_param *param,
|
|
size_t *length,
|
|
my_bool not_used __attribute__ ((unused))
|
|
) {
|
|
*length = param->key.length();
|
|
return (uchar*) param->key.ptr();
|
|
}
|
|
|
|
config::config()
|
|
{
|
|
if (my_hash_init(&conf_hash, &my_charset_bin, 32, 0, 0,
|
|
(my_hash_get_key) conf_get_key, 0, 0))
|
|
init = FALSE;
|
|
else
|
|
init = TRUE;
|
|
return;
|
|
}
|
|
|
|
config::~config()
|
|
{
|
|
if (init)
|
|
{
|
|
conf_param *param;
|
|
while ((param = (conf_param *) my_hash_element(&conf_hash, 0)))
|
|
{
|
|
my_hash_delete(&conf_hash, (uchar*) param);
|
|
delete param;
|
|
}
|
|
my_hash_free(&conf_hash);
|
|
}
|
|
}
|
|
|
|
conf_param *
|
|
config::find(const String& key) const
|
|
{
|
|
if (init)
|
|
return (conf_param *) my_hash_search(&conf_hash, (const uchar*) key.ptr(),
|
|
key.length());
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
conf_param *
|
|
config::find(const char *key) const
|
|
{
|
|
if (init)
|
|
return (conf_param *) my_hash_search(&conf_hash, (const uchar*) key,
|
|
strlen(key));
|
|
else
|
|
return NULL;
|
|
}
|
|
|
|
String
|
|
config::get_str(const String& key, const String& def) const
|
|
{
|
|
DENA_VERBOSE(30, list_all_params());
|
|
conf_param *param = find(key);
|
|
if (!param) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s(default)\n", key.ptr(),
|
|
def.ptr()));
|
|
return def;
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s\n", key.ptr(),
|
|
param->val.ptr()));
|
|
return param->val;
|
|
}
|
|
|
|
String
|
|
config::get_str(const char *key, const char *def) const
|
|
{
|
|
DENA_VERBOSE(30, list_all_params());
|
|
conf_param *param = find(key);
|
|
if (!param) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s(default)\n", key, def));
|
|
return String(def, strlen(def), &my_charset_bin);
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s\n",
|
|
key, param->val.ptr()));
|
|
return param->val;
|
|
}
|
|
|
|
long long
|
|
config::get_int(const String& key, long long def) const
|
|
{
|
|
int err;
|
|
DENA_VERBOSE(30, list_all_params());
|
|
conf_param *param = find(key);
|
|
if (!param) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld(default)\n", key.ptr(),
|
|
def));
|
|
return def;
|
|
}
|
|
const long long r = my_strtoll10(param->val.ptr(), (char**) NULL, &err);
|
|
if (err) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld(err)\n", key.ptr(),
|
|
def));
|
|
return def;
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld\n", key.ptr(), r));
|
|
return r;
|
|
}
|
|
|
|
long long
|
|
config::get_int(const char *key, long long def) const
|
|
{
|
|
int err;
|
|
DENA_VERBOSE(30, list_all_params());
|
|
conf_param *param = find(key);
|
|
if (!param) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld(default)\n", key, def));
|
|
return def;
|
|
}
|
|
const long long r = my_strtoll10(param->val.ptr(), (char**) NULL, &err);
|
|
if (err) {
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld(err)\n", key, def));
|
|
return def;
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%lld\n", key, r));
|
|
return r;
|
|
}
|
|
|
|
bool
|
|
config::replace(const char *key, const char *val)
|
|
{
|
|
uint32 val_len = strlen(val);
|
|
conf_param *param = find(key);
|
|
if (!param) {
|
|
/* create */
|
|
if (!(param = new conf_param()))
|
|
return TRUE;
|
|
uint32 key_len = strlen(key);
|
|
if (
|
|
param->key.reserve(key_len + 1) ||
|
|
param->val.reserve(val_len + 1)
|
|
) {
|
|
delete param;
|
|
return TRUE;
|
|
}
|
|
param->key.q_append(key, key_len);
|
|
param->val.q_append(val, val_len);
|
|
param->key.c_ptr_safe();
|
|
param->val.c_ptr_safe();
|
|
if (my_hash_insert(&conf_hash, (uchar*) param))
|
|
{
|
|
delete param;
|
|
return TRUE;
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s(create)\n",
|
|
param->key.ptr(), param->val.ptr()));
|
|
return FALSE;
|
|
}
|
|
/* replace */
|
|
param->val.length(0);
|
|
if (param->val.reserve(val_len + 1))
|
|
return TRUE;
|
|
param->val.q_append(val, val_len);
|
|
param->val.c_ptr_safe();
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s(replace)\n",
|
|
param->key.ptr(), param->val.ptr()));
|
|
return FALSE;
|
|
}
|
|
|
|
bool
|
|
config::replace(const char *key, long long val)
|
|
{
|
|
char val_str[22];
|
|
sprintf(val_str, "%lld", val);
|
|
return replace(key, val_str);
|
|
}
|
|
|
|
bool
|
|
config::compare(const char *key, const char *val)
|
|
{
|
|
conf_param *param = find(key);
|
|
if (!param)
|
|
return FALSE;
|
|
return !strcmp(param->val.ptr(), val);
|
|
}
|
|
|
|
void
|
|
config::list_all_params() const
|
|
{
|
|
conf_param *param;
|
|
DENA_VERBOSE(10, fprintf(stderr, "list_all_params start\n"));
|
|
for(ulong i = 0; i < conf_hash.records; i++)
|
|
{
|
|
if ((param = (conf_param *) my_hash_element((HASH *) &conf_hash, i)))
|
|
{
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s\n",
|
|
param->key.ptr(), param->val.ptr()));
|
|
}
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "list_all_params end\n"));
|
|
}
|
|
|
|
config&
|
|
config::operator =(const config& x)
|
|
{
|
|
DENA_VERBOSE(10, fprintf(stderr, "config operator = start"));
|
|
if (this != &x && init && x.init) {
|
|
conf_param *param, *new_param;
|
|
for(ulong i = 0; i < x.conf_hash.records; i++)
|
|
{
|
|
if (
|
|
(param = (conf_param *) my_hash_element((HASH *) &x.conf_hash, i)) &&
|
|
(new_param = new conf_param())
|
|
) {
|
|
if (
|
|
!new_param->key.copy(param->key) &&
|
|
!new_param->val.copy(param->val)
|
|
) {
|
|
new_param->key.c_ptr_safe();
|
|
new_param->val.c_ptr_safe();
|
|
DENA_VERBOSE(10, fprintf(stderr, "CONFIG: %s=%s\n",
|
|
new_param->key.ptr(), new_param->val.ptr()));
|
|
if (my_hash_insert(&conf_hash, (uchar*) new_param))
|
|
delete new_param;
|
|
} else
|
|
delete new_param;
|
|
}
|
|
}
|
|
}
|
|
DENA_VERBOSE(10, fprintf(stderr, "config operator = end %p", this));
|
|
return *this;
|
|
}
|
|
|
|
void
|
|
parse_args(int argc, char **argv, config& conf)
|
|
{
|
|
conf_param *param;
|
|
for (int i = 1; i < argc; ++i) {
|
|
const char *const arg = argv[i];
|
|
const char *const eq = strchr(arg, '=');
|
|
if (eq == 0) {
|
|
continue;
|
|
}
|
|
if (!(param = new conf_param()))
|
|
continue;
|
|
uint32 key_len = eq - arg;
|
|
uint32 val_len = strlen(eq + 1);
|
|
if (
|
|
param->key.reserve(key_len + 1) ||
|
|
param->val.reserve(val_len + 1)
|
|
) {
|
|
delete param;
|
|
continue;
|
|
}
|
|
param->key.q_append(arg, key_len);
|
|
param->val.q_append(eq + 1, val_len);
|
|
param->key.c_ptr_safe();
|
|
param->val.c_ptr_safe();
|
|
if (my_hash_insert(&conf.conf_hash, (uchar*) param))
|
|
{
|
|
delete param;
|
|
continue;
|
|
}
|
|
}
|
|
param = conf.find("verbose");
|
|
if (param) {
|
|
verbose_level = atoi(param->val.c_ptr());
|
|
}
|
|
}
|
|
|
|
};
|
|
|