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
28adaa43
Commit
28adaa43
authored
Jun 24, 2004
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
parents
674a1c4e
a39a56ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletion
+19
-1
Build-tools/Do-compile
Build-tools/Do-compile
+7
-1
VC++Files/innobase/innobase.dsp
VC++Files/innobase/innobase.dsp
+4
-0
VC++Files/libmysqld/libmysqld.dsp
VC++Files/libmysqld/libmysqld.dsp
+4
-0
VC++Files/sql/mysqld.dsp
VC++Files/sql/mysqld.dsp
+4
-0
No files found.
Build-tools/Do-compile
View file @
28adaa43
...
...
@@ -148,6 +148,7 @@ $ENV{'MYSQL_TCP_PORT'}= $mysql_tcp_port= 3334 + $opt_build_thread*2;
$ENV
{'
MYSQL_UNIX_PORT
'}
=
$mysql_unix_port
=
"
$opt_tmp
/mysql
$opt_suffix
.build
";
$ENV
{"
PERL5LIB
"}
=
"
$pwd
/
$host
/perl5:
$pwd
/
$host
/perl5/site_perl
";
$slave_port
=
$mysql_tcp_port
+
16
;
$ndbcluster_port
=
9350
+
$opt_build_thread
*
2
;
$manager_port
=
$mysql_tcp_port
+
1
;
$mysqladmin_args
=
"
--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20
";
...
...
@@ -357,7 +358,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
log_timestamp
();
system
("
mkdir
$bench_tmpdir
")
if
(
!
-
d
$bench_tmpdir
);
safe_cd
("
${test_dir}
/mysql-test
");
check_system
("
./mysql-test-run
$flags
--warnings --tmpdir=
$bench_tmpdir
--master_port=
$mysql_tcp_port
--slave_port=
$slave_port
--manager-port=
$manager_port
--no-manager --sleep=10
",
"
tests were successful
");
check_system
("
./mysql-test-run
$flags
--warnings --tmpdir=
$bench_tmpdir
--master_port=
$mysql_tcp_port
--slave_port=
$slave_port
--
ndbcluster_port=
$ndbcluster_port
--
manager-port=
$manager_port
--no-manager --sleep=10
",
"
tests were successful
");
}
#
...
...
@@ -475,6 +476,11 @@ $0 takes the following options:
--bdb
Compile with support for Berkeley DB tables
--build-thread=<1,2,3...>
When running several Do-compile runs in parallel, each build
should have its own thread ID, so running the test suites
does not cause conflicts with duplicate TCP port numbers.
--config-env=<environment for configure>
To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'
...
...
VC++Files/innobase/innobase.dsp
View file @
28adaa43
...
...
@@ -368,6 +368,10 @@ SOURCE=.\row\row0vers.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0que.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0srv.c
# End Source File
# Begin Source File
...
...
VC++Files/libmysqld/libmysqld.dsp
View file @
28adaa43
...
...
@@ -568,6 +568,10 @@ SOURCE=..\sql\time.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\tztime.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\uniques.cpp
# End Source File
# Begin Source File
...
...
VC++Files/sql/mysqld.dsp
View file @
28adaa43
...
...
@@ -1820,6 +1820,10 @@ SOURCE=.\time.cpp
# End Source File
# Begin Source File
SOURCE=.\tztime.cpp
# End Source File
# Begin Source File
SOURCE=.\uniques.cpp
# End Source File
# Begin Source File
...
...
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