Commit 45521d97 authored by Guilhem Bichot's avatar Guilhem Bichot

Fix for pushbuild failure (test which can't run in embedded mode) and compiler warning

mysql-test/suite/maria/t/maria_showlog_error.test:
  test which can't run in embedded mode
storage/innobase/handler/ha_innodb.cc:
  compiler warning
parent fb945ef2
-- source include/have_maria.inc
# can't restart server in embedded
--source include/not_embedded.inc
# remove_file can't remove opened file under windows. So we can't reproduce
# the problem there
--source include/not_windows.inc
......
......@@ -1405,7 +1405,9 @@ innobase_init(
int err;
bool ret;
char *default_path;
#ifdef SAFE_MUTEX
my_bool old_safe_mutex_deadlock_detector;
#endif
DBUG_ENTER("innobase_init");
handlerton *innobase_hton= (handlerton *)p;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment