mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Fixed compiler warnings detected by option -Wshadow and -Wunused:
- Removed not used variables and functions - Added #ifdef around code that is not used - Renamed variables and functions to avoid conflicts - Removed some not used arguments Fixed some class/struct warnings in ndb Added define IS_LONGDATA() to simplify code in libmysql.c I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes BUILD/SETUP.sh: Added printing of unused functions and variables. Made it easy to test compiling with -Wshadow BUILD/compile-pentium-gcov: Added warnings Mark binary with -gcov client/mysql.cc: Fixed warnings found with gcc -Wshadow client/mysql_upgrade.c: Fixed warnings found with gcc -Wshadow client/mysqlbinlog.cc: Fixed warnings found with gcc -Wshadow client/mysqldump.c: Fixed warnings found with gcc -Wshadow client/mysqltest.c: Fixed warnings found with gcc -Wshadow client/sql_string.cc: Fixed warnings found with gcc -Wshadow Merged with sql/sql_string.cc client/sql_string.h: Fixed warnings found with gcc -Wshadow Merged with sql/sql_string.h cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/input.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/text.c: Fixed warnings found with gcc -Wshadow cmd-line-utils/readline/vi_mode.c: Fixed warnings found with gcc -Wshadow dbug/dbug_analyze.c: Fixed warnings found with gcc -Wshadow extra/my_print_defaults.c: Prefixed defaults_extra_file and defaults_group_suffix with 'my' to avoid conflicts with similar named local variables extra/yassl/include/buffer.hpp: Fixed compiler warnings extra/yassl/include/crypto_wrapper.hpp: Fixed compiler warnings extra/yassl/include/yassl_imp.hpp: Fixed compiler warnings extra/yassl/include/yassl_int.hpp: Fixed compiler warnings extra/yassl/src/crypto_wrapper.cpp: Fixed compiler warnings extra/yassl/taocrypt/benchmark/benchmark.cpp: Fixed warnings found with gcc -Wshadow extra/yassl/taocrypt/include/algebra.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/des.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/hash.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/hmac.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/modarith.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/modes.hpp: Fixed compiler warnings extra/yassl/taocrypt/include/rsa.hpp: Fixed compiler warnings extra/yassl/taocrypt/mySTL/list.hpp: Fixed compiler warnings extra/yassl/taocrypt/src/aes.cpp: Fixed compiler warnings extra/yassl/taocrypt/src/algebra.cpp: Fixed compiler warnings extra/yassl/taocrypt/src/asn.cpp: Fixed compiler warnings extra/yassl/taocrypt/test/test.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Fixed compiler warnings include/m_ctype.h: Fixed warnings found with gcc -Wshadow include/my_pthread.h: Fixed warnings found with gcc -Wshadow include/my_sys.h: Fixed warnings found with gcc -Wshadow include/my_time.h: Fixed warnings found with gcc -Wshadow include/mysql.h: Fixed warnings found with gcc -Wshadow Added define IS_LONGDATA() to simplify code in libmysql.c libmysql/libmysql.c: Fixed warnings found with gcc -Wshadow (Mostly replaced bind -> my_bind and time -> my_time) libmysqld/lib_sql.cc: Removed not used variables and labels myisam/ft_boolean_search.c: Fixed warnings found with gcc -Wshadow myisam/mi_open.c: Fixed warnings found with gcc -Wshadow myisam/mi_search.c: Fixed warnings found with gcc -Wshadow myisam/mi_unique.c: Fixed compiler warning myisam/myisampack.c: Fixed warnings found with gcc -Wshadow myisam/rt_index.c: Remove not used variables myisam/sort.c: Fixed warnings found with gcc -Wshadow mysql-test/r/mysqlcheck.result: Remove databases and tables possible left by previous test mysql-test/r/mysqltest.result: New test results mysql-test/t/mysql.test: Coverage tests mysql-test/t/mysqlbinlog.test: Coverage tests mysql-test/t/mysqlcheck.test: Remove databases and tables possible left by previous test mysql-test/t/mysqltest.test: Coverage tests mysys/default.c: Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions mysys/mf_iocache2.c: Fixed warnings found with gcc -Wshadow mysys/mf_keycache.c: Fixed warnings found with gcc -Wshadow mysys/my_bitmap.c: Fixed warnings found with gcc -Wshadow mysys/sha1.c: Fixed warnings found with gcc -Wshadow ndb/include/kernel/signaldata/ArbitSignalData.hpp: Fixed compiler warning ndb/include/kernel/signaldata/DictTabInfo.hpp: Fixed compiler warnings ndb/include/ndbapi/NdbReceiver.hpp: Fixed warnings found with gcc -Wshadow ndb/include/transporter/TransporterDefinitions.hpp: Fixed compiler warning ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/include/util/SocketAuthenticator.hpp: Fixed compiler warning ndb/include/util/SocketServer.hpp: Fixed compiler warning ndb/src/common/mgmcommon/ConfigRetriever.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/portlib/NdbTick.c: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/SHM_Transporter.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/TCP_Transporter.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/transporter/TCP_Transporter.hpp: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Removed not used variable ndb/src/common/transporter/TransporterRegistry.cpp: Removed not used variable ndb/src/common/util/Bitmask.cpp: Moved function to avoid warnings of not used function ndb/src/common/util/ConfigValues.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/File.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/Properties.cpp: Fixed warnings found with gcc -Wshadow ndb/src/common/util/SocketClient.cpp: Fixed wrong return value ndb/src/common/util/random.c: Fixed warnings found with gcc -Wshadow ndb/src/common/util/socket_io.cpp: Fixed warnings found with gcc -Wshadow ndb/src/cw/cpcd/APIService.cpp: Removed not used variable ndb/src/cw/cpcd/main.cpp: Removed not used variables ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warnings ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Removed not used variables ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Removed not used variables ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Removed not used variable ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp: Removed not used variables ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Removed not used variables ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp: Removed not used variables ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Fixed compiler warnings ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Removed not used variables ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Fixed compiler warnings ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Fixed compiler warnings ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Removed not used variables ndb/src/kernel/blocks/suma/Suma.cpp: Removed not used variables ndb/src/kernel/blocks/suma/Suma.hpp: Fixed compiler warnings ndb/src/kernel/vm/MetaData.hpp: Fixed compiler warnings ndb/src/mgmapi/LocalConfig.cpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmapi/mgmapi.cpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmclient/CommandInterpreter.cpp: Removed not used variables ndb/src/mgmsrv/ConfigInfo.cpp: Fixed warnings found with gcc -Wshadow Removed not used variables ndb/src/mgmsrv/ConfigInfo.hpp: Fixed warnings found with gcc -Wshadow ndb/src/mgmsrv/InitConfigFileParser.cpp: Prefixed defaults_file, defaults_group_suffix and defaults_extra_file with 'my' to avoid conflicts with local variables in some functions ndb/src/mgmsrv/MgmtSrvr.cpp: Removed not used variables and functions ndb/src/mgmsrv/MgmtSrvr.hpp: Fixed compiler warnings ndb/src/mgmsrv/Services.cpp: Removed not used variables and functions ndb/src/mgmsrv/main.cpp: Removed not used variable ndb/src/ndbapi/ClusterMgr.hpp: Fixed compiler warnings ndb/src/ndbapi/Ndb.cpp: Removed not used variables ndb/src/ndbapi/NdbBlob.cpp: Removed not used variables ndb/src/ndbapi/NdbDictionaryImpl.cpp: Removed not used variables ndb/src/ndbapi/NdbIndexOperation.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationExec.cpp: Removed not used variables ndb/src/ndbapi/NdbOperationSearch.cpp: Removed not used variables ndb/src/ndbapi/NdbScanFilter.cpp: Fixed compiler warning ndb/src/ndbapi/NdbScanOperation.cpp: Removed not used variables ndb/src/ndbapi/SignalSender.cpp: Removed not used variables ndb/src/ndbapi/ndb_cluster_connection.cpp: Removed not used variable ndb/tools/delete_all.cpp: Removed not used variable ndb/tools/desc.cpp: Removed not used variable ndb/tools/drop_index.cpp: Removed not used variable ndb/tools/drop_tab.cpp: Removed not used variable ndb/tools/listTables.cpp: Removed not used variable ndb/tools/ndb_config.cpp: Fixed warnings found with gcc -Wshadow Added missing puts(desc) ndb/tools/restore/Restore.hpp: Changed delimiter to define instead of static variable, as the static variable caused a LOT of compiler warnings Fixed compiler warning ndb/tools/restore/consumer.hpp: Fixed compiler warning ndb/tools/restore/restore_main.cpp: Fixed compiler warnings ndb/tools/select_all.cpp: Removed not used variables ndb/tools/select_count.cpp: Removed not used variable server-tools/instance-manager/commands.h: Fixed compiler warnings server-tools/instance-manager/guardian.cc: Fixed compiler warnings server-tools/instance-manager/instance_options.cc: Removed not used variables server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/options.cc: Fixed compiler warnings server-tools/instance-manager/options.h: Fixed compiler warnings server-tools/instance-manager/parse.cc: Removed not used variable server-tools/instance-manager/user_map.cc: Fixed compiler warnings server-tools/instance-manager/user_map.h: Fixed compiler warnings sql/field.cc: Fixed compiler warnings sql/field.h: Fixed compiler warnings sql/filesort.cc: Fixed compiler warnings sql/ha_archive.cc: Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings sql/ha_archive.h: Removed table and share arguments from get_share() / free_share() to get rid of compiler warnings sql/ha_federated.cc: Fixed compiler warnings sql/ha_heap.cc: Fixed compiler warnings sql/ha_myisam.cc: Fixed compiler warnings sql/ha_myisammrg.cc: Fixed compiler warnings sql/ha_ndbcluster.cc: Fixed compiler warnings sql/handler.cc: Fixed compiler warnings sql/item.cc: Fixed compiler warnings sql/item.h: Fixed compiler warnings new_item() -> clone_item(), to avoid a lot of warnings with variable 'new_item' el() -> element_index() sql/item_cmpfunc.cc: Fixed compiler warnings sql/item_cmpfunc.h: Fixed compiler warnings sql/item_func.cc: Fixed compiler warnings sql/item_geofunc.cc: Fixed compiler warnings sql/item_row.h: Fixed compiler warnings sql/item_strfunc.cc: Fixed compiler warnings sql/item_subselect.cc: Fixed compiler warnings sql/item_subselect.h: Fixed compiler warnings sql/item_sum.cc: Fixed compiler warnings sql/item_timefunc.cc: Fixed compiler warnings sql/log.cc: Fixed compiler warnings More comments Added #ifdef HAVE_REPLICATION sql/log_event.cc: Fixed compiler warnings sql/log_event.h: Fixed compiler warnings sql/mysql_priv.h: query_id -> global_query_id, to avoid a lot of clashes with function and class variables start_time -> server_start_time sql/mysqld.cc: Fixed compiler warnings: - Removed not used variables - Added #ifndef EMBEDDED_LIBRARY - Fixed shadow warnings sql/net_serv.cc: Fixed compiler warnings sql/opt_range.cc: range -> last_range to avoid shadow warnings Removed not used function print_rowid() sql/opt_range.h: range -> last_range to avoid shadow warnings sql/password.c: Fixed compiler warnings sql/protocol.cc: Fixed compiler warnings sql/repl_failsafe.cc: Fixed compiler warnings sql/set_var.cc: Fixed compiler warnings sql/set_var.h: type() -> show_type() Fixed compiler warnings sql/slave.cc: Fixed compiler warnings sql/sp_head.cc: Fixed compiler warnings sql/sp_head.h: Fixed compiler warnings sql/spatial.cc: Fixed compiler warnings sql/spatial.h: length() -> geom_length() to avoid compiler warnings wkb_end -> wkb_last to avoid compiler warnings with local variables named 'wkb_end' sql/sql_cache.h: Fixed compiler warnings sql/sql_class.cc: Fixed compiler warnings sql/sql_class.h: log -> log_xid() to avoid compiler warnings Fixed shadow compiler warnings sql/sql_derived.cc: Removed not used variable sql/sql_insert.cc: Fixed compiler warnings sql/sql_lex.cc: Fixed compiler warnings sql/sql_lex.h: res -> saved_error to make the meaning of the variable clear and avoid shadow warnings sql/sql_load.cc: Fixed compiler warnings sql/sql_parse.cc: Fixed compiler warnings sql/sql_prepare.cc: Fixed compiler warnings sql/sql_select.cc: Fixed compiler warnings sql/sql_show.cc: Fixed compiler warnings sql/sql_string.cc: Fixed compiler warnings sql/sql_string.h: Fixed compiler warnings sql/sql_table.cc: Fixed compiler warnings sql/sql_trigger.cc: Fixed compiler warnings sql/sql_trigger.h: table -> trigger_table to avoid warnings from local variables sql/sql_union.cc: Fixed compiler warnings (mainly res -> saved_error) sql-common/client.c: Removed not used variable sql-common/my_time.c: Removed not used variable time -> my_time sql/sql_update.cc: Removed not used variable sql/sql_view.cc: Removed not used variable sql/sql_yacc.yy: Removed not used variable sql/table.cc: Removed not used variable sql/tztime.cc: Removed not used variable sql/unireg.cc: Removed not used variable strings/ctype-bin.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-cp932.c: Fixed compiler warnings strings/ctype-eucjpms.c: Fixed compiler warnings strings/ctype-mb.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-simple.c: mblen -> mb_len to avoid compiler warnings with local variable mblen exp -> exponent strings/ctype-sjis.c: Fixed compiler warnings strings/ctype-uca.c: mblen -> mb_len to avoid compiler warnings with local variable mblen strings/ctype-ujis.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_vsnprintf.c: Added comment strings/strtod.c: Fixed compiler warnings tests/mysql_client_test.c: Fixed compiler warnings (Biggest part of patch is to not get a conflict with global function 'bind')
This commit is contained in:
unknown
parent
25226de9ea
commit
f00257ddd0
227 changed files with 3273 additions and 3082 deletions
|
|
@ -44,9 +44,11 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname\n"\
|
||||
"This program will delete all records in the specified table using scan delete.\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -43,10 +43,12 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname\n"\
|
||||
"This program list all properties of table(s) in NDB Cluster.\n"\
|
||||
" ex: desc T1 T2 T4\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -37,9 +37,11 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"[<table> <index>]+\n"\
|
||||
"This program will drop index(es) in Ndb\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -37,9 +37,11 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname\n"\
|
||||
"This program will drop one table in Ndb\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -190,6 +190,7 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname\n"\
|
||||
"This program list all system objects in NDB Cluster.\n"\
|
||||
|
|
@ -197,6 +198,7 @@ static void usage()
|
|||
" ex: ndb_show_tables -t 2 would show all UserTables\n"\
|
||||
"To show all indexes for a table write table name as final argument\n"\
|
||||
" ex: ndb_show_tables T1\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ static void usage()
|
|||
{
|
||||
char desc[] =
|
||||
"This program will retreive config options for a ndb cluster\n";
|
||||
puts(desc);
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
@ -113,12 +114,14 @@ struct Match
|
|||
{
|
||||
int m_key;
|
||||
BaseString m_value;
|
||||
Match() {}
|
||||
virtual int eval(const Iter&);
|
||||
virtual ~Match() {}
|
||||
};
|
||||
|
||||
struct HostMatch : public Match
|
||||
{
|
||||
HostMatch() {}
|
||||
virtual int eval(const Iter&);
|
||||
};
|
||||
|
||||
|
|
@ -133,11 +136,13 @@ struct Apply
|
|||
|
||||
struct NodeTypeApply : public Apply
|
||||
{
|
||||
NodeTypeApply() {}
|
||||
virtual int apply(const Iter&);
|
||||
};
|
||||
|
||||
struct ConnectionTypeApply : public Apply
|
||||
{
|
||||
ConnectionTypeApply() {}
|
||||
virtual int apply(const Iter&);
|
||||
};
|
||||
|
||||
|
|
@ -296,10 +301,10 @@ parse_where(Vector<Match*>& where, int &argc, char**& argv)
|
|||
Match m;
|
||||
if(g_host)
|
||||
{
|
||||
HostMatch *m = new HostMatch;
|
||||
m->m_key = CFG_NODE_HOST;
|
||||
m->m_value.assfmt("%s", g_host);
|
||||
where.push_back(m);
|
||||
HostMatch *tmp = new HostMatch;
|
||||
tmp->m_key = CFG_NODE_HOST;
|
||||
tmp->m_value.assfmt("%s", g_host);
|
||||
where.push_back(tmp);
|
||||
}
|
||||
|
||||
if(g_type)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include <ndb_version.h>
|
||||
#include <version.h>
|
||||
|
||||
static const char * delimiter = ";"; // Delimiter in file dump
|
||||
#define delimiter ";"
|
||||
|
||||
const int FileNameLenC = 256;
|
||||
const int TableNameLenC = 256;
|
||||
|
|
@ -359,6 +359,7 @@ public:
|
|||
m_values_e.push_back(m_values[i]);
|
||||
m_values.clear();
|
||||
}
|
||||
LogEntry() {}
|
||||
~LogEntry()
|
||||
{
|
||||
Uint32 i;
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
class BackupConsumer {
|
||||
public:
|
||||
BackupConsumer() {}
|
||||
virtual ~BackupConsumer() { }
|
||||
virtual bool init() { return true;}
|
||||
virtual bool table(const TableS &){return true;}
|
||||
|
|
|
|||
|
|
@ -357,8 +357,8 @@ main(int argc, char** argv)
|
|||
while ((tuple = dataIter.getNextTuple(res= 1)) != 0)
|
||||
{
|
||||
if (checkSysTable(tuple->getTable()->getTableName()))
|
||||
for(Uint32 i= 0; i < g_consumers.size(); i++)
|
||||
g_consumers[i]->tuple(* tuple);
|
||||
for(Uint32 j= 0; j < g_consumers.size(); j++)
|
||||
g_consumers[j]->tuple(* tuple);
|
||||
} // while (tuple != NULL);
|
||||
|
||||
if (res < 0)
|
||||
|
|
@ -401,8 +401,8 @@ main(int argc, char** argv)
|
|||
while ((logEntry = logIter.getNextLogEntry(res= 0)) != 0)
|
||||
{
|
||||
if (checkSysTable(logEntry->m_table->getTableName()))
|
||||
for(Uint32 i= 0; i < g_consumers.size(); i++)
|
||||
g_consumers[i]->logEntry(* logEntry);
|
||||
for(Uint32 j= 0; j < g_consumers.size(); j++)
|
||||
g_consumers[j]->logEntry(* logEntry);
|
||||
}
|
||||
if (res < 0)
|
||||
{
|
||||
|
|
@ -433,9 +433,9 @@ main(int argc, char** argv)
|
|||
}
|
||||
}
|
||||
}
|
||||
for(Uint32 i= 0; i < g_consumers.size(); i++)
|
||||
for(Uint32 j= 0; j < g_consumers.size(); j++)
|
||||
{
|
||||
if (g_consumers[i]->has_temp_error())
|
||||
if (g_consumers[j]->has_temp_error())
|
||||
{
|
||||
clearConsumers();
|
||||
ndbout_c("\nRestore successful, but encountered temporary error, "
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ NDB_STD_OPTS_VARS;
|
|||
|
||||
static const char* _dbname = "TEST_DB";
|
||||
static const char* _delimiter = "\t";
|
||||
static int _unqualified, _header, _parallelism, _useHexFormat, _lock,
|
||||
static int _header, _parallelism, _useHexFormat, _lock,
|
||||
_order, _descending;
|
||||
|
||||
const char *load_default_groups[]= { "mysql_cluster",0 };
|
||||
|
|
@ -76,6 +76,7 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname\n"\
|
||||
"This program reads all records from one table in NDB Cluster\n"\
|
||||
|
|
@ -83,6 +84,7 @@ static void usage()
|
|||
"(It only print error messages if it encounters a permanent error.)\n"\
|
||||
"It can also be used to dump the content of a table to file \n"\
|
||||
" ex: select_all --no-header --delimiter=';' T4 > T4.data\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
|
|
@ -56,9 +56,11 @@ static struct my_option my_long_options[] =
|
|||
};
|
||||
static void usage()
|
||||
{
|
||||
#ifdef NOT_USED
|
||||
char desc[] =
|
||||
"tabname1 ... tabnameN\n"\
|
||||
"This program will count the number of records in tables\n";
|
||||
#endif
|
||||
ndb_std_print_version();
|
||||
print_defaults(MYSQL_CONFIG_NAME,load_default_groups);
|
||||
puts("");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue