MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:holyfoot Date:July 21 2006 12:02pm
Subject:bk commit into 5.0 tree (holyfoot:1.2226) BUG#20950
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-21 17:02:04+05:00, holyfoot@stripped +1 -0
  bug #20950 (mysql_upgrade looks for 'mysqlcheck' not for 'mysqlcheck.exe'
  on Windows.
  
  Code added to look for different names on Windows

  client/mysql_upgrade.c@stripped, 2006-07-21 17:02:01+05:00, holyfoot@stripped +11 -2
    added conditionally-compiled part to look for different names of tools
    on Windows

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.20950

--- 1.3/client/mysql_upgrade.c	2006-07-21 17:02:10 +05:00
+++ 1.4/client/mysql_upgrade.c	2006-07-21 17:02:10 +05:00
@@ -17,6 +17,14 @@
 #include "client_priv.h"
 #include <my_dir.h>
 
+#ifdef __WIN__
+const char *mysqlcheck_name= "mysqlcheck.exe";
+const char *mysql_name= "mysql.exe";
+#else
+const char *mysqlcheck_name= "mysqlcheck";
+const char *mysql_name= "mysql";
+#endif /*__WIN__*/
+
 static my_bool opt_force= 0, opt_verbose= 0, tty_password= 0;
 static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;
 static my_bool upgrade_defaults_created= 0;
@@ -272,7 +280,7 @@
   strmake(bindir_end, "/bin", sizeof(bindir) - (int) (bindir_end - bindir)-1);
 
   if (!test_file_exists_res
-      (bindir, "mysqlcheck", mysqlcheck_line, &mysqlcheck_end))
+      (bindir, mysqlcheck_name, mysqlcheck_line, &mysqlcheck_end))
   {
     printf("Can't find program '%s'\n", mysqlcheck_line);
     puts("Please restart with --basedir=mysql-install-directory");
@@ -342,7 +350,8 @@
     goto err_exit;
 
 fix_priv_tables:
-  if (!test_file_exists_res(bindir, "mysql", fix_priv_tables_cmd, &fix_cmd_end))
+  if (!test_file_exists_res(bindir, mysql_name,
+                            fix_priv_tables_cmd, &fix_cmd_end))
   {
     puts("Could not find MySQL command-line client (mysql).");
     puts
Thread
bk commit into 5.0 tree (holyfoot:1.2226) BUG#20950holyfoot21 Jul