Commit cebec393 authored by Michael Widenius's avatar Michael Widenius

Fixed compiler warnings

Fixed random failure in test system

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
parent d904739c
...@@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin ...@@ -9,6 +9,6 @@ PATH=$PATH:/usr/ccs/bin:/usr/local/bin
path=`dirname $0` path=`dirname $0`
. "$path/autorun.sh" . "$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 make -j 4
...@@ -95,10 +95,9 @@ static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$', ...@@ -95,10 +95,9 @@ static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
char * char *
fn_tilde_expand(const char *txt) fn_tilde_expand(const char *txt)
{ {
struct passwd pwres, *pass; struct passwd *pass;
char *temp; char *temp;
size_t len = 0; size_t len = 0;
char pwbuf[1024];
if (txt[0] != '~') if (txt[0] != '~')
return (strdup(txt)); return (strdup(txt));
......
...@@ -4,6 +4,7 @@ reset master; ...@@ -4,6 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
drop tables if exists t1;
CALL mtr.add_suppression('Statement may not be safe to log in statement format.'); 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)); 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); INSERT INTO t1 (a) VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
-- source include/not_staging.inc -- source include/not_staging.inc
-- source include/master-slave.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.'); 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)); 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 SQL thread stopped ...@@ -51,10 +55,9 @@ sync_with_master; # won't work if slave SQL thread stopped
connection master; # cleanup connection master; # cleanup
drop table t1; drop table t1;
connection slave; sync_slave_with_master;
sync_with_master;
# If the machine is so fast that slave syncs before OPTIMIZE # 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 # End of 4.1 tests
...@@ -54,6 +54,12 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.* ...@@ -54,6 +54,12 @@ db_vrfy.c : .*comparison is always false due to limited range of data type.*
# readline is not maintained by us # readline is not maintained by us
# #
.*/cmd-line-utils/readline/.* : .* .*/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. # Ignore some warnings in libevent, which is not maintained by us.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment