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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d374ed9c
Commit
d374ed9c
authored
Jan 19, 2005
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run
parent
d2778647
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
3 deletions
+19
-3
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+8
-1
mysql-test/ndb/ndbcluster.sh
mysql-test/ndb/ndbcluster.sh
+11
-2
No files found.
mysql-test/mysql-test-run.sh
View file @
d374ed9c
...
...
@@ -241,6 +241,9 @@ USE_EMBEDDED_SERVER=""
RESULT_EXT
=
""
TEST_MODE
=
"default"
NDB_MGMD_EXTRA_OPTS
=
NDBD_EXTRA_OPTS
=
while
test
$#
-gt
0
;
do
case
"
$1
"
in
--embedded-server
)
USE_EMBEDDED_SERVER
=
1
USE_MANAGER
=
0
NO_SLAVE
=
1
;
\
...
...
@@ -261,6 +264,10 @@ while test $# -gt 0; do
--ndb-connectstring
=
*
)
USE_NDBCLUSTER
=
"--ndbcluster"
;
USE_RUNNING_NDBCLUSTER
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndb-connectstring=;;"
`
;;
--ndb_mgmd-extra-opts
=
*
)
NDB_MGMD_EXTRA_OPTS
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndb_mgmd-extra-opts=;;"
`
;;
--ndbd-extra-opts
=
*
)
NDBD_EXTRA_OPTS
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--ndbd-extra-opts=;;"
`
;;
--tmpdir
=
*
)
MYSQL_TMP_DIR
=
`
$ECHO
"
$1
"
|
$SED
-e
"s;--tmpdir=;;"
`
;;
--local-master
)
MASTER_MYPORT
=
3306
;
...
...
@@ -460,7 +467,7 @@ SMALL_SERVER="--key_buffer_size=1M --sort_buffer=256K --max_heap_table_size=1M"
export
MASTER_MYPORT MASTER_MYPORT1 SLAVE_MYPORT MYSQL_TCP_PORT MASTER_MYSOCK MASTER_MYSOCK1
NDBCLUSTER_BASE_PORT
=
`
expr
$NDBCLUSTER_PORT
+ 2
`
NDBCLUSTER_OPTS
=
"--port=
$NDBCLUSTER_PORT
--port-base=
$NDBCLUSTER_BASE_PORT
--data-dir=
$MYSQL_TEST_DIR
/var"
NDBCLUSTER_OPTS
=
"--port=
$NDBCLUSTER_PORT
--port-base=
$NDBCLUSTER_BASE_PORT
--data-dir=
$MYSQL_TEST_DIR
/var
--ndb_mgmd-extra-opts=
\"
$NDB_MGMD_EXTRA_OPTS
\"
--ndbd-extra-opts=
\"
$NDBD_EXTRA_OPTS
\"
"
if
[
x
$SOURCE_DIST
=
x1
]
;
then
MY_BASEDIR
=
$MYSQL_TEST_DIR
...
...
mysql-test/ndb/ndbcluster.sh
View file @
d374ed9c
...
...
@@ -58,6 +58,9 @@ ndb_con_op=105000
ndb_dmem
=
80M
ndb_imem
=
24M
NDB_MGMD_EXTRA_OPTS
=
NDBD_EXTRA_OPTS
=
while
test
$#
-gt
0
;
do
case
"
$1
"
in
--test
)
...
...
@@ -94,6 +97,12 @@ while test $# -gt 0; do
--port-base
=
*
)
port_base
=
`
echo
"
$1
"
|
sed
-e
"s;--port-base=;;"
`
;;
--ndb_mgmd-extra-opts
=
*
)
NDB_MGMD_EXTRA_OPTS
=
`
echo
"
$1
"
|
sed
-e
"s;--ndb_mgmd-extra-opts=;;"
`
;;
--ndbd-extra-opts
=
*
)
NDBD_EXTRA_OPTS
=
`
echo
"
$1
"
|
sed
-e
"s;--ndbd-extra-opts=;;"
`
;;
--
)
shift
;
break
;;
--
*
)
$ECHO
"Unrecognized option:
$1
"
;
exit
1
;;
*
)
break
;;
...
...
@@ -122,8 +131,8 @@ if [ ! -x "$exec_waiter" ]; then
fi
exec_mgmtclient
=
"
$exec_mgmtclient
--no-defaults"
exec_mgmtsrvr
=
"
$exec_mgmtsrvr
--no-defaults"
exec_ndb
=
"
$exec_ndb
--no-defaults"
exec_mgmtsrvr
=
"
$exec_mgmtsrvr
--no-defaults
$NDB_MGMD_EXTRA_OPTS
"
exec_ndb
=
"
$exec_ndb
--no-defaults
$NDBD_EXTRA_OPTS
"
exec_waiter
=
"
$exec_waiter
--no-defaults"
ndb_host
=
"localhost"
...
...
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