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
ce488b51
Commit
ce488b51
authored
Mar 22, 2005
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
parents
5e598cce
3a88de43
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+3
-3
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+1
-1
No files found.
mysql-test/mysql-test-run.pl
View file @
ce488b51
...
@@ -578,7 +578,7 @@ sub command_line_setup () {
...
@@ -578,7 +578,7 @@ sub command_line_setup () {
$slave
->
[
0
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave.pid
";
$slave
->
[
0
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave.pid
";
$slave
->
[
0
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave.sock
";
$slave
->
[
0
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave.sock
";
$slave
->
[
0
]
->
{'
path_myport
'}
=
$opt_slave_myport
;
$slave
->
[
0
]
->
{'
path_myport
'}
=
$opt_slave_myport
;
$slave
->
[
0
]
->
{'
start_timeout
'}
=
400
;
$slave
->
[
0
]
->
{'
start_timeout
'}
=
400
;
$slave
->
[
1
]
->
{'
path_myddir
'}
=
"
$glob_mysql_test_dir
/var/slave1-data
";
$slave
->
[
1
]
->
{'
path_myddir
'}
=
"
$glob_mysql_test_dir
/var/slave1-data
";
$slave
->
[
1
]
->
{'
path_myerr
'}
=
"
$glob_mysql_test_dir
/var/log/slave1.err
";
$slave
->
[
1
]
->
{'
path_myerr
'}
=
"
$glob_mysql_test_dir
/var/log/slave1.err
";
...
@@ -586,7 +586,7 @@ sub command_line_setup () {
...
@@ -586,7 +586,7 @@ sub command_line_setup () {
$slave
->
[
1
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave1.pid
";
$slave
->
[
1
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave1.pid
";
$slave
->
[
1
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave1.sock
";
$slave
->
[
1
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave1.sock
";
$slave
->
[
1
]
->
{'
path_myport
'}
=
$opt_slave_myport
+
1
;
$slave
->
[
1
]
->
{'
path_myport
'}
=
$opt_slave_myport
+
1
;
$slave
->
[
1
]
->
{'
start_timeout
'}
=
30
;
$slave
->
[
1
]
->
{'
start_timeout
'}
=
30
0
;
$slave
->
[
2
]
->
{'
path_myddir
'}
=
"
$glob_mysql_test_dir
/var/slave2-data
";
$slave
->
[
2
]
->
{'
path_myddir
'}
=
"
$glob_mysql_test_dir
/var/slave2-data
";
$slave
->
[
2
]
->
{'
path_myerr
'}
=
"
$glob_mysql_test_dir
/var/log/slave2.err
";
$slave
->
[
2
]
->
{'
path_myerr
'}
=
"
$glob_mysql_test_dir
/var/log/slave2.err
";
...
@@ -594,7 +594,7 @@ sub command_line_setup () {
...
@@ -594,7 +594,7 @@ sub command_line_setup () {
$slave
->
[
2
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave2.pid
";
$slave
->
[
2
]
->
{'
path_mypid
'}
=
"
$glob_mysql_test_dir
/var/run/slave2.pid
";
$slave
->
[
2
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave2.sock
";
$slave
->
[
2
]
->
{'
path_mysock
'}
=
"
$opt_tmpdir
/slave2.sock
";
$slave
->
[
2
]
->
{'
path_myport
'}
=
$opt_slave_myport
+
2
;
$slave
->
[
2
]
->
{'
path_myport
'}
=
$opt_slave_myport
+
2
;
$slave
->
[
2
]
->
{'
start_timeout
'}
=
30
;
$slave
->
[
2
]
->
{'
start_timeout
'}
=
30
0
;
# Do sanity checks of command line arguments
# Do sanity checks of command line arguments
...
...
mysql-test/mysql-test-run.sh
View file @
ce488b51
...
@@ -232,7 +232,7 @@ SLEEP_TIME_FOR_DELETE=10
...
@@ -232,7 +232,7 @@ SLEEP_TIME_FOR_DELETE=10
SLEEP_TIME_FOR_FIRST_MASTER
=
400
# Enough time to create innodb tables
SLEEP_TIME_FOR_FIRST_MASTER
=
400
# Enough time to create innodb tables
SLEEP_TIME_FOR_SECOND_MASTER
=
400
SLEEP_TIME_FOR_SECOND_MASTER
=
400
SLEEP_TIME_FOR_FIRST_SLAVE
=
400
SLEEP_TIME_FOR_FIRST_SLAVE
=
400
SLEEP_TIME_FOR_SECOND_SLAVE
=
30
SLEEP_TIME_FOR_SECOND_SLAVE
=
30
0
CHARACTER_SET
=
latin1
CHARACTER_SET
=
latin1
DBUSER
=
""
DBUSER
=
""
START_WAIT_TIMEOUT
=
10
START_WAIT_TIMEOUT
=
10
...
...
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