Commit b2cf86f1 authored by unknown's avatar unknown
Browse files

BUG #15408 - Partitions: subpartition names are not unique 


libmysqld/Makefile.am:
  changed name to partition_info.cc
mysql-test/r/partition_mgm_err.result:
  added drop table for previous test
mysql-test/t/partition_mgm_err.test:
  added drop table for previous test
sql/Makefile.am:
  reformatted a bit
  changed name of partition_info.cpp to partition_info.cc
sql/partition_element.h:
  updated copyright date
sql/partition_info.cc:
  minor corrections as a result of review
sql/partition_info.h:
  updated copyright date
sql/sql_partition.cc:
  updated file comment and fixed some spacing
sql/sql_partition.h:
  updated copyright date
win/cmakefiles/sql:
  changed name to partition_info.cc
parent cf5cb1e9

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
        event_executor.cc event.cc event_timed.cc \

        rpl_filter.cc sql_partition.cc handlerton.cc sql_plugin.cc \

        sql_tablespace.cc \

        rpl_injector.cc my_user.c partition_info.cpp

        rpl_injector.cc my_user.c partition_info.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

mysql-test/r/partition_mgm_err.result

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ t1 CREATE TABLE `t1` ( 
DROP TABLE t1;

CREATE TABLE t1 (a INT) PARTITION BY HASH(a);

ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

DROP TABLE t1;

CREATE TABLE t1 (s1 int, s2 int) PARTITION BY LIST (s1)  (

PARTITION p1 VALUES IN (0) (SUBPARTITION p1b), 

PARTITION p2 VALUES IN (2) (SUBPARTITION p1b)

mysql-test/t/partition_mgm_err.test

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ DROP TABLE t1; 
#

CREATE TABLE t1 (a INT) PARTITION BY HASH(a);

ALTER TABLE t1 ADD PARTITION PARTITIONS 4;

DROP TABLE t1;



#

#BUG 15408: Partitions: subpartition names are not unique

sql/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \

			parse_file.h sql_view.h	sql_trigger.h \

			sql_array.h sql_cursor.h event.h event_priv.h \

			sql_plugin.h authors.h sql_partition.h partition_info.h \

			partition_element.h

			sql_plugin.h authors.h sql_partition.h \

                        partition_info.h partition_element.h

mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \

			item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \
@@ -102,7 +102,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			sp_cache.cc parse_file.cc sql_trigger.cc \

                        event_executor.cc event.cc event_timed.cc \

			sql_plugin.cc sql_binlog.cc \

			handlerton.cc sql_tablespace.cc partition_info.cpp

			handlerton.cc sql_tablespace.cc partition_info.cc

EXTRA_mysqld_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

			ha_innodb.h  ha_berkeley.h  ha_archive.h \

			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \

sql/partition_element.h

+1 −1
Original line number Diff line number Diff line 
/* Copyright (C) 2000,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

/* Copyright (C) 2000,200666666 MySQL AB & MySQL Finland AB & TCX DataKonsult AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by