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

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50

Browse Source 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
This commit is contained in:
tsmith@quadxeon.mysql.com
2007-03-07 10:32:23 +01:00
parent 87468d064b 3b4032362b
commit c92e7b13b2
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysql_upgrade.c
View File

@@ -463,8 +463,9 @@ int main(int argc, char **argv)
char *forced_defaults_file; char *forced_defaults_file;
char *forced_extra_defaults; char *forced_extra_defaults;
char *local_defaults_group_suffix; char *local_defaults_group_suffix;
int no_defaults;
char path[FN_REFLEN], upgrade_defaults_path[FN_REFLEN]; char path[FN_REFLEN], upgrade_defaults_path[FN_REFLEN];
DYNAMIC_STRING cmdline; DYNAMIC_STRING cmdline;
MY_INIT(argv[0]); MY_INIT(argv[0]);
@@ -586,7 +587,9 @@ int main(int argc, char **argv)
instruct mysqlcheck to only read options from that file instruct mysqlcheck to only read options from that file
*/ */
dynstr_append(&cmdline, " "); dynstr_append(&cmdline, " ");
dynstr_append_os_quoted(&cmdline, "--defaults-file=", dynstr_append_os_quoted(&cmdline,
(no_defaults ? "--defaults-file=" :
"--defaults-extra-file="),
upgrade_defaults_path, NullS); upgrade_defaults_path, NullS);
dynstr_append(&cmdline, " "); dynstr_append(&cmdline, " ");
dynstr_append_os_quoted(&cmdline, "--check-upgrade", NullS); dynstr_append_os_quoted(&cmdline, "--check-upgrade", NullS);
@@ -661,7 +664,9 @@ fix_priv_tables:
instruct mysql to only read options from that file instruct mysql to only read options from that file
*/ */
dynstr_append(&cmdline, " "); dynstr_append(&cmdline, " ");
dynstr_append_os_quoted(&cmdline, "--defaults-file=", dynstr_append_os_quoted(&cmdline,
(no_defaults ? "--defaults-file=" :
"--defaults-extra-file="),
upgrade_defaults_path, NullS); upgrade_defaults_path, NullS);
dynstr_append(&cmdline, " "); dynstr_append(&cmdline, " ");
dynstr_append_os_quoted(&cmdline, "--force", NullS); dynstr_append_os_quoted(&cmdline, "--force", NullS);

6
client/mysqltest.c
View File

@@ -1700,12 +1700,14 @@ void do_exec(struct st_command *command)
} }
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */ /* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0) while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
; ;
/* Replace "closed stdout" with non existing output fd */ /* Replace "closed stdout" with non existing output fd */
while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0) while(replace(&ds_cmd, ">&-", 3, ">&4", 3) == 0)
; ;
#endif
#endif #endif
DBUG_PRINT("info", ("Executing '%s' as '%s'", DBUG_PRINT("info", ("Executing '%s' as '%s'",
@@ -1870,10 +1872,12 @@ void do_system(struct st_command *command)
do_eval(&ds_cmd, command->first_argument, command->end, !is_windows); do_eval(&ds_cmd, command->first_argument, command->end, !is_windows);
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
/* Replace /dev/null with NUL */ /* Replace /dev/null with NUL */
while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0) while(replace(&ds_cmd, "/dev/null", 9, "NUL", 3) == 0)
; ;
#endif #endif
#endif
DBUG_PRINT("info", ("running system command '%s' as '%s'", DBUG_PRINT("info", ("running system command '%s' as '%s'",
@@ -5964,7 +5968,9 @@ int main(int argc, char **argv)
init_builtin_echo(); init_builtin_echo();
#ifdef __WIN__ #ifdef __WIN__
#ifndef USE_CYGWIN
is_windows= 1; is_windows= 1;
#endif
init_tmp_sh_file(); init_tmp_sh_file();
init_win_path_patterns(); init_win_path_patterns();
#endif #endif

6
mysql-test/lib/mtr_misc.pl
View File

@@ -68,6 +68,12 @@ sub mtr_short_hostname () {
sub mtr_native_path($) sub mtr_native_path($)
{ {
my $path= shift; my $path= shift;
# MySQL version before 5.0 still use cygwin, no need
# to convert path
return $path
if ($::mysql_version_id < 50000);
$path=~ s/\//\\/g $path=~ s/\//\\/g
if ($::glob_win32); if ($::glob_win32);
return $path; return $path;