diff options
author | unknown <mskold@mysql.com> | 2005-04-19 17:23:49 +0200 |
---|---|---|
committer | unknown <mskold@mysql.com> | 2005-04-19 17:23:49 +0200 |
commit | 6a15a7334e9ea008b8fa694dc678e8141dcb6f08 (patch) | |
tree | 6a142dc19d6e3856ea97f29067563a457d1156ea | |
parent | 432bc644c4af6c67f356354ad390fc1250541797 (diff) | |
download | mariadb-git-6a15a7334e9ea008b8fa694dc678e8141dcb6f08.tar.gz |
Disabled ndb tests for embedded
-rw-r--r-- | mysql-test/t/ndb_alter_table.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_autodiscover.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_autodiscover2.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_basic.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_blob.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_cache.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_charset.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_index.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_index_ordered.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_index_unique.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_insert.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_limit.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_lock.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_minmax.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_multi.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_replace.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_restore.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_subquery.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_transaction.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_truncate.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_types.test | 1 | ||||
-rw-r--r-- | mysql-test/t/ndb_update.test | 1 |
22 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/t/ndb_alter_table.test b/mysql-test/t/ndb_alter_table.test index 3ff2e735cb5..9cc1426554f 100644 --- a/mysql-test/t/ndb_alter_table.test +++ b/mysql-test/t/ndb_alter_table.test @@ -1,5 +1,6 @@ -- source include/have_ndb.inc -- source include/have_multi_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test index 037115f5e82..bd73a36fcab 100644 --- a/mysql-test/t/ndb_autodiscover.test +++ b/mysql-test/t/ndb_autodiscover.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; diff --git a/mysql-test/t/ndb_autodiscover2.test b/mysql-test/t/ndb_autodiscover2.test index 11e1cc204f7..76baa31a2a9 100644 --- a/mysql-test/t/ndb_autodiscover2.test +++ b/mysql-test/t/ndb_autodiscover2.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc # # Simple test to show use of discover when the server has been restarted diff --git a/mysql-test/t/ndb_basic.test b/mysql-test/t/ndb_basic.test index 66300f61fc3..24baf8d9fb4 100644 --- a/mysql-test/t/ndb_basic.test +++ b/mysql-test/t/ndb_basic.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7; diff --git a/mysql-test/t/ndb_blob.test b/mysql-test/t/ndb_blob.test index 96e38bfb58e..b265809b75f 100644 --- a/mysql-test/t/ndb_blob.test +++ b/mysql-test/t/ndb_blob.test @@ -1,4 +1,5 @@ --source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/ndb_cache.test b/mysql-test/t/ndb_cache.test index abd09424f64..5ba42f9b23c 100644 --- a/mysql-test/t/ndb_cache.test +++ b/mysql-test/t/ndb_cache.test @@ -1,5 +1,6 @@ -- source include/have_query_cache.inc -- source include/have_ndb.inc +-- source include/not_embedded.inc set GLOBAL query_cache_size=1355776; reset query cache; diff --git a/mysql-test/t/ndb_charset.test b/mysql-test/t/ndb_charset.test index 1b9e7e8bfcc..242f9192948 100644 --- a/mysql-test/t/ndb_charset.test +++ b/mysql-test/t/ndb_charset.test @@ -1,4 +1,5 @@ --source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/ndb_index.test b/mysql-test/t/ndb_index.test index e65b24a9b20..93085dea587 100644 --- a/mysql-test/t/ndb_index.test +++ b/mysql-test/t/ndb_index.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test index 010060a694d..4bc2021d45e 100644 --- a/mysql-test/t/ndb_index_ordered.test +++ b/mysql-test/t/ndb_index_ordered.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1, test1, test2; diff --git a/mysql-test/t/ndb_index_unique.test b/mysql-test/t/ndb_index_unique.test index 9bbea75028b..67cf6cb4537 100644 --- a/mysql-test/t/ndb_index_unique.test +++ b/mysql-test/t/ndb_index_unique.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1, t2, t3, t4, t5, t6, t7; diff --git a/mysql-test/t/ndb_insert.test b/mysql-test/t/ndb_insert.test index 611df3d84e9..f88d33f22f4 100644 --- a/mysql-test/t/ndb_insert.test +++ b/mysql-test/t/ndb_insert.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/t/ndb_limit.test b/mysql-test/t/ndb_limit.test index c2d7a0ecfec..0df3b2f7566 100644 --- a/mysql-test/t/ndb_limit.test +++ b/mysql-test/t/ndb_limit.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t2; diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test index 39a8655b972..b93abbd564b 100644 --- a/mysql-test/t/ndb_lock.test +++ b/mysql-test/t/ndb_lock.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc connect (con1,localhost,root,,); connect (con2,localhost,root,,); diff --git a/mysql-test/t/ndb_minmax.test b/mysql-test/t/ndb_minmax.test index 3be193ce602..97ea84f98ef 100644 --- a/mysql-test/t/ndb_minmax.test +++ b/mysql-test/t/ndb_minmax.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1, t2; diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test index 27ddd6508e9..24651913a79 100644 --- a/mysql-test/t/ndb_multi.test +++ b/mysql-test/t/ndb_multi.test @@ -1,5 +1,6 @@ -- source include/have_ndb.inc -- source include/have_multi_ndb.inc +-- source include/not_embedded.inc --disable_warnings diff --git a/mysql-test/t/ndb_replace.test b/mysql-test/t/ndb_replace.test index 59454b5a9fa..1c06a9a6633 100644 --- a/mysql-test/t/ndb_replace.test +++ b/mysql-test/t/ndb_replace.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc # # Test of REPLACE with NDB diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test index d413453fb0e..ee47f7da6bc 100644 --- a/mysql-test/t/ndb_restore.test +++ b/mysql-test/t/ndb_restore.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings use test; diff --git a/mysql-test/t/ndb_subquery.test b/mysql-test/t/ndb_subquery.test index cebc1920eaa..9d3a256a263 100644 --- a/mysql-test/t/ndb_subquery.test +++ b/mysql-test/t/ndb_subquery.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings drop table if exists t1; diff --git a/mysql-test/t/ndb_transaction.test b/mysql-test/t/ndb_transaction.test index f8ed22207ea..ae02059786d 100644 --- a/mysql-test/t/ndb_transaction.test +++ b/mysql-test/t/ndb_transaction.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7; diff --git a/mysql-test/t/ndb_truncate.test b/mysql-test/t/ndb_truncate.test index 63bb8cbefb6..7c0f79bcc59 100644 --- a/mysql-test/t/ndb_truncate.test +++ b/mysql-test/t/ndb_truncate.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t2; diff --git a/mysql-test/t/ndb_types.test b/mysql-test/t/ndb_types.test index d66718ca4e4..4276fa147eb 100644 --- a/mysql-test/t/ndb_types.test +++ b/mysql-test/t/ndb_types.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; diff --git a/mysql-test/t/ndb_update.test b/mysql-test/t/ndb_update.test index fc489ec4697..5453e41f937 100644 --- a/mysql-test/t/ndb_update.test +++ b/mysql-test/t/ndb_update.test @@ -1,4 +1,5 @@ -- source include/have_ndb.inc +-- source include/not_embedded.inc --disable_warnings DROP TABLE IF EXISTS t1; |