Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
38576601
Commit
38576601
authored
Jul 07, 2005
by
kent@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents
7d7a59e4
044061be
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
21 deletions
+30
-21
VC++Files/tests/mysql_client_test.dsp
VC++Files/tests/mysql_client_test.dsp
+4
-4
mysql-test/lib/mtr_misc.pl
mysql-test/lib/mtr_misc.pl
+6
-5
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+20
-12
No files found.
VC++Files/tests/mysql_client_test.dsp
View file @
38576601
...
...
@@ -51,8 +51,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\
client_debug\
mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib mysqlclient.lib wsock32.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\
client_debug\
mysql_client_test.exe" /incremental:yes /libpath:"..\lib_debug\" /debug /pdb:".\Debug\mysql_client_test.pdb" /pdbtype:sept /map:".\Debug\mysql_client_test.map" /subsystem:console
!ELSEIF "$(CFG)" == "mysql_client_test - Win32 Release"
...
...
@@ -76,8 +76,8 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\
client_release\
mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib ..\extra\yassl\Release\yassl.lib /nologo /out:"..\
client_release\
mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console
!ENDIF
...
...
mysql-test/lib/mtr_misc.pl
View file @
38576601
...
...
@@ -83,18 +83,19 @@ sub mtr_script_exists (@) {
}
sub
mtr_exe_exists
(@)
{
foreach
my
$path
(
@_
)
my
@path
=
@_
;
map
{
$_
.=
"
.exe
"}
@path
if
$::glob_win32
;
foreach
my
$path
(
@path
)
{
$path
.=
"
.exe
"
if
$::opt_win32
;
return
$path
if
-
x
$path
;
}
if
(
@
_
==
1
)
if
(
@
path
==
1
)
{
mtr_error
("
Could not find
$
_
[0]
");
mtr_error
("
Could not find
$
path
[0]
");
}
else
{
mtr_error
("
Could not find any of
"
.
join
("
",
@
_
));
mtr_error
("
Could not find any of
"
.
join
("
",
@
path
));
}
}
...
...
mysql-test/mysql-test-run.pl
View file @
38576601
...
...
@@ -419,7 +419,8 @@ sub initial_setup () {
{
# Windows programs like 'mysqld' needs Windows paths
$glob_mysql_test_dir
=
`
cygpath -m
$glob_mysql_test_dir
`;
$glob_cygwin_shell
=
`
cygpath -w
$ENV
{'SHELL'}
`;
# The Windows path c:\...
my
$shell
=
$ENV
{'
SHELL
'}
||
"
/bin/bash
";
$glob_cygwin_shell
=
`
cygpath -w
$shell
`;
# The Windows path c:\...
chomp
(
$glob_mysql_test_dir
);
chomp
(
$glob_cygwin_shell
);
}
...
...
@@ -791,13 +792,15 @@ sub executable_setup () {
my
$path_examples
=
"
$glob_basedir
/libmysqld/examples
";
$exe_mysqltest
=
mtr_exe_exists
("
$path_examples
/mysqltest
");
$exe_mysql_client_test
=
mtr_exe_exists
("
$path_examples
/mysql_client_test_embedded
");
mtr_exe_exists
("
$path_examples
/mysql_client_test_embedded
",
"
/usr/bin/false
");
}
else
{
$exe_mysqltest
=
mtr_exe_exists
("
$path_client_bindir
/mysqltest
");
$exe_mysql_client_test
=
mtr_exe_exists
("
$glob_basedir
/tests/mysql_client_test
");
mtr_exe_exists
("
$glob_basedir
/tests/mysql_client_test
",
"
/usr/bin/false
");
}
$exe_mysqldump
=
mtr_exe_exists
("
$path_client_bindir
/mysqldump
");
$exe_mysqlshow
=
mtr_exe_exists
("
$path_client_bindir
/mysqlshow
");
...
...
@@ -819,7 +822,8 @@ sub executable_setup () {
$exe_mysqladmin
=
mtr_exe_exists
("
$path_client_bindir
/mysqladmin
");
$exe_mysql
=
mtr_exe_exists
("
$path_client_bindir
/mysql
");
$exe_mysql_fix_system_tables
=
mtr_script_exists
("
$path_client_bindir
/mysql_fix_privilege_tables
");
mtr_script_exists
("
$path_client_bindir
/mysql_fix_privilege_tables
",
"
$glob_basedir
/scripts/mysql_fix_privilege_tables
");
$path_language
=
mtr_path_exists
("
$glob_basedir
/share/mysql/english/
",
"
$glob_basedir
/share/english/
");
...
...
@@ -833,13 +837,15 @@ sub executable_setup () {
$exe_mysqltest
=
mtr_exe_exists
("
$path_client_bindir
/mysqltest_embedded
");
$exe_mysql_client_test
=
mtr_exe_exists
("
$glob_basedir
/tests/mysql_client_test_embedded
",
"
$path_client_bindir
/mysql_client_test_embedded
");
"
$path_client_bindir
/mysql_client_test_embedded
",
"
/usr/bin/false
");
}
else
{
$exe_mysqltest
=
mtr_exe_exists
("
$path_client_bindir
/mysqltest
");
$exe_mysql_client_test
=
mtr_exe_exists
("
$path_client_bindir
/mysql_client_test
");
mtr_exe_exists
("
$path_client_bindir
/mysql_client_test
",
"
/usr/bin/false
");
# FIXME temporary
}
$path_ndb_tools_dir
=
"
$glob_basedir
/bin
";
...
...
@@ -1548,7 +1554,7 @@ sub do_before_start_master ($$) {
$tname
ne
"
rpl_crash_binlog_ib_3b
")
{
# FIXME we really want separate dir for binlogs
foreach
my
$bin
(
glob
("
$opt_vardir
/log/master*-bin
.
*
")
)
foreach
my
$bin
(
glob
("
$opt_vardir
/log/master*-bin*
")
)
{
unlink
(
$bin
);
}
...
...
@@ -1586,13 +1592,13 @@ sub do_before_start_slave ($$) {
$tname
ne
"
rpl_crash_binlog_ib_3b
"
)
{
# FIXME we really want separate dir for binlogs
foreach
my
$bin
(
glob
("
$opt_vardir
/log/slave*-bin
.
*
")
)
foreach
my
$bin
(
glob
("
$opt_vardir
/log/slave*-bin*
")
)
{
unlink
(
$bin
);
}
# FIXME really master?!
unlink
("
$
opt_vardir
/slave-data
/master.info
");
unlink
("
$
opt_vardir
/slave-data
/relay-log.info
");
unlink
("
$
slave
->[0]->{'path_myddir'}
/master.info
");
unlink
("
$
slave
->[0]->{'path_myddir'}
/relay-log.info
");
}
# Run slave initialization shell script if one exists
...
...
@@ -1606,8 +1612,10 @@ sub do_before_start_slave ($$) {
}
}
`
rm -f
$opt_vardir
/slave-data/log.*
`;
# unlink("$opt_vardir/slave-data/log.*");
foreach
my
$bin
(
glob
("
$slave
->[0]->{'path_myddir'}/log.*
")
)
{
unlink
(
$bin
);
}
}
sub
mysqld_arguments
($$$$$)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment