Commit c85c6c07 authored by unknown's avatar unknown
Browse files

Bug #20077 Cluster to only support partition by key, needs to error on others

parent 053cd2f0

mysql-test/t/ndb_blob_partition.test

+4 −0
Original line number Diff line number Diff line 
--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

mysql-test/t/ndb_partition_error.test

+3 −0
Original line number Diff line number Diff line
@@ -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

#

mysql-test/t/ndb_partition_list.test

+4 −0
Original line number Diff line number Diff line
@@ -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

mysql-test/t/ndb_partition_range.test

+4 −0
Original line number Diff line number Diff line
@@ -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

sql/ha_ndbcluster.cc

+0 −2
Original line number Diff line number Diff line
@@ -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