Commit f40e0cc0 authored by unknown's avatar unknown
Browse files

After merge fixes 

Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l


BitKeeper/etc/ignore:
  added storage/archive/archive_reader
BUILD/SETUP.sh:
  ccache now works again
BUILD/compile-pentium-gcov:
  Added marker that we are using gcov and need special version of ccache
client/mysql_upgrade.c:
  after merge fixes
client/mysqlbinlog.cc:
  after merge fixes
client/mysqldump.c:
  Removed compiler warnings
client/mysqlimport.c:
  Removed compiler warnings
client/mysqltest.c:
  Removed compiler warnings
mysql-test/t/mysqlcheck.test:
  After merge fixes
mysys/my_bitmap.c:
  After merge fix
sql/event_data_objects.cc:
  Removed not used variable
sql/event_db_repository.cc:
  Removed not used variable
sql/event_queue.cc:
  Removed not used variable
sql/field.cc:
  After merge fixes
sql/filesort.cc:
  Added missing initialization (could cause core dump on EOM)
sql/ha_ndbcluster.cc:
  After merge fixes
  Removed not used variables
  false-> FALSE
  true -> TRUE
  %llu -> %lu (portability fix)
  Fixed bug where field could be used unitialized in build_scan_filter_predicate()
sql/ha_ndbcluster_binlog.cc:
  Removed not used label
sql/ha_partition.cc:
  Removed not used variables
sql/handler.cc:
  Removed not used variable & function
sql/item.cc:
  After merge fixes
sql/item_cmpfunc.cc:
  Removed not used variable
sql/item_func.cc:
  Removed compiler warning
sql/item_xmlfunc.cc:
  Removed not used variables & declarations
sql/log.cc:
  Removed compiler warnings
  Removed not used variables & label
sql/log.h:
  After merge fixes
sql/log_event.cc:
  Removed not used variable & function
sql/mysqld.cc:
  After merge fixes
sql/opt_range.cc:
  Removed not used declaration
sql/partition_info.cc:
  Removed not used variable
sql/protocol.cc:
  Removed compiler warnings
sql/set_var.cc:
  Removed not used variable
sql/set_var.h:
  After merge fix
sql/slave.cc:
  After merge fixes
sql/slave.h:
  Moved wrong declaration to slave.cc
sql/sp.cc:
  Fixed format of DBUG_PRINT
sql/sp_head.cc:
  After merge fixes
sql/spatial.cc:
  Added DBUG_ASSERT() to verify that LINT_INIT is right
sql/sql_class.cc:
  Removed not used variables
sql/sql_insert.cc:
  After merge fixes
sql/sql_parse.cc:
  Removed not used variable
  After merge fixes
sql/sql_partition.cc:
  Removed not used variables
sql/sql_plugin.cc:
  Removed compiler warnings when compiling embedded server
sql/sql_servers.cc:
  Removed not used variables
  Moved wrong placed calle to use_all_columns()
sql/sql_servers.h:
  Moved declaration to right sql_servers.cc
sql/sql_show.cc:
  Removed not used variables and function
  After merge fixes
sql/sql_table.cc:
  Removed not used variable
sql/sql_yacc.yy:
  Removed not used variables
  Lex -> lex
sql/table.cc:
  Indentation fix
storage/archive/ha_archive.cc:
  After merge fixes
storage/example/ha_example.cc:
  Indentation fixes
storage/federated/ha_federated.cc:
  Removed not used variables
storage/myisam/mi_rkey.c:
  Added 0x before address
storage/myisammrg/ha_myisammrg.cc:
  Removed old declaration
storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  After merge fixes
storage/ndb/include/util/SimpleProperties.hpp:
  After merge fixes
storage/ndb/src/common/debugger/EventLogger.cpp:
  Removed not used function
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Removed compiler warnings
  Removed not used variables
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  After merge fixes
  Removed not used variables
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Removed not used varibles.
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Removed not used variables and label
storage/ndb/src/ndbapi/NdbOperationSearch.cpp:
  Removed not used label
storage/ndb/src/ndbapi/SignalSender.cpp:
  Removed not used function
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Removed not used variables
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Moved static declaration from header file
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Moved static declaration from header file
support-files/compiler_warnings.supp:
  Remove some warnings from ndb
parent 36b05892

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -2934,3 +2934,4 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

storage/archive/archive_reader

BUILD/SETUP.sh

+6 −0
Original line number Diff line number Diff line
@@ -187,6 +187,12 @@ fi 
# (http://samba.org/ccache) is installed, use it.

# We use 'grep' and hope 'grep' will work as expected

# (returns 0 if finds lines)

if test "$USING_GCOV" != "1"

then

  # Not using gcov; Safe to use ccache

  CCACHE_GCOV_VERSION_ENABLED=1

fi



if ccache -V > /dev/null 2>&1 && test "$CCACHE_GCOV_VERSION_ENABLED" = "1"

then

  echo "$CC" | grep "ccache" > /dev/null || CC="ccache $CC"

BUILD/compile-pentium-gcov

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


# Need to disable ccache, or we loose the gcov-needed compiler output files.



USING_GCOV=1

CCACHE_GCOV_VERSION_ENABLED=0

if ccache -V > /dev/null 2>&1

then

client/mysql_upgrade.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ int main(int argc, char **argv) 
  char *forced_extra_defaults;

  char *local_defaults_group_suffix;

  const char *script_line;

  char *upgrade_defaults_path; 

  char *upgrade_defaults_path= 0;

  char *defaults_to_use= NULL;

  int upgrade_defaults_created= 0;

client/mysqlbinlog.cc

+3 −2
Original line number Diff line number Diff line
@@ -639,7 +639,8 @@ Create_file event for file_id: %u\n",exv->file_id); 
    case FORMAT_DESCRIPTION_EVENT:

      delete glob_description_event;

      glob_description_event= (Format_description_log_event*) ev;

      print_event_info->common_header_len= glob_description_event->common_header_len;

      print_event_info->common_header_len=

        glob_description_event->common_header_len;

      ev->print(result_file, print_event_info);

      /*

        We don't want this event to be deleted now, so let's hide it (I
@@ -649,7 +650,7 @@ Create_file event for file_id: %u\n",exv->file_id); 
      */

      ev= 0;

      if (!force_if_open_opt &&

          (description_event->flags & LOG_EVENT_BINLOG_IN_USE_F))

          (glob_description_event->flags & LOG_EVENT_BINLOG_IN_USE_F))

      {

        file_not_closed_error= 1;

        DBUG_RETURN(1);