Fixes for the bugs

       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

Author: mleich@five.local.lan

mysql-test/include/partition_1.inc

@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_methods1.inc                                               #
+# inc/partition_methods1.inc                                               #
 #                                                                              #
 # Purpose:                                                                     #
 #   Create and check partitioned tables                                        #
@@ -11,7 +11,7 @@
 #   do                                                                         #
 #     1. Create the partitioned table                                          #
 #     2  Insert the content of the table t0_template into t1                   #
-#     3. Execute include/partition_check.inc                                   #
+#     3. Execute inc/partition_check.inc                                   #
 #     4. Drop the table t1                                                     #
 #   done                                                                       #
 #                                                                              #
@@ -21,14 +21,14 @@
 #   has to be set before sourcing this routine.                                #
 #   Example:                                                                   #
 #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
-#          include/partition_method1s.inc                                      #
+#          inc/partition_method1s.inc                                          #
 #                                                                              #
-# Attention: The routine include/partition_methods2.inc is very similar        #
+# Attention: The routine inc/partition_methods2.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: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -52,7 +52,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY KEY
@@ -67,7 +66,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY LIST
@@ -90,7 +88,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY RANGE
@@ -114,7 +111,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
@@ -137,7 +133,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
@@ -163,7 +158,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
@@ -186,7 +180,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
@@ -209,5 +202,4 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;

mysql-test/r/partition_02myisam.result

@@ -21,253 +21,207 @@ let $sqlfunc = ascii(col1);
 let $valsqlfunc = ascii('a');
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = ord(col1);
 let $valsqlfunc = ord('a');
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = greatest(col1,15);
 let $valsqlfunc = greatest(1,15);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = isnull(col1);
 let $valsqlfunc = isnull(15);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = least(col1,15);
 let $valsqlfunc = least(15,30);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = case when col1>15 then 20 else 10 end;
 let $valsqlfunc = case when 1>30 then 20 else 15 end;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = ifnull(col1,30);
 let $valsqlfunc = ifnull(1,30);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = nullif(col1,30);
 let $valsqlfunc = nullif(1,30);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = bit_length(col1);
 let $valsqlfunc = bit_length(255);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = char_length(col1);
 let $valsqlfunc = char_length('a');
 #let $coltype = int;
 #--source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = character_length(col1);
 let $valsqlfunc = character_length('a');
 let $coltype = char(30)
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = find_in_set(col1,'1,2,3,4,5,6,7,8,9');
 let $valsqlfunc = find_in_set('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = instr(col1,'acb');
 let $valsqlfunc = instr('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = length(col1);
 let $valsqlfunc = length('a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = locate('a',col1);
 let $valsqlfunc = locate('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = octet_length(col1);
 let $valsqlfunc = octet_length('a,b,c,d,e,f,g,h,i');
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = position('a' in col1);
 let $valsqlfunc = position('i' in 'a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = strcmp(col1,'acb');
 let $valsqlfunc = strcmp('i','a,b,c,d,e,f,g,h,i');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = crc32(col1);
 let $valsqlfunc = crc32('a,b,c,d,e,f,g,h,i');
 let $coltype = char(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = round(col1);
 let $valsqlfunc = round(15);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = sign(col1);
 let $valsqlfunc = sign(123);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = period_add(col1,5);
 let $valsqlfunc = period_add(9804,5);
 let $coltype = datetime;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = period_diff(col1,col2);
 let $valsqlfunc = period_diff(9809,199907);
 let $coltype = datetime,col2 datetime;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 let $coltype = int,col2 int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = timestampdiff(day,5,col1);
 let $valsqlfunc = timestampdiff(YEAR,'2002-05-01','2001-01-01');
 let $coltype = datetime;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = unix_timestamp(col1);
 let $valsqlfunc = unix_timestamp ('2002-05-01');
 let $coltype = date;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = week(col1);
 let $valsqlfunc = week('2002-05-01');
 let $coltype = datetime;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = weekofyear(col1);
 let $valsqlfunc = weekofyear('2002-05-01');
 let $coltype = datetime;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = cast(col1 as signed);
 let $valsqlfunc = cast(123 as signed);
 let $coltype = varchar(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = convert(col1,unsigned);
 let $valsqlfunc = convert(123,unsigned);
 let $coltype = varchar(30);
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 | 20;
 let $valsqlfunc = 10 | 20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 & 20;
 let $valsqlfunc = 10 & 20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 ^ 20;
 let $valsqlfunc = 10 ^ 20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 << 20;
 let $valsqlfunc = 10 << 20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = col1 >> 20;
 let $valsqlfunc = 10 >> 20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = ~col1;
 let $valsqlfunc = ~20;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = bit_count(col1);
 let $valsqlfunc = bit_count(20);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 let $sqlfunc = inet_aton(col1);
 let $valsqlfunc = inet_aton('192.168.1.1');
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 set @var =20;
 let $sqlfunc = bit_length(col1)+@var-@var;
 let $valsqlfunc = bit_length(20)+@var-@var;
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 
 
 delimiter //;
@@ -298,5 +252,4 @@ let $sqlfunc = getmaxsigned_t1(col1);
 let $valsqlfunc = getmaxsigned(10);
 let $coltype = int;
 --source suite/parts/inc/partition_blocked_sql_funcs.inc
-# --source include/partition_blocked_sql_funcs.inc
 drop function if exists getmaxsigned_t1;

mysql-test/suite/ndb/r/partition_03ndb.result

@@ -1,5 +1,6 @@
 ################################################################################
-# t/part_supported_sql_funcs_delete.inc                                   #           #                                                                              #
+# t/part_supported_sql_funcs_delete.inc                                        #
+#                                                                              #
 # Purpose:                                                                     #
 #  Delete access of the tests frame for allowed sql functions                  #
 #                                                                              #