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, 4 insertions, 2 deletions

diff --git a/sql/event_data_objects.cc b/sql/event_data_objects.cc
index fd9568acf00..7c7ab4df9ad 100644
--- a/sql/event_data_objects.cc
+++ b/sql/event_data_objects.cc
@@ -1455,7 +1455,6 @@ end:
     else
     {
       ulong saved_master_access;
-      bool save_tx_read_only;
 
       thd->set_query(sp_sql.c_ptr_safe(), sp_sql.length());
 
@@ -1463,11 +1462,14 @@ end:
         NOTE: even if we run in read-only mode, we should be able to lock
         the mysql.event table for writing. In order to achieve this, we
         should call mysql_lock_tables() under the super-user.
+
+        Same goes for transaction access mode.
+        Temporarily reset it to read-write.
       */
 
       saved_master_access= thd->security_ctx->master_access;
       thd->security_ctx->master_access |= SUPER_ACL;
-      save_tx_read_only= thd->tx_read_only;
+      bool save_tx_read_only= thd->tx_read_only;
       thd->tx_read_only= false;
 
       ret= Events::drop_event(thd, dbname, name, FALSE);