mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 10:56:12 +01:00 
			
		
		
		
	 0a9e4c79d4
			
		
	
	
	0a9e4c79d4
	
	
	
		
			
			Bug#31610 Remove outdated and redundant tests:
                 partition_02myisam partition_03ndb
       Bug#32405 testsuite parts: partition_char_myisam wrong content
and cleanup of testsuite
   - remove/correct wrong comments
   - remove workarounds for fixed bugs
   - replace error numbers with error names
   - exclude subtests from execution which fail now because of
     new limitations for partitioning functions
   - remove code for the no more intended dual use
     fast test in regression tests/slow test in testsuite
   - analyze and fix problems with partition_char_innodb
   - fix problems caused by last change of error numbers
   - Introduce error name to error number mapping which makes
     maintenance after next error renumbering easier
BitKeeper/deleted/.del-partition_03ndb.result:
  Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result
BitKeeper/deleted/.del-partition_03ndb.test:
  Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test
BitKeeper/deleted/.del-partition_1.inc:
  Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc
BitKeeper/deleted/.del-partition_02myisam.result:
  Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result
BitKeeper/deleted/.del-partition_02myisam.test:
  Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test
BitKeeper/deleted/.del-partition_char_myisam.result:
  Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result
mysql-test/suite/parts/inc/methods1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition.pre:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_10.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_11.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_12.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_20.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter3.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter4.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_11.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_13.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_alter_41.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_basic.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_binary.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_bit.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_blob.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_char.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_drop.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_check_read2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_cleanup.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_directory.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_engine.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_enum.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_methods2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_set.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_syntax_2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_text.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg1.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg2.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_trigg3.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_value.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_varbinary.inc:
  Fixes + cleanup
mysql-test/suite/parts/inc/partition_varchar.inc:
  Fixes + cleanup
mysql-test/suite/parts/r/partition_alter1_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter1_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter2_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter2_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter3_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter3_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_alter4_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_alter4_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_bit_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_char_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_datetime_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_decimal_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_engine_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_engine_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_float_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_float_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_int_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_special_myisam.result:
  Updated result
mysql-test/suite/parts/r/partition_syntax_innodb.result:
  Updated result
mysql-test/suite/parts/r/partition_syntax_myisam.result:
  Updated result
mysql-test/suite/parts/t/disabled.def:
  Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/part_supported_sql_func_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter1_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter2_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter3_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_alter4_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_basic_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_bit_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_char_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_char_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_datetime_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_decimal_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_engine_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_float_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_float_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_int_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_special_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_special_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_syntax_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_innodb.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_myisam.test:
  Fixes + cleanup
mysql-test/suite/parts/t/partition_value_ndb.test:
  Fixes + cleanup
mysql-test/suite/parts/r/partition_char_myisam.result:
  Updated result
  bk rm + new file is caused by bk complaining about filetype
		
	
			
		
			
				
	
	
		
			194 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			194 lines
		
	
	
	
		
			7.2 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| ################################################################################
 | |
| # inc/partition_alter_11.inc                                                   #
 | |
| #                                                                              #
 | |
| # Purpose:                                                                     #
 | |
| #   Check ALTER partitioned table and the state of the table afterwards        #
 | |
| #   The partitioning function use the column f_int1                            #
 | |
| #                                                                              #
 | |
| #   For all partitioning methods                                               #
 | |
| #        PARTITION BY HASH/KEY/LIST/RANGE                                      #
 | |
| #        PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ...              #
 | |
| #   do                                                                         #
 | |
| #     1. Create the partitioned table                                          #
 | |
| #     2. Execute inc/partition_alter_1.inc, which will                     #
 | |
| #        - Insert the first half of the table t0_template into t1              #
 | |
| #        - Execute the ALTER TABLE statement                                   #
 | |
| #        - Insert the second half of the table t0_template into t1             #
 | |
| #        - Execute the usability test inc/partition_check.inc              #
 | |
| #        - Drop the table t1                                                   #
 | |
| #   done                                                                       #
 | |
| #                                                                              #
 | |
| #   The parameters                                                             #
 | |
| #        $unique -- PRIMARY KEY or UNIQUE INDEXes to be created within the     #
 | |
| #                   CREATE TABLE STATEMENT                                     #
 | |
| #        $alter  -- ALTER TABLE statement, which has to be executed            #
 | |
| #   have to be set before sourcing this routine.                               #
 | |
| #   Example:                                                                   #
 | |
| #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
 | |
| #          let $alter= ALTER TABLE t1 DROP UNIQUE INDEX uidx1;                 #
 | |
| #          inc/partition_alter1.inc                                        #
 | |
| #                                                                              #
 | |
| # Attention: The routine inc/partition_alter_13.inc is very similar        #
 | |
| #            to this one. So if something has to be changed here it            #
 | |
| #            might be necessary to do it also there                            #
 | |
| #                                                                              #
 | |
| #------------------------------------------------------------------------------#
 | |
| # Original Author: mleich                                                      #
 | |
| # Original Date: 2006-03-05                                                    #
 | |
| # Change Author:                                                               #
 | |
| # Change Date:                                                                 #
 | |
| # Change:                                                                      #
 | |
| ################################################################################
 | |
| 
 | |
| --disable_warnings
 | |
| DROP TABLE IF EXISTS t1;
 | |
| --enable_warnings
 | |
| 
 | |
| let $partitioning= ;
 | |
| #----------- PARTITION BY HASH
 | |
| if ($with_partitioning)
 | |
| {
 | |
| let $partitioning= PARTITION BY HASH(f_int1) PARTITIONS 2 (partition part_1, partition part_2);
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY KEY
 | |
| if ($with_partitioning)
 | |
| {
 | |
| let $partitioning= PARTITION BY KEY(f_int1) PARTITIONS 5 (partition part_1, partition part_2, partition part_3, partition part_4, partition part_5);
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY LIST
 | |
| if ($with_partitioning)
 | |
| {
 | |
| let $partitioning= PARTITION BY LIST(MOD(f_int1,4))
 | |
| (PARTITION part_3 VALUES IN (-3),
 | |
|  PARTITION part_2 VALUES IN (-2),
 | |
|  PARTITION part_1 VALUES IN (-1),
 | |
|  PARTITION part_N VALUES IN (NULL),
 | |
|  PARTITION part0 VALUES IN (0),
 | |
|  PARTITION part1 VALUES IN (1),
 | |
|  PARTITION part2 VALUES IN (2),
 | |
|  PARTITION part3 VALUES IN (3));
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY RANGE
 | |
| if ($with_partitioning)
 | |
| {
 | |
| --disable_query_log
 | |
| eval SET @aux = 'PARTITION BY RANGE(f_int1)
 | |
| (PARTITION parta VALUES LESS THAN (0),
 | |
| PARTITION part_1 VALUES LESS THAN ($max_row_div4),
 | |
| PARTITION part_2 VALUES LESS THAN ($max_row_div2),
 | |
| PARTITION part_3 VALUES LESS THAN ($max_row_div2 + $max_row_div4),
 | |
| PARTITION part_4 VALUES LESS THAN ($max_row),
 | |
| PARTITION part_5 VALUES LESS THAN $MAX_VALUE)';
 | |
| let $partitioning= `SELECT @aux`;
 | |
| --enable_query_log
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 | |
| if ($with_partitioning)
 | |
| {
 | |
| --disable_query_log
 | |
| eval SET @aux =
 | |
| 'PARTITION BY RANGE(f_int1 DIV 2) SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2
 | |
| (PARTITION part_1 VALUES LESS THAN (0),
 | |
| PARTITION part_2 VALUES LESS THAN ($max_row_div4),
 | |
| PARTITION part_3 VALUES LESS THAN ($max_row_div2),
 | |
| PARTITION part_4 VALUES LESS THAN $MAX_VALUE)';
 | |
| let $partitioning= `SELECT @aux`;
 | |
| --enable_query_log
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 | |
| if ($with_partitioning)
 | |
| {
 | |
| --disable_query_log
 | |
| eval SET @aux = 'PARTITION BY RANGE(f_int1) SUBPARTITION BY KEY(f_int1)
 | |
| (PARTITION part_1 VALUES LESS THAN (0)
 | |
| (SUBPARTITION subpart11, SUBPARTITION subpart12),
 | |
| PARTITION part_2 VALUES LESS THAN ($max_row_div4)
 | |
| (SUBPARTITION subpart21, SUBPARTITION subpart22),
 | |
| PARTITION part_3 VALUES LESS THAN ($max_row_div2)
 | |
| (SUBPARTITION subpart31, SUBPARTITION subpart32),
 | |
| PARTITION part_4 VALUES LESS THAN $MAX_VALUE
 | |
| (SUBPARTITION subpart41, SUBPARTITION subpart42))';
 | |
| let $partitioning= `SELECT @aux`;
 | |
| --enable_query_log
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 | |
| if ($with_partitioning)
 | |
| {
 | |
| let $partitioning= PARTITION BY LIST(ABS(MOD(f_int1,3))) SUBPARTITION BY HASH(f_int1 + 1)
 | |
| (PARTITION part_1 VALUES IN (0)
 | |
|   (SUBPARTITION sp11, SUBPARTITION sp12),
 | |
|  PARTITION part_2 VALUES IN (1)
 | |
|   (SUBPARTITION sp21, SUBPARTITION sp22),
 | |
|  PARTITION part_3 VALUES IN (2)
 | |
|   (SUBPARTITION sp31, SUBPARTITION sp32),
 | |
|  PARTITION part_4 VALUES IN (NULL)
 | |
|   (SUBPARTITION sp41, SUBPARTITION sp42));
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 | |
| 
 | |
| #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 | |
| if ($with_partitioning)
 | |
| {
 | |
| --disable_query_log
 | |
| eval SET @aux =
 | |
| 'PARTITION BY LIST(ABS(MOD(f_int1,2)))
 | |
| SUBPARTITION BY KEY(f_int1) SUBPARTITIONS $sub_part_no
 | |
| (PARTITION part_1 VALUES IN (0),
 | |
|  PARTITION part_2 VALUES IN (1),
 | |
|  PARTITION part_3 VALUES IN (NULL))';
 | |
| let $partitioning= `SELECT @aux`;
 | |
| --enable_query_log
 | |
| }
 | |
| eval CREATE TABLE t1 (
 | |
| $column_list
 | |
| $unique
 | |
| )
 | |
| $partitioning;
 | |
| --source suite/parts/inc/partition_alter_1.inc
 |