Commit 0036ab8c authored by unknown's avatar unknown
Browse files

BUG#20340: NODEGROUP in information_schema.partitions integer => 

error in error log when "default is put into it
NODEGROUP string to cater for "default" in it


mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/t/ndb_partition_key.test:
  New test case
sql/sql_show.cc:
  NODEGROUP string to cater for "default" in it
parent 98a63cde

mysql-test/r/ndb_partition_key.result

+7 −1
Original line number Diff line number Diff line
@@ -194,6 +194,12 @@ c2 TEXT NOT NULL, 
c3 INT NOT NULL,

PRIMARY KEY(c1,c3))

ENGINE=NDB

PARTITION BY KEY(c3);

PARTITION BY KEY(c3)

(PARTITION p0 NODEGROUP 0, PARTITION p1 NODEGROUP 0);

ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;

SELECT NODEGROUP,PARTITION_NAME FROM information_schema.partitions WHERE

table_name = "t1";

NODEGROUP	PARTITION_NAME

0	p0

0	p1

DROP TABLE t1;

mysql-test/t/ndb_partition_key.test

+4 −1
Original line number Diff line number Diff line
@@ -192,7 +192,10 @@ CREATE TABLE t1 ( 
  c3 INT NOT NULL,

  PRIMARY KEY(c1,c3))

  ENGINE=NDB

  PARTITION BY KEY(c3);

  PARTITION BY KEY(c3)

  (PARTITION p0 NODEGROUP 0, PARTITION p1 NODEGROUP 0);



ALTER TABLE t1 ADD COLUMN c4 INT AFTER c1;

SELECT NODEGROUP,PARTITION_NAME FROM information_schema.partitions WHERE

table_name = "t1";

DROP TABLE t1;

sql/sql_show.cc

+1 −1
Original line number Diff line number Diff line
@@ -5482,7 +5482,7 @@ ST_FIELD_INFO partitions_fields_info[]= 
  {"CHECK_TIME", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0},

  {"CHECKSUM", 21 , MYSQL_TYPE_LONG, 0, 1, 0},

  {"PARTITION_COMMENT", 80, MYSQL_TYPE_STRING, 0, 0, 0},

  {"NODEGROUP", 21 , MYSQL_TYPE_LONG, 0, 0, 0},

  {"NODEGROUP", 12 , MYSQL_TYPE_STRING, 0, 0, 0},

  {"TABLESPACE_NAME", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0},

  {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}

};