merge

innobase/log/log0log.c:
  Auto merged
mysql-test/r/rpl_failsafe.result:
  Auto merged
mysql-test/t/rpl_failsafe.test:
  Auto merged

1 files changed, 19 insertions, 4 deletions

diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 9f7cb1dd11c..7e11fbe46d1 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -541,9 +541,24 @@ innobase_init(void)
 {
 	int		err;
 	bool		ret;
-	
+	char 	        current_lib[2], *default_path;
+
   	DBUG_ENTER("innobase_init");
 
+	/*
+	  When using the embedded server, the datadirectory is not
+	  in the current directory.
+	*/
+	if (!mysql_embedded)
+	  default_path=mysql_real_data_home;
+	else
+	{
+	  /* It's better to use current lib, to keep path's short */
+	  current_lib[0]=FN_CURLIB;
+	  current_lib[1]=FN_LIBCHAR;
+	  default_path=current_lib;
+	}
+
 	if (specialflag & SPECIAL_NO_PRIOR) {
 	        srv_set_thread_priorities = FALSE;
 	} else {
@@ -559,10 +574,10 @@ innobase_init(void)
 						   MYF(MY_WME));
 
 	srv_data_home = (innobase_data_home_dir ? innobase_data_home_dir :
-			 mysql_real_data_home);
+			 default_path);
 	srv_logs_home = (char*) "";
 	srv_arch_dir =  (innobase_log_arch_dir ? innobase_log_arch_dir :
-			 mysql_real_data_home);
+			 default_path);
 
 	ret = innobase_parse_data_file_paths_and_sizes();
 
@@ -572,7 +587,7 @@ innobase_init(void)
 	}
 
 	if (!innobase_log_group_home_dir)
-	  innobase_log_group_home_dir= mysql_real_data_home;
+	  innobase_log_group_home_dir= default_path;
 	ret = innobase_parse_log_group_home_dirs();
 
 	if (ret == FALSE) {