Merge 192.168.0.4:mysql/my51-m-bug18888 (d2709b7a) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/not_partition.require

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		Variable_name Value
		have_partitioning NO

mysql-test/r/not_partition.result

0 → 100644

+48 −0

Original line number	Diff line number	Diff line
		CREATE TABLE t1 (
		firstname VARCHAR(25) NOT NULL,
		lastname VARCHAR(25) NOT NULL,
		username VARCHAR(16) NOT NULL,
		email VARCHAR(35),
		joined DATE NOT NULL
		)
		PARTITION BY KEY(joined)
		PARTITIONS 6;
		ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
		ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;
		ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
		drop table t1;
		ERROR 42S02: Unknown table 't1'
		CREATE TABLE t1 (
		firstname VARCHAR(25) NOT NULL,
		lastname VARCHAR(25) NOT NULL,
		username VARCHAR(16) NOT NULL,
		email VARCHAR(35),
		joined DATE NOT NULL
		)
		PARTITION BY RANGE( YEAR(joined) ) (
		PARTITION p0 VALUES LESS THAN (1960),
		PARTITION p1 VALUES LESS THAN (1970),
		PARTITION p2 VALUES LESS THAN (1980),
		PARTITION p3 VALUES LESS THAN (1990),
		PARTITION p4 VALUES LESS THAN MAXVALUE
		);
		ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
		drop table t1;
		ERROR 42S02: Unknown table 't1'
		CREATE TABLE t1 (id INT, purchased DATE)
		PARTITION BY RANGE( YEAR(purchased) )
		SUBPARTITION BY HASH( TO_DAYS(purchased) )
		SUBPARTITIONS 2 (
		PARTITION p0 VALUES LESS THAN (1990),
		PARTITION p1 VALUES LESS THAN (2000),
		PARTITION p2 VALUES LESS THAN MAXVALUE
		);
		ERROR HY000: The 'partitioning' feature is disabled; you need MySQL built with '--with-partition' to have it working
		drop table t1;
		ERROR 42S02: Unknown table 't1'
		create table t1 (a varchar(10) charset latin1 collate latin1_bin);
		insert into t1 values (''),(' '),('a'),('a '),('a ');
		explain partitions select * from t1 where a='a ' OR a='a';
		id select_type table partitions type possible_keys key key_len ref rows Extra
		1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 5 Using where
		drop table t1;

mysql-test/t/not_partition.test

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		--disable_abort_on_error
		# Run this tets only when mysqld don't has partitioning
		# the statements are not expected to work, just check that we
		# can't crash the server
		-- require r/not_partition.require
		disable_query_log;
		show variables like "have_partitioning";
		enable_query_log;


		--error ER_FEATURE_DISABLED
		CREATE TABLE t1 (
		firstname VARCHAR(25) NOT NULL,
		lastname VARCHAR(25) NOT NULL,
		username VARCHAR(16) NOT NULL,
		email VARCHAR(35),
		joined DATE NOT NULL
		)
		PARTITION BY KEY(joined)
		PARTITIONS 6;

		--error ER_FEATURE_DISABLED
		ALTER TABLE t1 PARTITION BY KEY(joined) PARTITIONS 2;

		--error ER_BAD_TABLE_ERROR
		drop table t1;

		--error ER_FEATURE_DISABLED
		CREATE TABLE t1 (
		firstname VARCHAR(25) NOT NULL,
		lastname VARCHAR(25) NOT NULL,
		username VARCHAR(16) NOT NULL,
		email VARCHAR(35),
		joined DATE NOT NULL
		)
		PARTITION BY RANGE( YEAR(joined) ) (
		PARTITION p0 VALUES LESS THAN (1960),
		PARTITION p1 VALUES LESS THAN (1970),
		PARTITION p2 VALUES LESS THAN (1980),
		PARTITION p3 VALUES LESS THAN (1990),
		PARTITION p4 VALUES LESS THAN MAXVALUE
		);
		--error ER_BAD_TABLE_ERROR
		drop table t1;

		--error ER_FEATURE_DISABLED
		CREATE TABLE t1 (id INT, purchased DATE)
		PARTITION BY RANGE( YEAR(purchased) )
		SUBPARTITION BY HASH( TO_DAYS(purchased) )
		SUBPARTITIONS 2 (
		PARTITION p0 VALUES LESS THAN (1990),
		PARTITION p1 VALUES LESS THAN (2000),
		PARTITION p2 VALUES LESS THAN MAXVALUE
		);
		--error ER_BAD_TABLE_ERROR
		drop table t1;

		# Create a table without partitions to test "EXPLAIN PARTITIONS"
		create table t1 (a varchar(10) charset latin1 collate latin1_bin);
		insert into t1 values (''),(' '),('a'),('a '),('a ');
		explain partitions select * from t1 where a='a ' OR a='a';
		drop table t1;

sql/lex.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,10 @@ SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"};
		Symbols are broken into separated arrays to allow field names with
		same name as functions.
		These are kept sorted for human lookup (the symbols are hashed).

		NOTE! The symbol tables should be the same regardless of what features
		are compiled into the server. Don't add ifdef'ed symbols to the
		lists
		*/

		static SYMBOL symbols[] = {
		@@ -383,11 +387,9 @@ static SYMBOL symbols[] = {
		{ "PACK_KEYS", SYM(PACK_KEYS_SYM)},
		{ "PARSER", SYM(PARSER_SYM)},
		{ "PARTIAL", SYM(PARTIAL)},
		#ifdef WITH_PARTITION_STORAGE_ENGINE
		{ "PARTITION", SYM(PARTITION_SYM)},
		{ "PARTITIONING", SYM(PARTITIONING_SYM)},
		{ "PARTITIONS", SYM(PARTITIONS_SYM)},
		#endif
		{ "PASSWORD", SYM(PASSWORD)},
		{ "PHASE", SYM(PHASE_SYM)},
		{ "PLUGIN", SYM(PLUGIN_SYM)},

sql/sql_class.cc

+0 −2

Original line number	Diff line number	Diff line
		@@ -859,7 +859,6 @@ int THD::send_explain_fields(select_result *result)
		field_list.push_back(new Item_empty_string("select_type", 19, cs));
		field_list.push_back(item= new Item_empty_string("table", NAME_LEN, cs));
		item->maybe_null= 1;
		#ifdef WITH_PARTITION_STORAGE_ENGINE
		if (lex->describe & DESCRIBE_PARTITIONS)
		{
		/* Maximum length of string that make_used_partitions_str() can produce */
		@@ -868,7 +867,6 @@ int THD::send_explain_fields(select_result *result)
		field_list.push_back(item);
		item->maybe_null= 1;
		}
		#endif
		field_list.push_back(item= new Item_empty_string("type", 10, cs));
		item->maybe_null= 1;
		field_list.push_back(item=new Item_empty_string("possible_keys",