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
3249388a
Commit
3249388a
authored
Feb 07, 2005
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
have test suite continue even if ndbcluster fails to start if --force flag is set
parent
3a0d0e99
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
mysql-test/include/have_ndb.inc
mysql-test/include/have_ndb.inc
+1
-0
mysql-test/mysql-test-run.sh
mysql-test/mysql-test-run.sh
+11
-1
No files found.
mysql-test/include/have_ndb.inc
View file @
3249388a
--
exec
test
x
$NDB_STATUS_OK
=
x1
--
require
r
/
have_ndb
.
require
--
require
r
/
have_ndb
.
require
disable_query_log
;
disable_query_log
;
show
variables
like
"have_ndbcluster"
;
show
variables
like
"have_ndbcluster"
;
...
...
mysql-test/mysql-test-run.sh
View file @
3249388a
...
@@ -693,6 +693,8 @@ export NDB_MGM
...
@@ -693,6 +693,8 @@ export NDB_MGM
export
NDB_BACKUP_DIR
export
NDB_BACKUP_DIR
export
NDB_TOOLS_OUTPUT
export
NDB_TOOLS_OUTPUT
export
PURIFYOPTIONS
export
PURIFYOPTIONS
NDB_STATUS_OK
=
1
export
NDB_STATUS_OK
MYSQL_TEST_ARGS
=
"--no-defaults --socket=
$MASTER_MYSOCK
--database=
$DB
\
MYSQL_TEST_ARGS
=
"--no-defaults --socket=
$MASTER_MYSOCK
--database=
$DB
\
--user=
$DBUSER
--password=
$DBPASSWD
--silent -v --skip-safemalloc
\
--user=
$DBUSER
--password=
$DBPASSWD
--silent -v --skip-safemalloc
\
...
@@ -1055,7 +1057,15 @@ start_ndbcluster()
...
@@ -1055,7 +1057,15 @@ start_ndbcluster()
else
else
NDBCLUSTER_EXTRA_OPTS
=
"--small"
NDBCLUSTER_EXTRA_OPTS
=
"--small"
fi
fi
./ndb/ndbcluster
$NDBCLUSTER_OPTS
$NDBCLUSTER_EXTRA_OPTS
--initial
||
exit
1
./ndb/ndbcluster
$NDBCLUSTER_OPTS
$NDBCLUSTER_EXTRA_OPTS
--initial
||
NDB_STATUS_OK
=
0
if
[
x
$NDB_STATUS_OK
!=
x1
]
;
then
if
[
x
$FORCE
!=
x1
]
;
then
exit
1
fi
USE_NDBCLUSTER
=
return
fi
NDB_CONNECTSTRING
=
"host=localhost:
$NDBCLUSTER_PORT
"
NDB_CONNECTSTRING
=
"host=localhost:
$NDBCLUSTER_PORT
"
else
else
NDB_CONNECTSTRING
=
"
$USE_RUNNING_NDBCLUSTER
"
NDB_CONNECTSTRING
=
"
$USE_RUNNING_NDBCLUSTER
"
...
...
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