mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
151 lines
4.3 KiB
C++
151 lines
4.3 KiB
C++
/* Copyright (C) 2005 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 */
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
#ifdef HAVE_REPLICATION
|
|
|
|
#include "rpl_tblmap.h"
|
|
|
|
#define MAYBE_TABLE_NAME(T) ((T) ? (T)->s->table_name.str : "<>")
|
|
#define TABLE_ID_HASH_SIZE 32
|
|
#define TABLE_ID_CHUNK 256
|
|
|
|
table_mapping::table_mapping()
|
|
: m_free(0)
|
|
{
|
|
/*
|
|
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 hash_init() succeeded. This constructor
|
|
is called at startup only.
|
|
*/
|
|
(void) 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);
|
|
}
|
|
|
|
table_mapping::~table_mapping()
|
|
{
|
|
hash_free(&m_table_ids);
|
|
free_root(&m_mem_root, MYF(0));
|
|
}
|
|
|
|
st_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
|
|
hash_delete(&m_table_ids,(byte *)e);
|
|
|
|
e->table_id= table_id;
|
|
e->table= table;
|
|
my_hash_insert(&m_table_ids,(byte *)e);
|
|
|
|
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)
|
|
{
|
|
hash_delete(&m_table_ids,(byte *)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 *)hash_element(&m_table_ids, i);
|
|
e->next= m_free;
|
|
m_free= e;
|
|
}
|
|
my_hash_reset(&m_table_ids);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
#endif
|