maria-developers team mailing list archive

[Michael Widenius <monty@xxxxxxxxxxxx>]

#At lp:maria based on revid:monty@xxxxxxxxxxxx-20100330123649-z64q052mcmpe049v

 2837 Michael Widenius	2010-03-31
      Fixed compiler warnings
      Fixed random failure in test system
      modified:
        BUILD/compile-solaris-sparc
        cmd-line-utils/libedit/filecomplete.c
        mysql-test/suite/rpl/r/rpl_optimize.result
        mysql-test/suite/rpl/t/rpl_optimize.test
        support-files/compiler_warnings.supp

per-file messages:
  BUILD/compile-solaris-sparc
    Addex EXTRA_FLAGS to configure line (to get rid of warnings for not initialzed variables on buildbot)
  cmd-line-utils/libedit/filecomplete.c
    Remove not used variables
  mysql-test/suite/rpl/r/rpl_optimize.result
    Updated result
  mysql-test/suite/rpl/t/rpl_optimize.test
    Use sync_salve_with_master to ensure cleanup on slave
  support-files/compiler_warnings.supp
    Added suppression of libedit files
=== modified file 'BUILD/compile-solaris-sparc'
--- a/BUILD/compile-solaris-sparc	2008-09-30 20:57:48 +0000
+++ b/BUILD/compile-solaris-sparc	2010-03-31 19:12:21 +0000
@@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin
 path=`dirname $0`
 . "$path/autorun.sh"
 
-CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
+CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Wunused  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa $EXTRA_FLAGS $EXTRA_CFLAGS" CXX=gcc CXXFLAGS="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti  -O3 -fno-omit-frame-pointer -mcpu=v8 -Wa,-xarch=v8plusa -g $EXTRA_FLAGS $EXTRA_CXXFLAGS" LIBS="-lmtmalloc" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client
 
 make -j 4

=== modified file 'cmd-line-utils/libedit/filecomplete.c'
--- a/cmd-line-utils/libedit/filecomplete.c	2009-04-30 11:53:30 +0000
+++ b/cmd-line-utils/libedit/filecomplete.c	2010-03-31 19:12:21 +0000
@@ -95,10 +95,9 @@ static char break_chars[] = { ' ', '\t',
 char *
 fn_tilde_expand(const char *txt)
 {
-	struct passwd pwres, *pass;
+	struct passwd *pass;
 	char *temp;
 	size_t len = 0;
-	char pwbuf[1024];
 
 	if (txt[0] != '~')
 		return (strdup(txt));

=== modified file 'mysql-test/suite/rpl/r/rpl_optimize.result'
--- a/mysql-test/suite/rpl/r/rpl_optimize.result	2010-01-13 09:00:03 +0000
+++ b/mysql-test/suite/rpl/r/rpl_optimize.result	2010-03-31 19:12:21 +0000
@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+drop tables if exists t1;
 CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
 create table t1 (a int not null auto_increment primary key, b int, key(b));
 INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

=== modified file 'mysql-test/suite/rpl/t/rpl_optimize.test'
--- a/mysql-test/suite/rpl/t/rpl_optimize.test	2010-03-04 08:03:07 +0000
+++ b/mysql-test/suite/rpl/t/rpl_optimize.test	2010-03-31 19:12:21 +0000
@@ -15,6 +15,10 @@
 -- source include/not_staging.inc
 -- source include/master-slave.inc
 
+--disable_warnings
+drop tables if exists t1;
+--enable_warnings
+
 CALL mtr.add_suppression('Statement may not be safe to log in statement format.');
 
 create table t1 (a int not null auto_increment primary key, b int, key(b));
@@ -51,10 +55,9 @@ sync_with_master; # won't work if slave
 
 connection master; # cleanup
 drop table t1;
-connection slave;
-sync_with_master;
+sync_slave_with_master;
 
 # If the machine is so fast that slave syncs before OPTIMIZE
-# starts, this test wil demonstrate nothing but will pass.
+# starts, this test will demonstrate nothing but will pass.
 
 # End of 4.1 tests

=== modified file 'support-files/compiler_warnings.supp'
--- a/support-files/compiler_warnings.supp	2010-03-30 12:36:49 +0000
+++ b/support-files/compiler_warnings.supp	2010-03-31 19:12:21 +0000
@@ -54,6 +54,12 @@ db_vrfy.c : .*comparison is always false
 # readline is not maintained by us
 #
 .*/cmd-line-utils/readline/.* : .*
+readline\.c : unused parameter
+term\.c : unused parameter
+vi\.c : unused parameter
+common\.c : unused parameter
+term\.c : *.*
+
 
 #
 # Ignore some warnings in libevent, which is not maintained by us.