database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Port mysql_upgrade to be tested on windows

Browse Source 
client/mysql_upgrade.c:
  Send error messages to stderr
  Add new define EXTRA_CLIENT_PATHS containing additional paths where
  to look for the client binaries
This commit is contained in:
unknown
2006-11-21 00:46:13 +01:00
parent 2244f8e73d
commit 4cd2aa73dd
1 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/mysql_upgrade.c
View File

@@ -31,10 +31,12 @@
const char *mysqlcheck_name= "mysqlcheck.exe"; const char *mysqlcheck_name= "mysqlcheck.exe";
const char *mysql_name= "mysql.exe"; const char *mysql_name= "mysql.exe";
const char *mysqld_name= "mysqld.exe"; const char *mysqld_name= "mysqld.exe";
#define EXTRA_CLIENT_PATHS "client/release", "client/debug"
#else #else
const char *mysqlcheck_name= "mysqlcheck"; const char *mysqlcheck_name= "mysqlcheck";
const char *mysql_name= "mysql"; const char *mysql_name= "mysql";
const char *mysqld_name= "mysqld"; const char *mysqld_name= "mysqld";
#define EXTRA_CLIENT_PATHS "client"
#endif /*__WIN__*/ #endif /*__WIN__*/
extern TYPELIB sql_protocol_typelib; extern TYPELIB sql_protocol_typelib;
@@ -497,7 +499,8 @@ int main(int argc, char **argv)
"mysql", NullS)) "mysql", NullS))
{ {
ret= 1; ret= 1;
puts("Can't find data directory. Please restart with" fprintf(stderr,
"Can't find data directory. Please restart with"
" --datadir=path-to-writable-data-dir"); " --datadir=path-to-writable-data-dir");
goto error; goto error;
} }
@@ -541,11 +544,13 @@ int main(int argc, char **argv)
} }
if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path), if (find_file(mysqlcheck_name, basedir, MYF(0), path, sizeof(path),
"bin", "client", NullS)) "bin", EXTRA_CLIENT_PATHS, NullS))
{ {
ret= 1; ret= 1;
printf("Can't find program '%s'\n", mysqlcheck_name); fprintf(stderr,
puts("Please restart with --basedir=mysql-install-directory"); "Can't find program '%s'\n"
"Please restart with --basedir=mysql-install-directory",
mysqlcheck_name);
goto error; goto error;
} }
else else
@@ -567,7 +572,7 @@ int main(int argc, char **argv)
ret= system(cmdline.str); ret= system(cmdline.str);
if (ret) if (ret)
{ {
printf("Error executing '%s'\n", cmdline.str); fprintf(stderr, "Error executing '%s'\n", cmdline.str);
goto error; goto error;
} }
@@ -578,10 +583,11 @@ int main(int argc, char **argv)
fix_priv_tables: fix_priv_tables:
if (find_file(mysql_name, basedir, MYF(0), path, sizeof(path), if (find_file(mysql_name, basedir, MYF(0), path, sizeof(path),
"bin", "client", NullS)) "bin", EXTRA_CLIENT_PATHS, NullS))
{ {
ret= 1; ret= 1;
puts("Could not find MySQL command-line client (mysql).\n" fprintf(stderr,
"Could not find MySQL command-line client (mysql).\n"
"Please use --basedir to specify the directory" "Please use --basedir to specify the directory"
" where MySQL is installed."); " where MySQL is installed.");
goto error; goto error;
@@ -598,7 +604,8 @@ fix_priv_tables:
"share/mysql", NullS)) "share/mysql", NullS))
{ {
ret= 1; ret= 1;
puts("Could not find file " MYSQL_FIX_PRIV_TABLES_NAME "\n" fprintf(stderr,
"Could not find file " MYSQL_FIX_PRIV_TABLES_NAME "\n"
"Please use --basedir to specify the directory" "Please use --basedir to specify the directory"
" where MySQL is installed"); " where MySQL is installed");
goto error; goto error;
@@ -621,7 +628,7 @@ fix_priv_tables:
ret= system(cmdline.str); ret= system(cmdline.str);
if (ret) if (ret)
printf("Error executing '%s'\n", cmdline.str); fprintf(stderr, "Error executing '%s'\n", cmdline.str);
error: error:
dynstr_free(&cmdline); dynstr_free(&cmdline);