diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-24 12:00:11 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-24 12:00:11 +0200 |
| commit | 48757ce3c2a1f7ce99d7094fb8ed2803c84b4ae5 (patch) | |
| tree | 2a929214269b95702c39d42532bd5e106621e3a3 /mysql-test/include/have_ndb.inc | |
| parent | 8df792b709f7bbb55a57b090ef76aa276f65c76d (diff) | |
| download | mariadb-git-48757ce3c2a1f7ce99d7094fb8ed2803c84b4ae5.tar.gz | |
Make have_ndb.in portable
mysql-test/include/have_ndb.inc:
Remove the "exec test" and instead use the portable way to
check an environment variable using "eval select". The value of
$NDB_STATUS_OK will this be replace by mysqltest and the query
"select "YES" and ndb_status_ok" will be sent to the server and back.
mysql-test/mysql-test-run.pl:
Move initializetion of NDB_STATUS_OK and only do it once in init part of scripot. This will make it possible to set
it to NO if we detect that cluster can't be started.
Diffstat (limited to 'mysql-test/include/have_ndb.inc')
| -rw-r--r-- | mysql-test/include/have_ndb.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc index 28fcf18cb16..721d79392b7 100644 --- a/mysql-test/include/have_ndb.inc +++ b/mysql-test/include/have_ndb.inc @@ -1,6 +1,13 @@ ---exec test x$NDB_STATUS_OK = x1 +# Check that server is compiled and started with support for NDB -- require r/have_ndb.require disable_query_log; show variables like "have_ndbcluster"; enable_query_log; +# Check that NDB is installed and known to be working +-- require r/have_ndb_status_ok.require +disable_query_log; +eval select "$NDB_STATUS_OK" as ndb_status_ok; +enable_query_log; + + |