Commit 22edf825 authored by unknown's avatar unknown
Browse files

fix atrt mysql_install_db, make sure no extra my.cnf is read

parent 6751cb25

storage/ndb/test/run-test/files.cpp

+5 −4
Original line number Diff line number Diff line
@@ -155,12 +155,13 @@ setup_files(atrt_config& config, int setup, int sshx) 
	  const char * val;

	  require(proc.m_options.m_loaded.get("--datadir=", &val));

	  BaseString tmp;

	  tmp.assfmt("%s/bin/mysql_install_db --datadir=%s > /dev/null 2>&1",

		     g_prefix, val);

	  tmp.assfmt("%s/bin/mysql_install_db --defaults-file=%s/my.cnf --datadir=%s > /dev/null 2>&1",

		     g_prefix, g_basedir, val);

	  if (system(tmp.c_str()) != 0)

	  {

	    g_logger.error("Failed to mysql_install_db for %s",

			   proc.m_proc.m_cwd.c_str());

	    g_logger.error("Failed to mysql_install_db for %s, cmd: >%s<",

			   proc.m_proc.m_cwd.c_str(),

			   tmp.c_str());

	  }

	  else

	  {