Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

innobase/dict/dict0load.c

@@ -335,7 +335,7 @@ dict_load_fields(
 		ut_a(btr_pcur_is_on_user_rec(&pcur, &mtr));
 		if (rec_get_deleted_flag(rec)) {
 			fprintf(stderr,
-"InnoDB: Error: data dictionary entry for table %s is corrupt!\n",
+"InnoDB: Error: data dictionary entry for table %s is corrupt!\n"
 "InnoDB: An index field is delete marked.\n",
 			table->name);
 		}

innobase/row/row0sel.c

@@ -2228,6 +2228,7 @@ row_sel_get_clust_rec_for_mysql(
 	  	rec_sprintf(err_buf, 900, clust_rec);
 	  	fprintf(stderr, "InnoDB: clust index record %s\n", err_buf);
 
+		trx = thr_get_trx(thr);
 		trx_print(err_buf, trx);
 
 	  	fprintf(stderr,

sql/mysqld.cc

@@ -4472,9 +4472,17 @@ fn_format_relative_to_data_home(my_string to, const char *name,
 
 static void fix_paths(void)
 {
-  char buff[FN_REFLEN];
+  char buff[FN_REFLEN],*pos;
   convert_dirname(mysql_home,mysql_home,NullS);
+  /* Resolve symlinks to allow 'mysql_home' to be a relative symlink */
   my_realpath(mysql_home,mysql_home,MYF(0));
+  /* Ensure that mysql_home ends in FN_LIBCHAR */
+  pos=strend(mysql_home);
+  if (pos[-1] != FN_LIBCHAR)
+  {
+    pos[0]= FN_LIBCHAR;
+    pos[1]= 0;
+  }
   convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS);
   convert_dirname(language,language,NullS);
   (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir

sql/nt_servc.cc

@@ -568,31 +568,3 @@ BOOL NTService::is_super_user()
   FreeSid(psidAdministrators);
   return ret_value;
 }
-/* ------------------------------------------------------------------------
- -------------------------------------------------------------------------- */
-BOOL NTService::IsService(LPCSTR ServiceName)
-{
-  BOOL ret_value=FALSE;
-  SC_HANDLE service, scm;
-  
-  if (scm = OpenSCManager(0, 0,SC_MANAGER_ENUMERATE_SERVICE))
-  {
-    if ((service = OpenService(scm,ServiceName, SERVICE_ALL_ACCESS )))
-    {
-      ret_value=TRUE;
-      CloseServiceHandle(service);
-    }
-    CloseServiceHandle(scm);
-  }
-  return ret_value;
-}
-/* ------------------------------------------------------------------------
- -------------------------------------------------------------------------- */
-BOOL NTService::got_service_option(char **argv, char *service_option)
-{
-  char *option;
-  for (option= argv[1]; *option; option++)
-    if (!strcmp(option, service_option))
-      return TRUE;
-  return FALSE;
-}