Changed relay_log_space to ulonglong

Removed compiler warnings.


Build-tools/Do-compile:
  Simple cleanup
include/mysql.h:
  Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
  Documented test
  Change to be runnable from mysql
sql/mini_client.cc:
  Removed dead code
sql/mysqld.cc:
  Changed relay_log_space to ulonglong
sql/slave.cc:
  Changed relay_log_space to ulonglong
  Removed dead code
sql/slave.h:
  Changed relay_log_space to ulonglong
sql/sql_acl.cc:
  Removed not used variables
sql/sql_base.cc:
  Removed not used variables
sql/sql_cache.cc:
  Removed not used variables
sql/sql_select.cc:
  Removed not used variables
vio/vio.c:
  Re-order include files to remove compiler warnings

1 files changed, 10 insertions, 3 deletions

diff --git a/mysql-test/t/innodb_handler.test b/mysql-test/t/innodb_handler.test
index 2f53de3beb7..6b85be9c7ab 100644
--- a/mysql-test/t/innodb_handler.test
+++ b/mysql-test/t/innodb_handler.test
@@ -30,13 +30,15 @@ handler t2 read a next;
 handler t2 read a=(15);
 handler t2 read a=(16);
 
-!$1070 handler t2 read a=(19,"fff");
+--error 1070
+handler t2 read a=(19,"fff");
 
 handler t2 read b=(19,"fff");
 handler t2 read b=(19,"yyy");
 handler t2 read b=(19);
 
-!$1109 handler t1 read a last;
+--error 1109
+handler t1 read a last;
 
 handler t2 read a=(11);
 handler t2 read a>=(11);
@@ -60,9 +62,14 @@ handler t2 read a=(19) where b="yyy";
 
 handler t2 read first;
 handler t2 read next;
+#
+# We alter the table even if it's still in use by to test the Innodb
+# delayed-drop code.  This will generate a warning in the master.err log.
+#
 alter table t1 type=innodb;
 handler t2 read next;
-!$1064 handler t2 read last;
+--error 1064
+handler t2 read last;
 
 handler t2 close;
 drop table if exists t1;