mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Removed ifdef need.
Cleaned up test to no longer need have_ BitKeeper/deleted/.del-have_archive.require: Delete: mysql-test/r/have_archive.require BitKeeper/deleted/.del-have_blackhole.require: Delete: mysql-test/r/have_blackhole.require BitKeeper/deleted/.del-have_csv.require: Delete: mysql-test/r/have_csv.require BitKeeper/deleted/.del-have_exampledb.require: Delete: mysql-test/r/have_exampledb.require BitKeeper/deleted/.del-have_federated_db.require: Delete: mysql-test/r/have_federated_db.require BitKeeper/deleted/.del-have_innodb.require: Delete: mysql-test/r/have_innodb.require BitKeeper/deleted/.del-have_ndb.require: Delete: mysql-test/r/have_ndb.require BitKeeper/deleted/.del-have_raid.require: Delete: mysql-test/r/have_raid.require mysql-test/include/have_archive.inc: Rewrite of test to use new syntax mysql-test/include/have_blackhole.inc: Test rewritten to use new syntax mysql-test/include/have_csv.inc: Test rewrite mysql-test/include/have_exampledb.inc: Test rewrite mysql-test/include/have_federated_db.inc: Test rewrite mysql-test/include/have_innodb.inc: Test rewrite mysql-test/include/have_multi_ndb.inc: Test rewrite mysql-test/include/have_ndb.inc: Test rewrite sql/mysql_priv.h: Removed unneeded ifdef
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
--require r/have_archive.require
|
||||
--disable_query_log
|
||||
show variables like "have_archive";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'archive';
|
||||
--enable_query_log
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_blackhole.require
|
||||
disable_query_log;
|
||||
show variables like "have_blackhole_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'blackhole';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_csv.require
|
||||
disable_query_log;
|
||||
show variables like "have_csv";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'csv';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_exampledb.require
|
||||
disable_query_log;
|
||||
show variables like "have_example_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'example';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_federated_db.require
|
||||
disable_query_log;
|
||||
show variables like "have_federated_engine";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'federated';
|
||||
enable_query_log;
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- require r/have_innodb.require
|
||||
disable_query_log;
|
||||
show variables like "have_innodb";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'innodb';
|
||||
enable_query_log;
|
||||
|
@ -9,8 +9,8 @@ disable_query_log;
|
||||
drop table if exists t1, t2;
|
||||
--enable_warnings
|
||||
flush tables;
|
||||
--require r/have_ndb.require
|
||||
show variables like "have_ndbcluster";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
|
||||
enable_query_log;
|
||||
|
||||
# Check that server2 has NDB support
|
||||
@ -20,8 +20,8 @@ disable_query_log;
|
||||
drop table if exists t1, t2;
|
||||
--enable_warnings
|
||||
flush tables;
|
||||
--require r/have_ndb.require
|
||||
show variables like "have_ndbcluster";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
|
||||
enable_query_log;
|
||||
|
||||
# Set the default connection to 'server1'
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Check that server is compiled and started with support for NDB
|
||||
-- require r/have_ndb.require
|
||||
disable_query_log;
|
||||
show variables like "have_ndbcluster";
|
||||
--require r/true.require
|
||||
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
|
||||
enable_query_log;
|
||||
|
||||
# Check that NDB is installed and known to be working
|
||||
|
Reference in New Issue
Block a user