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
de3a7d11
Commit
de3a7d11
authored
Oct 04, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge
mysql-test/mysql-test-run.sh: SCCS merged
parents
606d13eb
2ed312ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
33 deletions
+37
-33
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+37
-33
No files found.
mysql-test/mysql-test-run.sh
View file @
de3a7d11
...
@@ -928,6 +928,41 @@ EOF
...
@@ -928,6 +928,41 @@ EOF
abort_if_failed
"Could not execute manager command"
abort_if_failed
"Could not execute manager command"
}
}
start_ndbcluster
()
{
if
[
!
-z
"
$USE_NDBCLUSTER
"
]
then
if
[
-z
"
$USE_RUNNING_NDBCLUSTER
"
]
then
echo
"Starting ndbcluster"
if
[
"
$DO_BENCH
"
=
1
]
then
NDBCLUSTER_OPTS
=
""
else
NDBCLUSTER_OPTS
=
"--small"
fi
./ndb/ndbcluster
--port-base
=
$NDBCLUSTER_PORT
$NDBCLUSTER_OPTS
--diskless
--initial
--data-dir
=
$MYSQL_TEST_DIR
/var
||
exit
1
USE_NDBCLUSTER
=
"
$USE_NDBCLUSTER
--ndb-connectstring=
\"
host=localhost:
$NDBCLUSTER_PORT
\"
"
else
USE_NDBCLUSTER
=
"
$USE_NDBCLUSTER
--ndb-connectstring=
\"
$USE_RUNNING_NDBCLUSTER
\"
"
echo
"Using ndbcluster at
$USE_NDBCLUSTER
"
fi
fi
}
stop_ndbcluster
()
{
if
[
!
-z
"
$USE_NDBCLUSTER
"
]
then
if
[
-z
"
$USE_RUNNING_NDBCLUSTER
"
]
then
# Kill any running ndbcluster stuff
./ndb/ndbcluster
--data-dir
=
$MYSQL_TEST_DIR
/var
--port-base
=
$NDBCLUSTER_PORT
--stop
fi
fi
}
# The embedded server needs the cleanup so we do some of the start work
# The embedded server needs the cleanup so we do some of the start work
# but stop before actually running mysqld or anything.
# but stop before actually running mysqld or anything.
...
@@ -1179,6 +1214,7 @@ mysql_start ()
...
@@ -1179,6 +1214,7 @@ mysql_start ()
# start_master
# start_master
# start_slave
# start_slave
cd
$MYSQL_TEST_DIR
cd
$MYSQL_TEST_DIR
start_ndbcluster
return
1
return
1
}
}
...
@@ -1267,7 +1303,7 @@ mysql_stop ()
...
@@ -1267,7 +1303,7 @@ mysql_stop ()
stop_slave 1
stop_slave 1
stop_slave 2
stop_slave 2
$ECHO
"Slave shutdown finished"
$ECHO
"Slave shutdown finished"
stop_ndbcluster
return
1
return
1
}
}
...
@@ -1590,28 +1626,6 @@ then
...
@@ -1590,28 +1626,6 @@ then
$ECHO
"Installing Test Databases"
$ECHO
"Installing Test Databases"
mysql_install_db
mysql_install_db
if
[
!
-z
"
$USE_NDBCLUSTER
"
]
then
if
[
-z
"
$USE_RUNNING_NDBCLUSTER
"
]
then
echo
"Starting ndbcluster"
if
[
"
$DO_BENCH
"
=
1
-a
!
"
$DO_SMALL_BENCH
"
=
1
]
then
NDBCLUSTER_OPTS
=
""
else
NDBCLUSTER_OPTS
=
"--small"
fi
./ndb/ndbcluster
--port-base
=
$NDBCLUSTER_PORT
$NDBCLUSTER_OPTS
--diskless
--initial
--data-dir
=
$MYSQL_TEST_DIR
/var
||
exit
1
USE_NDBCLUSTER
=
"
$USE_NDBCLUSTER
--ndb-connectstring=
\"
host=localhost:
$NDBCLUSTER_PORT
\"
"
NDB_CONNECTSTRING
=
"localhost:
$NDBCLUSTER_PORT
"
else
USE_NDBCLUSTER
=
"
$USE_NDBCLUSTER
--ndb-connectstring=
\"
$USE_RUNNING_NDBCLUSTER
\"
"
NDB_CONNECTSTRING
=
"
$USE_RUNNING_NDBCLUSTER
"
echo
"Using ndbcluster at
$USE_NDBCLUSTER
"
fi
export
NDB_CONNECTSTRING
fi
start_manager
start_manager
# Do not automagically start daemons if we are in gdb or running only one test
# Do not automagically start daemons if we are in gdb or running only one test
...
@@ -1707,16 +1721,6 @@ if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]
...
@@ -1707,16 +1721,6 @@ if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]
then
then
mysql_stop
mysql_stop
fi
fi
if
[
!
-z
"
$USE_NDBCLUSTER
"
]
then
if
[
-z
"
$USE_RUNNING_NDBCLUSTER
"
]
then
# Kill any running ndbcluster stuff
./ndb/ndbcluster
--data-dir
=
$MYSQL_TEST_DIR
/var
--port-base
=
$NDBCLUSTER_PORT
--stop
fi
fi
stop_manager
stop_manager
report_stats
report_stats
$ECHO
$ECHO
...
...
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