diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-07-04 18:29:21 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-07-04 18:29:21 +0200 |
| commit | c85c6c07f8257639edb3fe40d38c2f08bcd83ca1 (patch) | |
| tree | 5f1d39f27b7bf038869d9279e32fc18c2ced3738 | |
| parent | 053cd2f02908e4b2c1df19194b54a1bf1c4044ca (diff) | |
| download | mariadb-git-c85c6c07f8257639edb3fe40d38c2f08bcd83ca1.tar.gz | |
Bug #20077 Cluster to only support partition by key, needs to error on others
| -rw-r--r-- | mysql-test/t/ndb_blob_partition.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/ndb_partition_error.test | 3 | ||||
| -rw-r--r-- | mysql-test/t/ndb_partition_list.test | 4 | ||||
| -rw-r--r-- | mysql-test/t/ndb_partition_range.test | 4 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.cc | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/mysql-test/t/ndb_blob_partition.test b/mysql-test/t/ndb_blob_partition.test index a3948cc9491..6173c9d9851 100644 --- a/mysql-test/t/ndb_blob_partition.test +++ b/mysql-test/t/ndb_blob_partition.test @@ -1,6 +1,10 @@ --source include/have_ndb.inc -- source include/not_embedded.inc +--disable_query_log +set new=on; +--enable_query_log + --disable_warnings drop table if exists t1; --enable_warnings diff --git a/mysql-test/t/ndb_partition_error.test b/mysql-test/t/ndb_partition_error.test index 06581f1270f..9db2a6a6f6d 100644 --- a/mysql-test/t/ndb_partition_error.test +++ b/mysql-test/t/ndb_partition_error.test @@ -10,6 +10,9 @@ drop table if exists t1; --enable_warnings +--disable_query_log +set new=on; +--enable_query_log # # Partition by range, generate node group error # diff --git a/mysql-test/t/ndb_partition_list.test b/mysql-test/t/ndb_partition_list.test index 2ad37b8768c..ccfcdbc84f4 100644 --- a/mysql-test/t/ndb_partition_list.test +++ b/mysql-test/t/ndb_partition_list.test @@ -5,6 +5,10 @@ # #-- source include/have_partition.inc +--disable_query_log +set new=on; +--enable_query_log + --disable_warnings drop table if exists t1; --enable_warnings diff --git a/mysql-test/t/ndb_partition_range.test b/mysql-test/t/ndb_partition_range.test index 981467d4055..7952ba502d2 100644 --- a/mysql-test/t/ndb_partition_range.test +++ b/mysql-test/t/ndb_partition_range.test @@ -6,6 +6,10 @@ # #-- source include/have_partition.inc +--disable_query_log +set new=on; +--enable_query_log + --disable_warnings drop table if exists t1; --enable_warnings diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index bbeea2ca1ba..a3ea70aafd9 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -9866,7 +9866,6 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info, } else { -#ifdef NOT_YET if (!current_thd->variables.new_mode) { push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, @@ -9877,7 +9876,6 @@ uint ha_ndbcluster::set_up_partition_info(partition_info *part_info, " use --new option to enable"); return HA_ERR_UNSUPPORTED; } -#endif /* Create a shadow field for those tables that have user defined partitioning. This field stores the value of the partition |