summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2007-01-22 15:52:15 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2007-01-22 15:52:15 +0200
commitea65c36c19225f91a686c4cc33b1fe1527f1e785 (patch)
treeae0f1a98a4c8478360e9c365fbd767264d164a43 /sql/net_serv.cc
parent3b31ad35321a15ef22c4170a26e1060ca6313e44 (diff)
downloadmariadb-git-ea65c36c19225f91a686c4cc33b1fe1527f1e785.tar.gz
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 mysql-test/purify.supp: Rename: mysql-test/suppress.purify -> mysql-test/purify.supp support-files/compiler_warnings.supp: Rename: support-files/disabled_compiler_warnings.txt -> support-files/compiler_warnings.supp Makefile.am: Added back missing cd from wrong merge heap/hp_write.c: Fixed compiler warning mysql-test/r/mysqlbinlog.result: Fixed test case to drop all used tables at start and used tables after each test group mysql-test/t/mysqlbinlog.test: Fixed test case to drop all used tables at start and used tables after each test group sql/net_serv.cc: Don't give "skipped %d bytes from file" warnings in 5.0 (The proper fix for this is in 5.1) sql/table.cc: Fixed compiler warning
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index e4d45ca1882..e08270c94f4 100644
--- a/sql/net_serv.cc
+++ b/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