Commit d3a26825 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/27359/my51-27359 

into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg


sql/partition_info.cc:
  Auto merged
parents 0a9e85e0 a16d1fd4

mysql-test/r/ndb_partition_error2.result

0 → 100644
+3 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1 (s1 int) engine=ndbcluster;

ERROR HY000: For the partitioned engine it is necessary to define all partitions

mysql-test/t/ndb_partition_error2-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--ndbcluster

mysql-test/t/ndb_partition_error2.test

0 → 100644
+14 −0
Original line number Diff line number Diff line 
disable_query_log;

--require r/true.require

select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';

enable_query_log;



--disable_warnings

drop table if exists t1;

--enable_warnings

#

# Bug #27359 Partitions: memory allocation error message 

#

--error ER_PARTITION_NOT_DEFINED_ERROR

create table t1 (s1 int) engine=ndbcluster;

sql/partition_info.cc

+5 −1
Original line number Diff line number Diff line
@@ -753,7 +753,11 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type, 
  }

  if (unlikely(set_up_defaults_for_partitioning(file, info, (uint)0)))

    goto end;

  tot_partitions= get_tot_partitions();

  if (!(tot_partitions= get_tot_partitions()))

  {

    my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions");

    goto end;

  }

  if (unlikely(tot_partitions > MAX_PARTITIONS))

  {

    my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));