Commit 788ad30f authored Nov 27, 2006 by unknown

Fixed a LOT of compiler warnings

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

parent b8fe9fb4

client/mysqldump.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -30,14 +30,14 @@
		** master/autocommit code by Brian Aker <brian@tangent.org>
		** SSL by
		** Andrei Errapart <andreie@no.spam.ee>
		** TÃÂµnu Samuel <tonu@please.do.not.remove.this.spam.ee>
		** TÃµnu Samuel <tonu@please.do.not.remove.this.spam.ee>
		** XML by Gary Huntress <ghuntress@mediaone.net> 10/10/01, cleaned up
		** and adapted to mysqldump 05/11/01 by Jani Tolonen
		** Added --single-transaction option 06/06/2002 by Peter Zaitsev
		** 10 Jun 2003: SET NAMES and --no-set-names by Alexander Barkov
		*/

		#define DUMP_VERSION "10.11"
		#define DUMP_VERSION "10.12"

		#include <my_global.h>
		#include <my_sys.h>
		@@ -540,8 +540,10 @@ static void write_header(FILE sql_file, char db_name)
		if (opt_xml)
		{
		fputs("<?xml version=\"1.0\"?>\n", sql_file);
		/* Schema reference. Allows use of xsi:nil for NULL values and
		xsi:type to define an element's data type. */
		/*
		Schema reference. Allows use of xsi:nil for NULL values and
		xsi:type to define an element's data type.
		*/
		fputs("<mysqldump ", sql_file);
		fputs("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
		sql_file);
		@@ -2349,7 +2351,7 @@ static void dump_table(char table, char db)
		The "table" could be a view. If so, we don't do anything here.
		*/
		if (strcmp (table_type, "VIEW") == 0)
		return;
		DBUG_VOID_RETURN;

		/* Check --no-data flag */
		if (opt_no_data)
		@@ -3155,10 +3157,8 @@ static int dump_all_tables_in_db(char *database)
		afterdot= strmov(hash_key, database);
		*afterdot++= '.';

		if (!strcmp(database, NDB_REP_DB)) /* Skip cluster internal database */
		return 0;
		if (init_dumping(database, init_dumping_tables))
		return 1;
		DBUG_RETURN(1);
		if (opt_xml)
		print_xml_tag(md_result_file, "", "\n", "database", "name=", database, NullS);
		if (lock_tables)
		@@ -3218,7 +3218,7 @@ static int dump_all_tables_in_db(char *database)
		fprintf(md_result_file,"\n--\n-- Flush Grant Tables \n--\n");
		fprintf(md_result_file,"\n/! FLUSH PRIVILEGES /;\n");
		}
		return 0;
		DBUG_RETURN(0);
		} /* dump_all_tables_in_db */

client/mysqlslap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1031,7 +1031,7 @@ run_scheduler(stats sptr, statement stmts, uint concur, ulonglong limit)
		for (x= 0; x < concur; x++)
		{
		int pid;
		DBUG_PRINT("info", ("x %d concurrency %d", x, concurrency));
		DBUG_PRINT("info", ("x: %d concurrency: %u", x, *concurrency));
		pid= fork();
		switch(pid)
		{

client/mysqltest.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ enum {
		OPT_SSL_CA, OPT_SSL_CAPATH, OPT_SSL_CIPHER, OPT_PS_PROTOCOL,
		OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL,
		OPT_SSL_VERIFY_SERVER_CERT, OPT_MAX_CONNECT_RETRIES,
		OPT_MARK_PROGRESS, OPT_CHARSETS_DIR, OPT_LOG_DIR, OPT_DEBUG_INFO};
		OPT_MARK_PROGRESS, OPT_CHARSETS_DIR, OPT_LOG_DIR, OPT_DEBUG_INFO
		};

		static int record= 0, opt_sleep= -1;

extra/yassl/taocrypt/include/algebra.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public:
		typedef Integer Element;

		AbstractRing() : AbstractGroup() {m_mg.m_pRing = this;}
		AbstractRing(const AbstractRing &source) {m_mg.m_pRing = this;}
		AbstractRing(const AbstractRing &source) :AbstractGroup() {m_mg.m_pRing = this;}
		AbstractRing& operator=(const AbstractRing &source) {return *this;}

		virtual bool IsUnit(const Element &a) const =0;

mysql-test/include/im_check_env.inc

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,4 +22,5 @@ SHOW VARIABLES LIKE 'server_id';
		# Check that IM understands that mysqld1 is online, while mysqld2 is
		# offline.

		--replace_result starting XXXXX online XXXXX
		SHOW INSTANCES;