mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
176 lines
4.8 KiB
C++
176 lines
4.8 KiB
C++
/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
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; version 2 of the License.
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
#include <my_global.h>
|
|
#include "sql_priv.h"
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
#include "rpl_tblmap.h"
|
|
#ifndef MYSQL_CLIENT
|
|
#include "table.h"
|
|
#endif
|
|
|
|
#ifdef MYSQL_CLIENT
|
|
#define MAYBE_TABLE_NAME(T) ("")
|
|
#else
|
|
#define MAYBE_TABLE_NAME(T) ((T) ? (T)->s->table_name.str : "<>")
|
|
#endif
|
|
#define TABLE_ID_HASH_SIZE 32
|
|
#define TABLE_ID_CHUNK 256
|
|
|
|
table_mapping::table_mapping()
|
|
: m_free(0)
|
|
{
|
|
DBUG_ENTER("table_mapping::table_mapping");
|
|
/*
|
|
No "free_element" function for entries passed here, as the entries are
|
|
allocated in a MEM_ROOT (freed as a whole in the destructor), they cannot
|
|
be freed one by one.
|
|
Note that below we don't test if my_hash_init() succeeded. This
|
|
constructor is called at startup only.
|
|
*/
|
|
(void) my_hash_init(&m_table_ids,&my_charset_bin,TABLE_ID_HASH_SIZE,
|
|
offsetof(entry,table_id),sizeof(ulong),
|
|
0,0,0);
|
|
/* We don't preallocate any block, this is consistent with m_free=0 above */
|
|
init_alloc_root(&m_mem_root, TABLE_ID_HASH_SIZE*sizeof(entry), 0, MYF(0));
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
table_mapping::~table_mapping()
|
|
{
|
|
#ifdef MYSQL_CLIENT
|
|
clear_tables();
|
|
#endif
|
|
my_hash_free(&m_table_ids);
|
|
free_root(&m_mem_root, MYF(0));
|
|
}
|
|
|
|
TABLE* table_mapping::get_table(ulong table_id)
|
|
{
|
|
DBUG_ENTER("table_mapping::get_table(ulong)");
|
|
DBUG_PRINT("enter", ("table_id: %lu", table_id));
|
|
entry *e= find_entry(table_id);
|
|
if (e)
|
|
{
|
|
DBUG_PRINT("info", ("tid %lu -> table 0x%lx (%s)",
|
|
table_id, (long) e->table,
|
|
MAYBE_TABLE_NAME(e->table)));
|
|
DBUG_RETURN(e->table);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("tid %lu is not mapped!", table_id));
|
|
DBUG_RETURN(NULL);
|
|
}
|
|
|
|
/*
|
|
Called when we are out of table id entries. Creates TABLE_ID_CHUNK
|
|
new entries, chain them and attach them at the head of the list of free
|
|
(free for use) entries.
|
|
*/
|
|
int table_mapping::expand()
|
|
{
|
|
/*
|
|
If we wanted to use "tmp= new (&m_mem_root) entry[TABLE_ID_CHUNK]",
|
|
we would have to make "entry" derive from Sql_alloc but then it would not
|
|
be a POD anymore and we want it to be (see rpl_tblmap.h). So we allocate
|
|
in C.
|
|
*/
|
|
entry *tmp= (entry *)alloc_root(&m_mem_root, TABLE_ID_CHUNK*sizeof(entry));
|
|
if (tmp == NULL)
|
|
return ERR_MEMORY_ALLOCATION; // Memory allocation failed
|
|
|
|
/* Find the end of this fresh new array of free entries */
|
|
entry *e_end= tmp+TABLE_ID_CHUNK-1;
|
|
for (entry *e= tmp; e < e_end; e++)
|
|
e->next= e+1;
|
|
e_end->next= m_free;
|
|
m_free= tmp;
|
|
return 0;
|
|
}
|
|
|
|
int table_mapping::set_table(ulong table_id, TABLE* table)
|
|
{
|
|
DBUG_ENTER("table_mapping::set_table(ulong,TABLE*)");
|
|
DBUG_PRINT("enter", ("table_id: %lu table: 0x%lx (%s)",
|
|
table_id,
|
|
(long) table, MAYBE_TABLE_NAME(table)));
|
|
entry *e= find_entry(table_id);
|
|
if (e == 0)
|
|
{
|
|
if (m_free == 0 && expand())
|
|
DBUG_RETURN(ERR_MEMORY_ALLOCATION); // Memory allocation failed
|
|
e= m_free;
|
|
m_free= m_free->next;
|
|
}
|
|
else
|
|
{
|
|
#ifdef MYSQL_CLIENT
|
|
free_table_map_log_event(e->table);
|
|
#endif
|
|
my_hash_delete(&m_table_ids,(uchar *)e);
|
|
}
|
|
e->table_id= table_id;
|
|
e->table= table;
|
|
if (my_hash_insert(&m_table_ids,(uchar *)e))
|
|
{
|
|
/* we add this entry to the chain of free (free for use) entries */
|
|
e->next= m_free;
|
|
m_free= e;
|
|
DBUG_RETURN(ERR_MEMORY_ALLOCATION);
|
|
}
|
|
|
|
DBUG_PRINT("info", ("tid %lu -> table 0x%lx (%s)",
|
|
table_id, (long) e->table,
|
|
MAYBE_TABLE_NAME(e->table)));
|
|
DBUG_RETURN(0); // All OK
|
|
}
|
|
|
|
int table_mapping::remove_table(ulong table_id)
|
|
{
|
|
entry *e= find_entry(table_id);
|
|
if (e)
|
|
{
|
|
my_hash_delete(&m_table_ids,(uchar *)e);
|
|
/* we add this entry to the chain of free (free for use) entries */
|
|
e->next= m_free;
|
|
m_free= e;
|
|
return 0; // All OK
|
|
}
|
|
return 1; // No table to remove
|
|
}
|
|
|
|
/*
|
|
Puts all entries into the list of free-for-use entries (does not free any
|
|
memory), and empties the hash.
|
|
*/
|
|
void table_mapping::clear_tables()
|
|
{
|
|
DBUG_ENTER("table_mapping::clear_tables()");
|
|
for (uint i= 0; i < m_table_ids.records; i++)
|
|
{
|
|
entry *e= (entry *)my_hash_element(&m_table_ids, i);
|
|
#ifdef MYSQL_CLIENT
|
|
free_table_map_log_event(e->table);
|
|
#endif
|
|
e->next= m_free;
|
|
m_free= e;
|
|
}
|
|
my_hash_reset(&m_table_ids);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#endif
|