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

1 files changed, 6 insertions, 5 deletions

diff --git a/sql-common/client.c b/sql-common/client.c
index d1888ee691e..52a64a2d6f4 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -127,7 +127,7 @@ const char 	*def_shared_memory_base_name= default_shared_memory_base_name;
 static void mysql_close_free_options(MYSQL *mysql);
 static void mysql_close_free(MYSQL *mysql);
 static void mysql_prune_stmt_list(MYSQL *mysql);
-static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length);
+static int cli_report_progress(MYSQL *mysql, char *packet, uint length);
 
 #if !defined(__WIN__)
 static int wait_for_data(my_socket fd, uint timeout);
@@ -783,7 +783,7 @@ restart:
   {
     if (len > 3)
     {
-      uchar *pos= net->read_pos+1;
+      char *pos= (char*) net->read_pos+1;
       uint last_errno=uint2korr(pos);
 
       if (last_errno == 65535 &&
@@ -1064,10 +1064,11 @@ static void cli_flush_use_result(MYSQL *mysql, my_bool flush_all_results)
     1  error
 */
 
-static int cli_report_progress(MYSQL *mysql, uchar *packet, uint length)
+static int cli_report_progress(MYSQL *mysql, char *pkt, uint length)
 {
   uint stage, max_stage, proc_length;
   double progress;
+  uchar *packet= (uchar*)pkt;
   uchar *start= packet;
 
   if (length < 5)
@@ -1411,7 +1412,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
           break;
         case OPT_plugin_dir:
           {
-            char buff[FN_REFLEN], buff2[FN_REFLEN];
+            char buff[FN_REFLEN], buff2[FN_REFLEN], *buff2_ptr= buff2;
             if (strlen(opt_arg) >= FN_REFLEN)
               opt_arg[FN_REFLEN]= '\0';
             if (my_realpath(buff, opt_arg, 0))
@@ -1421,7 +1422,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
               break;
             }
             convert_dirname(buff, buff2, NULL);
-            EXTENSION_SET_STRING(options, plugin_dir, buff2);
+            EXTENSION_SET_STRING(options, plugin_dir, buff2_ptr);
           }
           break;
         case OPT_default_auth: