Fixed compiler warnings

Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0

Makefile.am

@@ -123,6 +123,7 @@ tags:
 # making sure each user use different ports.
 
 test-ps:
+	cd mysql-test ; \
 	@PERL@ ./mysql-test-run.pl $(force) --ps-protocol
 
 test-ns:

heap/hp_write.c

@@ -68,7 +68,7 @@ int heap_write(HP_INFO *info, const byte *record)
 
 err:
   if (my_errno == HA_ERR_FOUND_DUPP_KEY)
-    DBUG_PRINT("info",("Duplicate key: %d", keydef - share->keydef));
+    DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef)));
   info->errkey= keydef - share->keydef;
   /*
     We don't need to delete non-inserted key from rb-tree.  Also, if

mysql-test/r/mysqlbinlog.result

 set timestamp=1000000000;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 create table t1 (word varchar(20));
 create table t2 (id int auto_increment not null primary key);
 insert into t1 values ("abirvalg");
@@ -23,7 +23,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -100,7 +100,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -192,6 +192,7 @@ DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+drop table t1,t2;
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932);
@@ -209,13 +210,14 @@ HEX(f)
 select HEX(f) from t4;
 HEX(f)
 835C
+drop table t3,t4,t03,t04;
 flush logs;
 select * from t5  /* must be (1),(1) */;
 a
 1
 1
+drop table t5;
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -234,6 +236,7 @@ c1	c2
 1	Monday
 2	Montag
 3	Monday
+drop table t5;
 drop procedure if exists p1;
 flush logs;
 create procedure p1()
@@ -269,4 +272,3 @@ call p1();
 1
 1
 drop procedure p1;
-drop table t1, t2, t03, t04, t3, t4, t5;

mysql-test/t/mysqlbinlog.test

@@ -7,7 +7,7 @@
 set timestamp=1000000000;
 
 --disable_warnings
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 --enable_warnings
 
 create table t1 (word varchar(20));
@@ -106,8 +106,11 @@ select "--- reading stdin --" as "";
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
+drop table t1,t2;
 
+#
 # Bug#16217 (mysql client did not know how not switch its internal charset)
+#
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932); 
@@ -121,6 +124,7 @@ select HEX(f) from t03;
 select HEX(f) from t3;
 select HEX(f) from t04;
 select HEX(f) from t4;
+drop table t3,t4,t03,t04;
 
 #
 #BUG#14157: utf8 encoding in binlog without set character_set_client
@@ -133,6 +137,7 @@ flush logs;
 # should use default-character-set same as the server.
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
+drop table t5;
 
 #
 # Bug#22645 LC_TIME_NAMES: Statement not replicated
@@ -140,7 +145,6 @@ select * from t5  /* must be (1),(1) */;
 # lc_time_names dependent values correctly
 #
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -152,6 +156,8 @@ flush logs;
 drop table t5;
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000007 | $MYSQL
 select * from t5 order by c1;
+drop table t5;
+
 #
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
 #
@@ -175,6 +181,8 @@ call p1();
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
 call p1();
 drop procedure p1;
+
+#
 # Some coverage of not normally used parts
 #
 --disable_query_log
@@ -182,7 +190,4 @@ drop procedure p1;
 --exec $MYSQL_BINLOG --help 2>&1 > /dev/null
 --enable_query_log
 
-# clean up
-drop table t1, t2, t03, t04, t3, t4, t5; 
-
 # End of 5.0 tests

sql/net_serv.cc

@@ -299,7 +299,7 @@ void net_clear(NET *net)
     {
       DBUG_PRINT("info",("skipped %d bytes from file: %s",
                          count, vio_description(net->vio)));
-#ifdef EXTRA_DEBUG
+#if defined(EXTRA_DEBUG) && (MYSQL_VERSION_ID < 51000)
       fprintf(stderr,"skipped %d bytes from file: %s\n",
               count, vio_description(net->vio));
 #endif

sql/table.cc

@@ -2915,7 +2915,8 @@ Field_iterator_table_ref::get_or_create_column_ref(TABLE_LIST *parent_table_ref)
   uint field_count;
   TABLE_LIST *add_table_ref= parent_table_ref ?
                              parent_table_ref : table_ref;
-
+  LINT_INIT(field_count);
+  
   if (field_it == &table_field_it)
   {
     /* The field belongs to a stored table. */