Portability fixes

Fixed bug with long log-filenames in Innobase.


mysql-test/r/select.result:
  Turn off SCCS flag
mysql-test/t/alias.test:
  Turn off SCCS flag
mysql-test/t/backup.test:
  Turn off SCCS flag
mysql-test/t/bdb-crash.test:
  Turn off SCCS flag
mysql-test/t/bench_count_distinct.test:
  Turn off SCCS flag
mysql-test/t/bulk_replace.test:
  Turn off SCCS flag
mysql-test/t/check.test:
  Turn off SCCS flag
mysql-test/t/count_distinct2-master.opt:
  Turn off SCCS flag
mysql-test/t/count_distinct2.test:
  Turn off SCCS flag
mysql-test/t/dirty-close.test:
  Turn off SCCS flag
mysql-test/t/drop.test:
  Turn off SCCS flag
mysql-test/t/flush.test:
  Turn off SCCS flag
mysql-test/t/fulltext_cache.test:
  Turn off SCCS flag
mysql-test/t/fulltext_distinct.test:
  Turn off SCCS flag
mysql-test/t/fulltext_left_join.test:
  Turn off SCCS flag
mysql-test/t/fulltext_update.test:
  Turn off SCCS flag
mysql-test/t/fulltext_var.test:
  Turn off SCCS flag
mysql-test/t/handler.test:
  Turn off SCCS flag
mysql-test/t/having.test:
  Turn off SCCS flag
mysql-test/t/innodb.test:
  Turn off SCCS flag
mysql-test/t/join_crash.test:
  Turn off SCCS flag
mysql-test/t/kill.test:
  Turn off SCCS flag
mysql-test/t/lock.test:
  Turn off SCCS flag
mysql-test/t/multi_update.test:
  Turn off SCCS flag
mysql-test/t/myisam.test:
  Turn off SCCS flag
mysql-test/t/openssl_1.test:
  Turn off SCCS flag
mysql-test/t/openssl_2.test:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf-master.opt:
  Turn off SCCS flag
mysql-test/t/order_fill_sortbuf.test:
  Turn off SCCS flag
mysql-test/t/overflow.test:
  Turn off SCCS flag
mysql-test/t/rpl000007-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000008-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000009-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000010-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000013-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000015-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000016-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave-master-info.opt:
  Turn off SCCS flag
mysql-test/t/rpl000016-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000017-slave.sh:
  Turn off SCCS flag
mysql-test/t/rpl000017.test:
  Turn off SCCS flag
mysql-test/t/rpl000018-master.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018-slave.opt:
  Turn off SCCS flag
mysql-test/t/rpl000018.test:
  Turn off SCCS flag
mysql-test/t/rpl_log.test:
  Turn off SCCS flag
mysql-test/t/rpl_magic.test:
  Turn off SCCS flag
mysql-test/t/rpl_mystery22.test:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master-master.opt:
  Turn off SCCS flag
mysql-test/r/alias.result:
  Turn off SCCS flag
mysql-test/r/backup.result:
  Turn off SCCS flag
mysql-test/r/bdb-crash.result:
  Turn off SCCS flag
mysql-test/r/bench_count_distinct.result:
  Turn off SCCS flag
mysql-test/r/big_test.require:
  Turn off SCCS flag
mysql-test/r/bulk_replace.result:
  Turn off SCCS flag
mysql-test/r/check.result:
  Turn off SCCS flag
mysql-test/r/count_distinct2.result:
  Turn off SCCS flag
mysql-test/r/dirty-close.result:
  Turn off SCCS flag
mysql-test/r/drop.result:
  Turn off SCCS flag
mysql-test/r/flush.result:
  Turn off SCCS flag
mysql-test/r/fulltext_cache.result:
  Turn off SCCS flag
mysql-test/r/fulltext_distinct.result:
  Turn off SCCS flag
mysql-test/r/fulltext_left_join.result:
  Turn off SCCS flag
mysql-test/r/fulltext_multi.result:
  Turn off SCCS flag
mysql-test/r/fulltext_order_by.result:
  Turn off SCCS flag
mysql-test/r/fulltext_update.result:
  Turn off SCCS flag
mysql-test/r/fulltext_var.result:
  Turn off SCCS flag
mysql-test/r/func_timestamp.result:
  Turn off SCCS flag
mysql-test/t/rpl_sporadic_master.test:
  Turn off SCCS flag
mysql-test/t/select_found.test:
  Turn off SCCS flag
mysql-test/t/status.test:
  Turn off SCCS flag
mysql-test/t/symlink.test:
  Turn off SCCS flag
mysql-test/t/type_decimal.test:
  Turn off SCCS flag
mysql-test/t/union.test:
  Turn off SCCS flag
mysql-test/t/user_var.test:
  Turn off SCCS flag
mysql-test/r/handler.result:
  Turn off SCCS flag
mysql-test/r/have_bdb.require:
  Turn off SCCS flag
mysql-test/r/have_innodb.require:
  Turn off SCCS flag
mysql-test/r/have_isam.require:
  Turn off SCCS flag
mysql-test/r/have_openssl.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_1.require:
  Turn off SCCS flag
mysql-test/r/have_openssl_2.require:
  Turn off SCCS flag
mysql-test/r/have_raid.require:
  Turn off SCCS flag
mysql-test/r/have_symlink.require:
  Turn off SCCS flag
mysql-test/r/having.result:
  Turn off SCCS flag
mysql-test/r/innodb.result:
  Turn off SCCS flag
mysql-test/r/join_crash.result:
  Turn off SCCS flag
mysql-test/r/kill.result:
  Turn off SCCS flag
mysql-test/r/lock.result:
  Turn off SCCS flag
mysql-test/r/multi_update.result:
  Turn off SCCS flag
mysql-test/r/myisam.result:
  Turn off SCCS flag
mysql-test/r/openssl_1.result:
  Turn off SCCS flag
mysql-test/r/openssl_2.result:
  Turn off SCCS flag
mysql-test/r/order_fill_sortbuf.result:
  Turn off SCCS flag
mysql-test/r/rpl000001.result:
  Turn off SCCS flag
mysql-test/r/rpl000004.result:
  Turn off SCCS flag
mysql-test/r/rpl000017.result:
  Turn off SCCS flag
mysql-test/r/rpl000018.result:
  Turn off SCCS flag
mysql-test/r/rpl_log.result:
  Turn off SCCS flag
mysql-test/r/rpl_magic.result:
  Turn off SCCS flag
mysql-test/r/rpl_mystery22.result:
  Turn off SCCS flag
mysql-test/r/rpl_sporadic_master.result:
  Turn off SCCS flag
mysql-test/r/select_found.result:
  Turn off SCCS flag
mysql-test/r/status.result:
  Turn off SCCS flag
mysql-test/r/symlink.result:
  Turn off SCCS flag
mysql-test/r/type_decimal.result:
  Turn off SCCS flag
mysql-test/r/union.result:
  Turn off SCCS flag
mysql-test/r/user_var.result:
  Turn off SCCS flag
Docs/manual.texi:
  Fixed typo.
innobase/log/log0log.c:
  Fixed too short filename buffer.
mysys/mf_sort.c:
  Ensure that radix isn't used for VERY big arrrays.
scripts/make_binary_distribution.sh:
  Add mysqlmanager-pwgen and mysqlmanagerc into binary distribution.
sql-bench/test-insert.sh:
  Time out update_with_key_prefix
sql/ha_innobase.cc:
  Use current directory as base dir, if we are not using the embedded version.
tools/mysqlmanager.c:
  Portability fix

1 files changed, 18 insertions, 4 deletions

diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index e7d98dbe406..fde2d1ec512 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -526,9 +526,23 @@ 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 {
@@ -544,10 +558,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();
 
@@ -557,7 +571,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) {