more fixes for test cases

mysql-test/suite/innodb/include/restart_and_reinit.inc:
  drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
  with loose- prefix ssl errors are ignored
sql-common/client.c:
  compiler warnings
sql/field.cc:
  use the new function
sql/item.cc:
  don't convert time to double or decimal via longlong,
  this loses sub-second part.
  Use dedicated functions.
sql/item.h:
  incorrect cast_to_int type for params
sql/item_strfunc.cc:
  use the new function
sql/lex.h:
  unused
sql/my_decimal.h:
  helper macro
sql/sql_plugin.cc:
  workaround for a compiler warning
sql/sql_yacc.yy:
  unused
sql/transaction.cc:
  fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
  compiler warnings

4 files changed, 15 insertions, 20 deletions

diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc
index e240d935cb2..c9260123f9d 100644
--- a/mysql-test/include/have_openssl.inc
+++ b/mysql-test/include/have_openssl.inc
@@ -1,4 +1,7 @@
--- require r/openssl.require
-disable_query_log;
-show variables like "have_openssl";
-enable_query_log;
+-- source include/have_ssl_communication.inc
+let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
+if (!$crllen)
+{
+  skip Needs OpenSSL;
+}
+
diff --git a/mysql-test/include/have_ssl.inc b/mysql-test/include/have_ssl.inc
deleted file mode 100644
index 6f2d5587a75..00000000000
--- a/mysql-test/include/have_ssl.inc
+++ /dev/null
@@ -1,4 +0,0 @@
--- require r/have_ssl.require
-disable_query_log;
-show variables like 'have_ssl';
-enable_query_log;
diff --git a/mysql-test/include/have_ssl_communication.inc b/mysql-test/include/have_ssl_communication.inc
index 6f2d5587a75..84278e7288a 100644
--- a/mysql-test/include/have_ssl_communication.inc
+++ b/mysql-test/include/have_ssl_communication.inc
@@ -1,4 +1,4 @@
--- require r/have_ssl.require
-disable_query_log;
-show variables like 'have_ssl';
-enable_query_log;
+if (`SELECT count(*) = 0 FROM information_schema.GLOBAL_VARIABLES WHERE
+      VARIABLE_NAME = 'have_ssl' AND VARIABLE_VALUE = 'YES'`){
+  skip Needs SSL;
+}
diff --git a/mysql-test/include/have_ssl_crypto_functs.inc b/mysql-test/include/have_ssl_crypto_functs.inc
index d32f059e4fa..2204c81db39 100644
--- a/mysql-test/include/have_ssl_crypto_functs.inc
+++ b/mysql-test/include/have_ssl_crypto_functs.inc
@@ -1,8 +1,4 @@
--- require r/have_ssl_is_yes_or_disabled_only.require
-disable_query_log;
-# "yes" means that the ssl library is found and the server can communicate using SSL.
-# "no" means that there are no SSL functions in the server.
-# "disabled" means that ssl functions exist, but communication is disabled for some reason.
-replace_regex s/(YES|DISABLED)/yesordisabled/;
-show variables like "have_ssl";
-enable_query_log;
+if (`SELECT count(*) = 0 FROM information_schema.GLOBAL_VARIABLES WHERE
+      VARIABLE_NAME = 'have_ssl' AND VARIABLE_VALUE <> 'NO'`){
+  skip Needs SSL;
+}