MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:mleich Date:November 16 2007 8:39pm
Subject:bk commit into 5.1 tree (mleich:1.2622) BUG#31610
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mleich. When mleich does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-16 21:39:01+01:00, mleich@stripped +121 -0
  Fix for bug
       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

  BitKeeper/deleted/.del-partition_02myisam.result@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/r/partition_02myisam.result -> BitKeeper/deleted/.del-partition_02myisam.result

  BitKeeper/deleted/.del-partition_02myisam.test@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/t/partition_02myisam.test -> BitKeeper/deleted/.del-partition_02myisam.test

  BitKeeper/deleted/.del-partition_03ndb.result@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/ndb/r/partition_03ndb.result -> BitKeeper/deleted/.del-partition_03ndb.result

  BitKeeper/deleted/.del-partition_03ndb.test@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/ndb/t/partition_03ndb.test -> BitKeeper/deleted/.del-partition_03ndb.test

  BitKeeper/deleted/.del-partition_1.inc@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/include/partition_1.inc -> BitKeeper/deleted/.del-partition_1.inc

  BitKeeper/deleted/.del-partition_char_myisam.result@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/suite/parts/r/partition_char_myisam.result -> BitKeeper/deleted/.del-partition_char_myisam.result

  mysql-test/suite/parts/inc/methods1.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +5 -13
    Fixes

  mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +0 -47
    Fixes

  mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +2 -1
    Fixes

  mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +0 -23
    Fixes

  mysql-test/suite/parts/inc/partition.pre@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +28 -34
    Fixes

  mysql-test/suite/parts/inc/partition_10.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +2 -8
    Fixes

  mysql-test/suite/parts/inc/partition_10.inc@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/include/partition_10.inc -> mysql-test/suite/parts/inc/partition_10.inc

  mysql-test/suite/parts/inc/partition_11.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +3 -3
    Fixes

  mysql-test/suite/parts/inc/partition_11.inc@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/include/partition_11.inc -> mysql-test/suite/parts/inc/partition_11.inc

  mysql-test/suite/parts/inc/partition_12.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +2 -8
    Fixes

  mysql-test/suite/parts/inc/partition_12.inc@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/include/partition_12.inc -> mysql-test/suite/parts/inc/partition_12.inc

  mysql-test/suite/parts/inc/partition_20.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +5 -10
    Fixes

  mysql-test/suite/parts/inc/partition_alter1.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +10 -41
    Fixes

  mysql-test/suite/parts/inc/partition_alter2.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +10 -72
    Fixes

  mysql-test/suite/parts/inc/partition_alter3.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +19 -21
    Fixes

  mysql-test/suite/parts/inc/partition_alter4.inc@stripped, 2007-11-16 21:38:55+01:00, mleich@stripped +1 -22
    Fixes

  mysql-test/suite/parts/inc/partition_alter_1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +5 -6
    Fixes

  mysql-test/suite/parts/inc/partition_alter_11.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -12
    Fixes

  mysql-test/suite/parts/inc/partition_alter_13.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -12
    Fixes

  mysql-test/suite/parts/inc/partition_alter_41.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +6 -14
    Fixes

  mysql-test/suite/parts/inc/partition_basic.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -23
    Fixes

  mysql-test/suite/parts/inc/partition_binary.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +9 -0
    Fixes

  mysql-test/suite/parts/inc/partition_bit.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +1 -1
    Fixes

  mysql-test/suite/parts/inc/partition_blob.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -0
    Fixes

  mysql-test/suite/parts/inc/partition_char.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -2
    Fixes

  mysql-test/suite/parts/inc/partition_check.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +24 -62
    Fixes

  mysql-test/suite/parts/inc/partition_check_drop.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +3 -3
    Fixes

  mysql-test/suite/parts/inc/partition_check_read.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +3 -3
    Fixes

  mysql-test/suite/parts/inc/partition_check_read1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -2
    Fixes

  mysql-test/suite/parts/inc/partition_check_read2.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -2
    Fixes

  mysql-test/suite/parts/inc/partition_cleanup.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -2
    Fixes

  mysql-test/suite/parts/inc/partition_directory.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -9
    Fixes

  mysql-test/suite/parts/inc/partition_engine.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -16
    Fixes

  mysql-test/suite/parts/inc/partition_enum.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +7 -1
    Fixes

  mysql-test/suite/parts/inc/partition_layout.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +1 -1
    Fixes

  mysql-test/suite/parts/inc/partition_layout.inc@stripped, 2007-11-16 21:32:39+01:00, mleich@stripped +0 -0
    Rename: mysql-test/include/partition_layout.inc -> mysql-test/suite/parts/inc/partition_layout.inc

  mysql-test/suite/parts/inc/partition_layout_check1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +3 -3
    Fixes

  mysql-test/suite/parts/inc/partition_layout_check2.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -4
    Fixes

  mysql-test/suite/parts/inc/partition_methods1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +5 -13
    Fixes

  mysql-test/suite/parts/inc/partition_methods2.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +5 -13
    Fixes

  mysql-test/suite/parts/inc/partition_set.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -0
    Fixes

  mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +0 -2
    Fixes

  mysql-test/suite/parts/inc/partition_syntax.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -67
    Fixes

  mysql-test/suite/parts/inc/partition_syntax_1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -4
    Fixes

  mysql-test/suite/parts/inc/partition_syntax_2.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +3 -11
    Fixes

  mysql-test/suite/parts/inc/partition_text.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -1
    Fixes

  mysql-test/suite/parts/inc/partition_trigg1.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +5 -5
    Fixes

  mysql-test/suite/parts/inc/partition_trigg2.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +4 -4
    Fixes

  mysql-test/suite/parts/inc/partition_trigg3.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +5 -23
    Fixes

  mysql-test/suite/parts/inc/partition_value.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -2
    Fixes

  mysql-test/suite/parts/inc/partition_varbinary.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -0
    Fixes

  mysql-test/suite/parts/inc/partition_varchar.inc@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +2 -0
    Fixes

  mysql-test/suite/parts/r/partition_alter1_innodb.result@stripped, 2007-11-16 21:38:56+01:00, mleich@stripped +336 -341
    Updated results

  mysql-test/suite/parts/r/partition_alter1_myisam.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +128 -133
    Updated results

  mysql-test/suite/parts/r/partition_alter2_innodb.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +480 -485
    Updated results

  mysql-test/suite/parts/r/partition_alter2_myisam.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +288 -293
    Updated results

  mysql-test/suite/parts/r/partition_alter3_innodb.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +2 -7
    Updated results

  mysql-test/suite/parts/r/partition_alter3_myisam.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +0 -5
    Updated results

  mysql-test/suite/parts/r/partition_alter4_innodb.result@stripped, 2007-11-16 21:38:57+01:00, mleich@stripped +144 -149
    Updated results

  mysql-test/suite/parts/r/partition_alter4_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +176 -181
    Updated results

  mysql-test/suite/parts/r/partition_basic_innodb.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +205 -210
    Updated results

  mysql-test/suite/parts/r/partition_basic_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +161 -166
    Updated results

  mysql-test/suite/parts/r/partition_bit_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +2 -2
    Updated results

  mysql-test/suite/parts/r/partition_char_innodb.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +674 -1543
    Updated results

  mysql-test/suite/parts/r/partition_char_myisam.result@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1340 -0
    Updated results

  mysql-test/suite/parts/r/partition_char_myisam.result@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +0 -0

  mysql-test/suite/parts/r/partition_datetime_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +5 -5
    Updated results

  mysql-test/suite/parts/r/partition_decimal_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +1 -1
    Updated results

  mysql-test/suite/parts/r/partition_engine_innodb.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +28 -33
    Updated results

  mysql-test/suite/parts/r/partition_engine_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +28 -33
    Updated results

  mysql-test/suite/parts/r/partition_float_innodb.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +0 -292
    Updated results

  mysql-test/suite/parts/r/partition_float_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +2 -2
    Updated results

  mysql-test/suite/parts/r/partition_int_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +5 -5
    Updated results

  mysql-test/suite/parts/r/partition_special_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +4 -4
    Updated results

  mysql-test/suite/parts/r/partition_syntax_innodb.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +115 -5
    Updated results

  mysql-test/suite/parts/r/partition_syntax_myisam.result@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +115 -5
    Updated results

  mysql-test/suite/parts/t/disabled.def@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +0 -2
    Fixes

  mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +2 -4
    Fixes

  mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/part_supported_sql_func_innodb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/part_supported_sql_func_myisam.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/part_supported_sql_func_ndb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/partition_alter1_innodb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_alter1_myisam.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_alter1_ndb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_alter2_innodb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_alter2_myisam.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_alter2_ndb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_alter3_innodb.test@stripped, 2007-11-16 21:38:58+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_alter3_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_alter4_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_alter4_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -4
    Fixes

  mysql-test/suite/parts/t/partition_basic_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_basic_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_basic_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +4 -7
    Fixes

  mysql-test/suite/parts/t/partition_bit_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/partition_bit_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -2
    Fixes

  mysql-test/suite/parts/t/partition_bit_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/partition_char_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -10
    Fixes

  mysql-test/suite/parts/t/partition_char_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +15 -6
    Fixes

  mysql-test/suite/parts/t/partition_datetime_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -7
    Fixes

  mysql-test/suite/parts/t/partition_datetime_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -6
    Fixes

  mysql-test/suite/parts/t/partition_decimal_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -3
    Fixes

  mysql-test/suite/parts/t/partition_decimal_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -2
    Fixes

  mysql-test/suite/parts/t/partition_engine_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_engine_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_engine_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_float_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +5 -7
    Fixes

  mysql-test/suite/parts/t/partition_float_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -3
    Fixes

  mysql-test/suite/parts/t/partition_int_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -7
    Fixes

  mysql-test/suite/parts/t/partition_int_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -6
    Fixes

  mysql-test/suite/parts/t/partition_int_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -6
    Fixes

  mysql-test/suite/parts/t/partition_special_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -6
    Fixes

  mysql-test/suite/parts/t/partition_special_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +1 -5
    Fixes

  mysql-test/suite/parts/t/partition_syntax_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_syntax_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_syntax_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_value_innodb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

  mysql-test/suite/parts/t/partition_value_myisam.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +2 -5
    Fixes

  mysql-test/suite/parts/t/partition_value_ndb.test@stripped, 2007-11-16 21:38:59+01:00, mleich@stripped +3 -6
    Fixes

diff -Nrup a/mysql-test/include/partition_1.inc b/mysql-test/include/partition_1.inc
--- a/mysql-test/include/partition_1.inc	2006-02-22 10:07:32 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,750 +0,0 @@
--- source include/have_partition.inc
-
-# include/partition_1.inc
-#
-# Partitionong tests
-#
-# Attention: The variable
-#                 $engine            -- Storage engine to be tested.
-#            must be set within the script sourcing this file.
-#
---disable_abort_on_error
-SET AUTOCOMMIT= 1;
-
-##### Disabled testcases, because of open bugs #####
---echo
---echo #------------------------------------------------------------------------
---echo # There are several testcases disabled because ouf the open bugs 
---echo # #15407 , #15408 , #15890 , #15961 , #13447 , #15966 , #15968, #16370
---echo #------------------------------------------------------------------------
-# Bug#15407 Partitions: crash if subpartition
-let $fixed_bug15407= 0;
-# Bug#15408 Partitions: subpartition names are not unique
-let $fixed_bug15408= 0;
-# Bug#15890 Partitions: Strange interpretation of partition number
-let $fixed_bug15890= 0;
-# Bug#15961 Partitions: Creation of subpart. table without subpart. rule not rejected
-let $fixed_bug15961= 0;
-# Bug#13447 Partitions: crash with alter table
-let $fixed_bug13447= 0;
-# Bug#15966 Partitions: crash if session default engine <> engine used in create table
-let $fixed_bug15966= 0;
-# Bug#15968 Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)
-let $fixed_bug15968= 0;
-# Bug #16370  	Partitions: subpartitions names not mentioned in SHOW CREATE TABLE output
-let $fixed_bug16370= 0;
-
-##### Option, for displaying files #####
-#
-# Attention: Displaying the directory content via "ls $MYSQLTEST_VARDIR/master-data/test/t*"
-#            is probably not portable.
-#            let $ls= 0; disables the execution of "ls ....."
-let $ls= 0;
-
-################################################################################
-#                     Partitioning syntax
-#
-# CREATE TABLE .... (column-list ..)
-# PARTITION BY
-#     KEY '(' ( column-list ) ')'
-#   | RANGE '(' ( expr ) ')'
-#   | LIST '(' ( expr ) ')'
-#   | HASH '(' ( expr ) ')'
-# [PARTITIONS num ]
-# [SUBPARTITION BY
-#   KEY '(' ( column-list ) ')'
-#   | HASH '(' ( expr ) ')'
-#   [SUBPARTITIONS num ]
-# ]
-# [ '('
-#      ( PARTITION logical-name
-#       [ VALUES LESS THAN '(' ( expr | MAX_VALUE ) ')' ]
-#       [ VALUES IN '(' (expr)+ ')' ]
-#       [ TABLESPACE tablespace-name ]
-#       [ [ STORAGE ] ENGINE [ '=' ] storage-engine-name ]
-#       [ NODEGROUP nodegroup-id ]
-#       [ '('
-#            ( SUBPARTITION logical-name
-#              [ TABLESPACE tablespace-name ]
-#              [ STORAGE ENGINE = storage-engine-name ]
-#              [ NODEGROUP nodegroup-id ]
-#            )+
-#         ')'
-#      )+
-#   ')'
-# ]
-################################################################################
-
---echo
---echo #------------------------------------------------------------------------
---echo #  0. Setting of auxiliary variables + Creation of an auxiliary table
---echo #     needed in all testcases
---echo #------------------------------------------------------------------------
-let $max_row= `SELECT @max_row`;
-let $max_row_div2= `SELECT @max_row DIV 2`;
-let $max_row_div3= `SELECT @max_row DIV 3`;
-let $max_row_div4= `SELECT @max_row DIV 4`;
-let $max_int_4= 2147483647;
---disable_warnings
-DROP TABLE IF EXISTS t0_template;
---enable_warnings
-CREATE TABLE t0_template ( f1 INTEGER, f2 char(20), PRIMARY KEY(f1))
-ENGINE = MEMORY;
---echo #     Logging of <max_row> INSERTs into t0_template suppressed
---disable_query_log
-let $num= $max_row;
-while ($num)
-{
-  eval INSERT INTO t0_template SET f1 = $num, f2 = '---$num---';
-
-  dec $num;
-}
---enable_query_log
-
---echo
---echo #------------------------------------------------------------------------
---echo #  1. Some syntax checks
---echo #------------------------------------------------------------------------
---echo #  1.1 Subpartioned table without subpartitioning rule must be rejected
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-if ($fixed_bug15961)
-{
-# Bug#15961 Partitions: Creation of subpart. table without subpart. rule not rejected
---error 9999
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-( PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11));
-}
---echo #  FIXME Implement testcases, where it is checked that all create and
---echo #  alter table statements
---echo #  - with missing mandatory parameters are rejected
---echo #  - with optional parameters are accepted
---echo #  - with wrong combinations of optional parameters are rejected
---echo #  - ............
-
---echo
---echo #------------------------------------------------------------------------
---echo #  2. Checks where the engine is assigned on all supported (CREATE TABLE
---echo #     statement) positions + basic operations on the tables
---echo #        Storage engine mixups are currently (2005-12-23) not supported
---echo #------------------------------------------------------------------------
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
---echo # 2.1 non partitioned table (for comparison)
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = $engine;
-# MLML Full size (as check of check routine)
---source include/partition_10.inc
-DROP TABLE t1;
-#
---echo # 2.2 Assignment of storage engine just after column list only
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = $engine
-     PARTITION BY HASH(f1) PARTITIONS 2;
---source include/partition_10.inc
-DROP TABLE t1;
-#
---echo # 2.3 Assignment of storage engine just after partition or subpartition
---echo #     name only
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY HASH(f1)
-     ( PARTITION part1 STORAGE ENGINE = $engine,
-       PARTITION part2 STORAGE ENGINE = $engine
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2)
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart22 STORAGE ENGINE = $engine)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-#
---echo # 2.4 Some but not all named partitions or subpartitions get a storage
---echo #     engine assigned
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY HASH(f1)
-     ( PARTITION part1 STORAGE ENGINE = $engine,
-       PARTITION part2
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY HASH(f1)
-     ( PARTITION part1                         ,
-       PARTITION part2 STORAGE ENGINE = $engine
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2)
-          (SUBPARTITION subpart11,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart22 STORAGE ENGINE = $engine)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2)
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21,
-           SUBPARTITION subpart22 )
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-#
---echo # 2.5 Storage engine assignment after partition name + after name of
---echo #     subpartitions belonging to another partition
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2) ENGINE = $engine
-          (SUBPARTITION subpart11,
-           SUBPARTITION subpart12),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart22 STORAGE ENGINE = $engine)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2)
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4) ENGINE = $engine
-          (SUBPARTITION subpart21,
-           SUBPARTITION subpart22)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-#
---echo # 2.6 Precedence of storage engine assignments
---echo # 2.6.1 Storage engine assignment after column list + after partition
---echo #       or subpartition name
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = $engine
-     PARTITION BY HASH(f1)
-     ( PARTITION part1 STORAGE ENGINE = $engine,
-       PARTITION part2 STORAGE ENGINE = $engine
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = $engine
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2)
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart22 STORAGE ENGINE = $engine)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
---echo # 2.6.2 Storage engine assignment after partition name + after 
---echo #       subpartition name
-#     in partition part + in sub partition part
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN ($max_row_div2) STORAGE ENGINE = $engine
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine),
-       PARTITION part2 VALUES LESS THAN ($max_int_4)
-          (SUBPARTITION subpart21 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart22 STORAGE ENGINE = $engine)
-     );
---source include/partition_10.inc
-DROP TABLE t1;
-
---echo # 2.7 Session default engine differs from engine used within create table
-eval SET SESSION storage_engine=$engine_other;
-if ($fixed_bug15966)
-{
-# Bug#15966 Partitions: crash if session default engine <> engine used in create table
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) ( PARTITION part1 ENGINE = $engine);
---source include/partition_10.inc
-DROP TABLE t1;
-# Bug#15966 Partitions: crash if session default engine <> engine used in create table
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-     PARTITION BY RANGE(f1)
-     SUBPARTITION BY HASH(f1)
-     ( PARTITION part1 VALUES LESS THAN (1000)
-          (SUBPARTITION subpart11 STORAGE ENGINE = $engine,
-           SUBPARTITION subpart12 STORAGE ENGINE = $engine));
---source include/partition_10.inc
-DROP TABLE t1;
-}
-eval SET SESSION storage_engine=$engine;
-
-
---echo
---echo #------------------------------------------------------------------------
---echo #  3. Check assigning the number of partitions and subpartitions
---echo #     with and without named partitions/subpartitions
---echo #------------------------------------------------------------------------
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
---echo # 3.1 (positive) without partition/subpartition number assignment
---echo # 3.1.1 no partition number, no named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1);
---source include/partition_10.inc
-DROP TABLE t1;
---echo # 3.1.2 no partition number, named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part2);
---source include/partition_10.inc
-DROP TABLE t1;
-# Attention: Several combinations are impossible
-#           If subpartitioning exists
-#           - partitioning algorithm must be RANGE or LIST
-#             This implies the assignment of named partitions.
-#           - subpartitioning algorithm must be HASH or KEY
---echo # 3.1.3 variations on no partition/subpartition number, named partitions,
---echo #       different subpartitions are/are not named
-#
-# Partition name   -- "properties"
-#    part1         --     first/non last
-#    part2         -- non first/non last
-#    part3         -- non first/    last
-#
-# Testpattern:
-#         named subpartitions in
-# Partition part1 part2 part3
-#             N     N     N
-#             N     N     Y
-#             N     Y     N
-#             N     Y     Y
-#             Y     N     N
-#             Y     N     Y
-#             Y     Y     N
-#             Y     Y     Y
---disable_query_log
-let $part0= CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) SUBPARTITION BY HASH(f1);
-#
-eval SET @aux = '(PARTITION part1 VALUES LESS THAN ($max_row_div2),';
-let $part1_N= `SELECT @AUX`;
-eval SET @aux = '(PARTITION part1 VALUES LESS THAN ($max_row_div2)
-(SUBPARTITION subpart11 , SUBPARTITION subpart12 ),';
-let $part1_Y= `SELECT @AUX`;
-#
-eval SET @aux = 'PARTITION part2 VALUES LESS THAN ($max_row),';
-let $part2_N= `SELECT @AUX`;
-eval SET @aux = 'PARTITION part2 VALUES LESS THAN ($max_row)
-(SUBPARTITION subpart21 , SUBPARTITION subpart22 ),';
-let $part2_Y= `SELECT @AUX`;
-#
-eval SET @aux = 'PARTITION part3 VALUES LESS THAN ($max_int_4))';
-let $part3_N= `SELECT @AUX`;
-eval SET @aux = 'PARTITION part3 VALUES LESS THAN ($max_int_4)
-(SUBPARTITION subpart31 , SUBPARTITION subpart32 ))';
-let $part3_Y= `SELECT @AUX`;
---enable_query_log
-
-eval $part0 $part1_N $part2_N $part3_N ;
-DROP TABLE t1;
-# Bug#15407 Partitions: crash if subpartition
-if ($fixed_bug15407)
-{
-eval $part0 $part1_N $part2_N $part3_Y ;
---source include/partition_10.inc
-DROP TABLE t1;
-eval $part0 $part1_N $part2_Y $part3_N ;
---source include/partition_10.inc
-DROP TABLE t1;
-eval $part0 $part1_N $part2_Y $part3_Y ;
---source include/partition_10.inc
-DROP TABLE t1;
-eval $part0 $part1_Y $part2_N $part3_N ;
---source include/partition_10.inc
-DROP TABLE t1;
-eval $part0 $part1_Y $part2_N $part3_Y ;
---source include/partition_10.inc
-DROP TABLE t1;
-eval $part0 $part1_Y $part2_Y $part3_N ;
---source include/partition_10.inc
-DROP TABLE t1;
-}
-eval $part0 $part1_Y $part2_Y $part3_Y ;
---source include/partition_10.inc
-DROP TABLE t1;
-
---echo # 3.2 partition/subpartition numbers good and bad values and notations
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
---echo # 3.2.1 partition/subpartition numbers INTEGER notation
-# ML: "positive/negative" is my private judgement. It need no to correspond
-#     with the server response.
-# (positive) number = 2
-let $part_number= 2;
---source include/partition_11.inc
-# (positive) special case number = 1
-let $part_number= 1;
---source include/partition_11.inc
-# (negative) 0 is non sense
-let $part_number= 0;
---source include/partition_11.inc
-# (negative) -1 is non sense
-let $part_number= -1;
---source include/partition_11.inc
-# (negative) 1000000 is too huge
-let $part_number= 1000000;
---source include/partition_11.inc
-
-if ($fixed_bug15890)
-{
---echo # 3.2.2 partition/subpartition numbers DECIMAL notation
-# (positive) number = 2.0
-let $part_number= 2.0;
---source include/partition_11.inc
-# (negative) -2.0 is non sense
-let $part_number= -2.0;
---source include/partition_11.inc
-# (negative) case number = 0.0 is non sense
-let $part_number= 0.0;
---source include/partition_11.inc
-# Bug#15890 Partitions: Strange interpretation of partition number
-# (negative) number = 1.5 is non sense
-let $part_number= 1.5;
---source include/partition_11.inc
-# (negative) number is too huge
-let $part_number= 999999999999999999999999999999.999999999999999999999999999999;
---source include/partition_11.inc
-# (negative) number is nearly zero
-let $part_number= 0.000000000000000000000000000001;
---source include/partition_11.inc
-
---echo # 3.2.3 partition/subpartition numbers FLOAT notation
-##### FLOAT notation
-# (positive) number = 2.0E+0
-let $part_number= 2.0E+0;
---source include/partition_11.inc
-# Bug#15890 Partitions: Strange interpretation of partition number
-# (positive) number = 0.2E+1
-let $part_number= 0.2E+1;
---source include/partition_11.inc
-# (negative) -2.0E+0 is non sense
-let $part_number= -2.0E+0;
---source include/partition_11.inc
-# (negative) 0.15E+1 is non sense
-let $part_number= 0.15E+1;
---source include/partition_11.inc
-# (negative) 0.0E+300 is zero
-let $part_number= 0.0E+300;
---source include/partition_11.inc
-# Bug#15890 Partitions: Strange interpretation of partition number
-# (negative) 1E+300 is too huge
-let $part_number= 1E+300;
---source include/partition_11.inc
-# (negative) 1E-300 is nearly zero
-let $part_number= 1E-300;
---source include/partition_11.inc
-}
-
---echo # 3.2.4 partition/subpartition numbers STRING notation
-##### STRING notation
-# (negative?) case number = '2'
-let $part_number= '2';
---source include/partition_11.inc
-# (negative?) case number = '2.0'
-let $part_number= '2.0';
---source include/partition_11.inc
-# (negative?) case number = '0.2E+1'
-let $part_number= '0.2E+1';
---source include/partition_11.inc
-# (negative) Strings starts with digit, but 'A' follows
-let $part_number= '2A';
---source include/partition_11.inc
-# (negative) Strings starts with 'A', but digit follows
-let $part_number= 'A2';
---source include/partition_11.inc
-# (negative) empty string
-let $part_number= '';
---source include/partition_11.inc
-# (negative) string without any digits
-let $part_number= 'GARBAGE';
---source include/partition_11.inc
-
---echo # 3.2.5 partition/subpartition numbers other notations
-# (negative) Strings starts with digit, but 'A' follows
-let $part_number= 2A;
---source include/partition_11.inc
-# (negative) Strings starts with 'A', but digit follows
-let $part_number= A2;
---source include/partition_11.inc
-# (negative) string without any digits
-let $part_number= GARBAGE;
---source include/partition_11.inc
-
-# (negative?) double quotes
-let $part_number= "2";
---source include/partition_11.inc
-# (negative) Strings starts with digit, but 'A' follows
-let $part_number= "2A";
---source include/partition_11.inc
-# (negative) Strings starts with 'A', but digit follows
-let $part_number= "A2";
---source include/partition_11.inc
-# (negative) string without any digits
-let $part_number= "GARBAGE";
---source include/partition_11.inc
-
---echo # 3.3 Mixups of assigned partition/subpartition numbers and names
---echo # 3.3.1 (positive) number of partition/subpartition
---echo #                         = number of named partition/subpartition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2 ( PARTITION part1, PARTITION part2 ) ;
-SHOW CREATE TABLE t1;
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) PARTITIONS 2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
---source include/partition_layout.inc
-DROP TABLE t1;
---echo # 3.3.2 (positive) number of partition/subpartition ,
---echo #                  0 (= no) named partition/subpartition
---echo #                  already checked above
---echo # 3.3.3 (negative) number of partitions/subpartitions
---echo #                         > number of named partitions/subpartitions
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2 ( PARTITION part1 ) ;
-# Wrong number of named subpartitions in first partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11 ),
-  PARTITION part2 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-# Wrong number of named subpartitions in non first/non last partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2000)
-    (SUBPARTITION subpart21 ),
-  PARTITION part3 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart31, SUBPARTITION subpart32)
-);
-# Wrong number of named subpartitions in last partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) PARTITIONS 2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart21                        )
-);
---echo # 3.3.4 (negative) number of partitions < number of named partitions
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1 ( PARTITION part1, PARTITION part2 ) ;
-# Wrong number of named subpartitions in first partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-# Wrong number of named subpartitions in non first/non last partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2000)
-    (SUBPARTITION subpart21                        ),
-  PARTITION part3 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart31, SUBPARTITION subpart32)
-);
-# Wrong number of named subpartitions in last partition
---error 1064
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart12),
-  PARTITION part2 VALUES LESS THAN (2147483647)
-    (SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-
-
---echo
---echo #------------------------------------------------------------------------
---echo #  4. Checks of logical partition/subpartition name
---echo #     file name clashes during CREATE TABLE
---echo #------------------------------------------------------------------------
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
---echo #  4.1 (negative) A partition name used more than once
---error ER_SAME_NAME_PARTITION
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part1);
-#
-if ($fixed_bug15408)
-{
-# Bug#15408 Partitions: subpartition names are not unique
---error ER_SAME_NAME_PARTITION
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-    (SUBPARTITION subpart11, SUBPARTITION subpart11)
-);
-}
---echo # FIXME Implement testcases with filename problems
---echo #       existing file of other table --- partition/subpartition file name
---echo #       partition/subpartition file name  --- file of the same table
-
---echo
---echo #------------------------------------------------------------------------
---echo #  5. Alter table experiments
---echo #------------------------------------------------------------------------
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
---echo # 5.1 alter table add partition
---echo # 5.1.1 (negative) add partition to non partitioned table
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20));
---source include/partition_layout.inc
-# MyISAM gets ER_PARTITION_MGMT_ON_NONPARTITIONED and NDB 1005
-# The error code of NDB differs, because all NDB tables are partitioned even
-# if the CREATE TABLE does not contain a partitioning clause.
---error ER_PARTITION_MGMT_ON_NONPARTITIONED,1005
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
---source include/partition_layout.inc
-DROP TABLE t1;
-
---echo # 5.1.2 Add one partition to a table with one partition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1);
---source include/partition_layout.inc
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
---disable_query_log
-eval SELECT $engine = 'NDB' INTO @aux;
-let $my_exit= `SELECT @aux`;
-if ($my_exit)
-{
-   exit;
-}
---enable_query_log
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
---source include/partition_12.inc
-DROP TABLE t1;
-
---echo # 5.1.3 Several times add one partition to a table with some partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part3);
---source include/partition_layout.inc
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
-# Partition name before first existing partition name
-ALTER TABLE t1 ADD PARTITION (PARTITION part0);
---source include/partition_12.inc
-DELETE FROM t1;
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
-# Partition name between existing partition names
-ALTER TABLE t1 ADD PARTITION (PARTITION part2);
---source include/partition_12.inc
-DELETE FROM t1;
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
-if ($fixed_bug13447)
-{
-# Partition name after all existing partition names
-# Bug#13447 Partitions: crash with alter table
-ALTER TABLE t1 ADD PARTITION (PARTITION part4);
-}
---source include/partition_12.inc
-DROP TABLE t1;
-
---echo # 5.1.4 Add several partitions to a table with some partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part3);
---source include/partition_layout.inc
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
-if ($fixed_bug13447)
-{
-# Bug#13447 Partitions: crash with alter table
-ALTER TABLE t1 ADD PARTITION (PARTITION part0, PARTITION part2, PARTITION part4);
-}
---source include/partition_12.inc
-DROP TABLE t1;
-
---echo # 5.1.5 (negative) Add partitions to a table with some partitions
---echo #       clash on new and already existing partition names
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part2, PARTITION part3);
-# Clash on first/non last partition name
---error ER_SAME_NAME_PARTITION
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
-# Clash on non first/non last partition name
---error ER_SAME_NAME_PARTITION
-ALTER TABLE t1 ADD PARTITION (PARTITION part2);
-# Clash on non first/last partition name
---error ER_SAME_NAME_PARTITION
-ALTER TABLE t1 ADD PARTITION (PARTITION part3);
-# Clash on all partition names
---error ER_SAME_NAME_PARTITION
-ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part2, PARTITION part3);
-DROP TABLE t1;
-
-# FIXME Is there any way to add a subpartition to an already existing partition
-
---echo # 5.2 alter table add subpartition
---echo # 5.2.1 Add one subpartition to a table with subpartitioning rule and
---echo #       no explicit defined subpartitions
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-(PARTITION part1 VALUES LESS THAN ($max_row_div2));
-if ($fixed_bug16370)
-{
---source include/partition_layout.inc
-}
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row_div2 - 1;
-eval ALTER TABLE t1 ADD PARTITION (PARTITION part2 VALUES LESS THAN ($max_int_4)
-    (SUBPARTITION subpart21));
-if ($fixed_bug16370)
-{
---source include/partition_12.inc
-}
-DROP TABLE t1;
-DROP TABLE if exists t0_template;
diff -Nrup a/mysql-test/include/partition_10.inc b/mysql-test/include/partition_10.inc
--- a/mysql-test/include/partition_10.inc	2006-01-17 07:27:21 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,73 +0,0 @@
-# include/partition_10.inc
-#
-#     Do some basic checks on a table.
-#
-# FIXME: Do not write the statements and results, if SQL return code = 0
-#        and result set like expected. Write a message, that all is like
-#        expected instead.
-#
-# All SELECTs are so written, that we get my_value = 1, when everything
-# is like expected.
-#
-
---source include/partition_layout.inc
-
-####### Variations with multiple records
-#      Select on empty table
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-#      (mass) Insert of $max_row records
-eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row;
-#      Select
-eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
-            AS my_value FROM t1;
-# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-#      (mass) Update $max_row_div4 * 2 + 1 records
-eval UPDATE t1 SET f1 = f1 + $max_row
-WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;
-#      Select
-eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )
-            AS my_value FROM t1;
-# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-#      (mass) Delete $max_row_div4 * 2 + 1 records
-eval DELETE FROM t1
-WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;
-#      Select
-eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
-            AS my_value FROM t1;
-# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-
-####### Variations with single records
-#      Insert one record at beginning
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-#      Select this record
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-#      Insert one record at end
-eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';
-#      Select this record
-eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';
-#      Update one record
-eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-#      Select
-eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
-if ($fixed_bug15968)
-{
-# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)
-eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'
-     WHERE  f1 = $max_row + 1 AND f2 = '#######';
-#      Select
-SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
-}
-#      Delete
-eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
-if ($fixed_bug15968)
-{
-DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
-}
-#      Select
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-
-#      Truncate
-TRUNCATE t1;
-#      Select on empty table
-SELECT COUNT(*) = 0 AS my_value FROM t1;
diff -Nrup a/mysql-test/include/partition_11.inc b/mysql-test/include/partition_11.inc
--- a/mysql-test/include/partition_11.inc	2006-01-17 07:27:26 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,34 +0,0 @@
-# include/partition_11.inc
-#
-#    Try to create a table with the given partition number
-#
-
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS $part_number;
---disable_query_log
-eval SET @my_errno= $mysql_errno ;
-let $run= `SELECT @my_errno = 0`;
---enable_query_log
-#
-# If this operation was successfull, check + drop this table
-if ($run)
-{
-   --source include/partition_10.inc
-   eval DROP TABLE t1;
-}
-#### Try to create a table with the given subpartition number
-eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS $part_number
-(PARTITION part1 VALUES LESS THAN ($max_row_div2), PARTITION part2 VALUES LESS THAN ($max_int_4));
---disable_query_log
-eval SET @my_errno= $mysql_errno ;
-let $run= `SELECT @my_errno = 0`;
---enable_query_log
-#
-# If this operation was successfull, check + drop this table
-if ($run)
-{
-   --source include/partition_10.inc
-   eval DROP TABLE t1;
-}
diff -Nrup a/mysql-test/include/partition_12.inc b/mysql-test/include/partition_12.inc
--- a/mysql-test/include/partition_12.inc	2006-01-17 07:27:30 +01:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,65 +0,0 @@
-# include/partition_12.inc
-#
-# Do some basic things on a table, if the SQL command executed just before
-# sourcing this file was successful.
-#
-
---source include/partition_layout.inc
-
-####### Variations with multiple records
-   #      (mass) Insert max_row_div2 + 1 records
-   eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN $max_row_div2 AND $max_row;
-   #      Select
-   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
-            AS my_value FROM t1;
-   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-   #      (mass) Update $max_row_div4 * 2 + 1 records
-   eval UPDATE t1 SET f1 = f1 + $max_row
-   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;
-   #      Select
-   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )
-            AS my_value FROM t1;
-   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-   #      (mass) Delete $max_row_div4 * 2 + 1 records
-   eval DELETE FROM t1
-   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;
-   #      Select
-   eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
-            AS my_value FROM t1;
-   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
-
-####### Variations with single records
-#      Insert one record at beginning
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-#      Select this record
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-#      Insert one record at end
-eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';
-#      Select this record
-eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';
-#      Update one record
-eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-#      Select
-eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
-if ($fixed_bug15968)
-{
-# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)
-eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'
-     WHERE  f1 = $max_row + 1 AND f2 = '#######';
-#      Select
-SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
-}
-#      Delete
-eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
-if ($fixed_bug15968)
-{
-DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
-}
-#      Select
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-
-#      Truncate
-TRUNCATE t1;
-#      Select on empty table
-SELECT COUNT(*) = 0 AS my_value FROM t1;
diff -Nrup a/mysql-test/include/partition_layout.inc b/mysql-test/include/partition_layout.inc
--- a/mysql-test/include/partition_layout.inc	2007-08-27 20:09:09 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,14 +0,0 @@
-# include/partition_layout.inc
-#
-# Print partitioning related informations about the table t1
-#
-
-eval SHOW CREATE TABLE t1;
-
-# Optional (most probably issues with separators and case sensitivity)
-# listing of files belonging to the table t1
-if ($ls)
-{
-   --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
-   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
-}
diff -Nrup a/mysql-test/r/partition_02myisam.result b/mysql-test/r/partition_02myisam.result
--- a/mysql-test/r/partition_02myisam.result	2006-06-15 16:50:45 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,1725 +0,0 @@
-SET SESSION storage_engine='MYISAM';
-SET @max_row = 200;
-SET AUTOCOMMIT= 1;
-
-#------------------------------------------------------------------------
-# There are several testcases disabled because ouf the open bugs 
-# #15407 , #15408 , #15890 , #15961 , #13447 , #15966 , #15968, #16370
-#------------------------------------------------------------------------
-
-#------------------------------------------------------------------------
-#  0. Setting of auxiliary variables + Creation of an auxiliary table
-#     needed in all testcases
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t0_template;
-CREATE TABLE t0_template ( f1 INTEGER, f2 char(20), PRIMARY KEY(f1))
-ENGINE = MEMORY;
-#     Logging of <max_row> INSERTs into t0_template suppressed
-
-#------------------------------------------------------------------------
-#  1. Some syntax checks
-#------------------------------------------------------------------------
-#  1.1 Subpartioned table without subpartitioning rule must be rejected
-DROP TABLE IF EXISTS t1;
-#  FIXME Implement testcases, where it is checked that all create and
-#  alter table statements
-#  - with missing mandatory parameters are rejected
-#  - with optional parameters are accepted
-#  - with wrong combinations of optional parameters are rejected
-#  - ............
-
-#------------------------------------------------------------------------
-#  2. Checks where the engine is assigned on all supported (CREATE TABLE
-#     statement) positions + basic operations on the tables
-#        Storage engine mixups are currently (2005-12-23) not supported
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-# 2.1 non partitioned table (for comparison)
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM';
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.2 Assignment of storage engine just after column list only
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM'
-PARTITION BY HASH(f1) PARTITIONS 2;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 2  */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.3 Assignment of storage engine just after partition or subpartition
-#     name only
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'MYISAM',
-PARTITION part2 STORAGE ENGINE = 'MYISAM'
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart22 STORAGE ENGINE = 'MYISAM')
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.4 Some but not all named partitions or subpartitions get a storage
-#     engine assigned
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'MYISAM',
-PARTITION part2
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1                         ,
-PARTITION part2 STORAGE ENGINE = 'MYISAM'
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11,
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart22 STORAGE ENGINE = 'MYISAM')
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21,
-SUBPARTITION subpart22 )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.5 Storage engine assignment after partition name + after name of
-#     subpartitions belonging to another partition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100) ENGINE = 'MYISAM'
-(SUBPARTITION subpart11,
-SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart22 STORAGE ENGINE = 'MYISAM')
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = 'MYISAM'
-(SUBPARTITION subpart21,
-SUBPARTITION subpart22)
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.6 Precedence of storage engine assignments
-# 2.6.1 Storage engine assignment after column list + after partition
-#       or subpartition name
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM'
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'MYISAM',
-PARTITION part2 STORAGE ENGINE = 'MYISAM'
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM'
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart22 STORAGE ENGINE = 'MYISAM')
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.6.2 Storage engine assignment after partition name + after 
-#       subpartition name
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (100) STORAGE ENGINE = 'MYISAM'
-(SUBPARTITION subpart11 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart12 STORAGE ENGINE = 'MYISAM'),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'MYISAM',
-SUBPARTITION subpart22 STORAGE ENGINE = 'MYISAM')
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.7 Session default engine differs from engine used within create table
-SET SESSION storage_engine='MEMORY';
-SET SESSION storage_engine='MYISAM';
-
-#------------------------------------------------------------------------
-#  3. Check assigning the number of partitions and subpartitions
-#     with and without named partitions/subpartitions
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-# 3.1 (positive) without partition/subpartition number assignment
-# 3.1.1 no partition number, no named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1)  */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.1.2 no partition number, named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part2);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.1.3 variations on no partition/subpartition number, named partitions,
-#       different subpartitions are/are not named
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) SUBPARTITION BY HASH(f1) (PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (200), PARTITION part3 VALUES LESS THAN (2147483647)) ;
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) SUBPARTITION BY HASH(f1) (PARTITION part1 VALUES LESS THAN (100)
-(SUBPARTITION subpart11 , SUBPARTITION subpart12 ), PARTITION part2 VALUES LESS THAN (200)
-(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31 , SUBPARTITION subpart32 )) ;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (100) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (200) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM), PARTITION part3 VALUES LESS THAN (2147483647) (SUBPARTITION subpart31 ENGINE = MyISAM, SUBPARTITION subpart32 ENGINE = MyISAM)) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.2 partition/subpartition numbers good and bad values and notations
-DROP TABLE IF EXISTS t1;
-# 3.2.1 partition/subpartition numbers INTEGER notation
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 2  */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 2
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) PARTITIONS 1  */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 1
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION part2 VALUES LESS THAN (2147483647) ENGINE = MyISAM) */
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 0;
-ERROR HY000: Number of partitions = 0 is not an allowed value
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 0
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR HY000: Number of subpartitions = 0 is not an allowed value
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS -1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS -1
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (21' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1000000;
-ERROR HY000: Too many partitions (including subpartitions) were defined
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 1000000
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR HY000: Too many partitions (including subpartitions) were defined
-# 3.2.4 partition/subpartition numbers STRING notation
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2.0';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2.0'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN ' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '0.2E+1';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '0.2E+1'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS TH' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2A';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2A'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 'A2';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 'A2'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS ''
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (21' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 'GARBAGE';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 'GARBAGE'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS T' at line 3
-# 3.2.5 partition/subpartition numbers other notations
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2A;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 2A
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (21' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS A2;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS A2
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (21' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS GARBAGE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS GARBAGE
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THA' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "2";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "2"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "2A";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "2A"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "A2";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "A2"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "GARBAGE";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "GARBAGE"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"
-(PARTITION part1 VALUES LESS THAN (100), PARTITION part2 VALUES LESS T' at line 3
-# 3.3 Mixups of assigned partition/subpartition numbers and names
-# 3.3.1 (positive) number of partition/subpartition
-#                         = number of named partition/subpartition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2 ( PARTITION part1, PARTITION part2 ) ;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) PARTITIONS 2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000) (SUBPARTITION subpart11 ENGINE = MyISAM, SUBPARTITION subpart12 ENGINE = MyISAM), PARTITION part2 VALUES LESS THAN (2147483647) (SUBPARTITION subpart21 ENGINE = MyISAM, SUBPARTITION subpart22 ENGINE = MyISAM)) */
-DROP TABLE t1;
-# 3.3.2 (positive) number of partition/subpartition ,
-#                  0 (= no) named partition/subpartition
-#                  already checked above
-# 3.3.3 (negative) number of partitions/subpartitions
-#                         > number of named partitions/subpartitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2 ( PARTITION part1 ) ;
-ERROR 42000: Wrong number of partitions defined, mismatch with previous setting near ')' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 ),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPAR' at line 5
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 ),
-PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31, SUBPARTITION subpart32)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31, SUBPAR' at line 7
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1) PARTITIONS 2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21                        )
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near ')
-)' at line 7
-# 3.3.4 (negative) number of partitions < number of named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1 ( PARTITION part1, PARTITION part2 ) ;
-ERROR 42000: Wrong number of partitions defined, mismatch with previous setting near ')' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPAR' at line 5
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21                        ),
-PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31, SUBPARTITION subpart32)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21              ' at line 5
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 1
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPAR' at line 5
-
-#------------------------------------------------------------------------
-#  4. Checks of logical partition/subpartition name
-#     file name clashes during CREATE TABLE
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-#  4.1 (negative) A partition name used more than once
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part1);
-ERROR HY000: Duplicate partition name part1
-# FIXME Implement testcases with filename problems
-#       existing file of other table --- partition/subpartition file name
-#       partition/subpartition file name  --- file of the same table
-
-#------------------------------------------------------------------------
-#  5. Alter table experiments
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-# 5.1 alter table add partition
-# 5.1.1 (negative) add partition to non partitioned table
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20));
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
-Got one of the listed errors
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-DROP TABLE t1;
-# 5.1.2 Add one partition to a table with one partition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1)  */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION p0 ENGINE = MyISAM, PARTITION part1 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 5.1.3 Several times add one partition to a table with some partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part3);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-ALTER TABLE t1 ADD PARTITION (PARTITION part0);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM, PARTITION part0 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1;
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-ALTER TABLE t1 ADD PARTITION (PARTITION part2);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM, PARTITION part0 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1;
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM, PARTITION part0 ENGINE = MyISAM, PARTITION part2 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 5.1.4 Add several partitions to a table with some partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part3);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) DEFAULT NULL,
-  `f2` char(20) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 /*!50100 PARTITION BY HASH (f1) (PARTITION part1 ENGINE = MyISAM, PARTITION part3 ENGINE = MyISAM) */
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 100 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 5.1.5 (negative) Add partitions to a table with some partitions
-#       clash on new and already existing partition names
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) (PARTITION part1, PARTITION part2, PARTITION part3);
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
-ERROR HY000: Duplicate partition name part1
-ALTER TABLE t1 ADD PARTITION (PARTITION part2);
-ERROR HY000: Duplicate partition name part2
-ALTER TABLE t1 ADD PARTITION (PARTITION part3);
-ERROR HY000: Duplicate partition name part3
-ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part2, PARTITION part3);
-ERROR HY000: Duplicate partition name part1
-DROP TABLE t1;
-# 5.2 alter table add subpartition
-# 5.2.1 Add one subpartition to a table with subpartitioning rule and
-#       no explicit defined subpartitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-(PARTITION part1 VALUES LESS THAN (100));
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100 - 1;
-ALTER TABLE t1 ADD PARTITION (PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21));
-DROP TABLE t1;
-DROP TABLE if exists t0_template;
diff -Nrup a/mysql-test/suite/ndb/r/partition_03ndb.result b/mysql-test/suite/ndb/r/partition_03ndb.result
--- a/mysql-test/suite/ndb/r/partition_03ndb.result	2007-06-27 14:27:29 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,1361 +0,0 @@
-SET SESSION storage_engine='NDB' ;
-SET @max_row = 200;
-SET AUTOCOMMIT= 1;
-#------------------------------------------------------------------------
-#  0. Creation of an auxiliary table needed in all testcases
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t0_template;
-CREATE TABLE t0_template ( f1 INTEGER, f2 char(20), PRIMARY KEY(f1))
-ENGINE = MEMORY;
-#     Logging of 200 INSERTs into t0_template suppressed
-#------------------------------------------------------------------------
-#  1. Some syntax checks
-#------------------------------------------------------------------------
-#  1.1 Subpartioned table without subpartitioning rule must be rejected
-DROP TABLE IF EXISTS t1;
-#------------------------------------------------------------------------
-#  2. Checks where the engine is set on all supported CREATE TABLE
-#     statement positions + basic operations on the tables
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-# 2.1 table (non partitioned) for comparison
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'NDB' ;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.2 table with engine setting just after column list
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'NDB' 
-PARTITION BY HASH(f1) PARTITIONS 2;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) PARTITIONS 2 
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.3 table with engine setting in the named partition part
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'NDB' ,
-PARTITION part2 STORAGE ENGINE = 'NDB' 
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.4 table with engine setting in the named subpartition part
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart22 STORAGE ENGINE = 'NDB' )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.5 Ugly "incomplete" storage engine assignments
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'NDB' ,
-PARTITION part2
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1)
-( PARTITION part1                         ,
-PARTITION part2 STORAGE ENGINE = 'NDB' 
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart22 STORAGE ENGINE = 'NDB' )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21                         ,
-SUBPARTITION subpart22                         )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.6 Ugly "over determined" storage engine assignments
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'NDB' 
-PARTITION BY HASH(f1)
-( PARTITION part1 STORAGE ENGINE = 'NDB' ,
-PARTITION part2 STORAGE ENGINE = 'NDB' 
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20)) ENGINE = 'NDB' 
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart22 STORAGE ENGINE = 'NDB' )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000) STORAGE ENGINE = 'NDB' 
-(SUBPARTITION subpart11 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart22 STORAGE ENGINE = 'NDB' )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.7 Ugly storage engine assignments mixups
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000) ENGINE = 'NDB' 
-(SUBPARTITION subpart11                          ,
-SUBPARTITION subpart12                         ),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart22 STORAGE ENGINE = 'NDB' )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY RANGE(f1)
-SUBPARTITION BY HASH(f1)
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 STORAGE ENGINE = 'NDB' ,
-SUBPARTITION subpart12 STORAGE ENGINE = 'NDB' ),
-PARTITION part2 VALUES LESS THAN (2000) ENGINE = 'NDB' 
-(SUBPARTITION subpart21                         ,
-SUBPARTITION subpart22                         )
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 2.8 Session default engine differs from engine used within create table
-SET SESSION storage_engine='MEMORY';
-SET SESSION storage_engine='NDB' ;
-#------------------------------------------------------------------------
-#  3. Check number of partitions and subpartitions
-#------------------------------------------------------------------------
-DROP TABLE IF EXISTS t1;
-# 3.1 (positive) without partition/subpartition number assignment
-# 3.1.1     no partition number, no named partitions, no subpartitions mentioned
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) 
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.1.2     no partition number, named partitions, no subpartitions mentioned
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1) (PARTITION part1, PARTITION part2);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.1.3 variations on no partition/subpartition number, named partitions,
-#       different subpartitions are/are not named
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1) (PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2000), PARTITION part3 VALUES LESS THAN (2147483647)) ;
-DROP TABLE t1;
-#  FIXME several subtestcases of 3.1.3 disabled because of server crashes
-# Bug#15407 Partitions: crash if subpartition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1) (PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11 , SUBPARTITION subpart12 ), PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21 , SUBPARTITION subpart22 ), PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21 , SUBPARTITION subpart22 )) ;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2000)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster), PARTITION part3 VALUES LESS THAN (2147483647)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-# 3.2 partition/subpartition numbers good and bad values and notations
-DROP TABLE IF EXISTS t1;
-# 3.2.1 partition/subpartition numbers INTEGER notation
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) PARTITIONS 2 
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 2
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 2 (PARTITION part1 VALUES LESS THAN (1000) , PARTITION part2 VALUES LESS THAN (2147483647) )
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) PARTITIONS 1 
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 1
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) SUBPARTITIONS 1 (PARTITION part1 VALUES LESS THAN (1000) , PARTITION part2 VALUES LESS THAN (2147483647) )
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 200;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-UPDATE t1 SET f1 = f1 + 200
-WHERE f1 BETWEEN 100 - 50 AND 100 + 50;
-SELECT (COUNT(*) = 200) AND (MIN(f1) = 1) AND (MAX(f1) = 100 + 50 + 200 )
-AS my_value FROM t1;
-my_value
-1
-DELETE FROM t1
-WHERE f1 BETWEEN 100 - 50 + 200 AND 100 + 50 + 200;
-SELECT (COUNT(*) = 200 - 50 - 50 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = 200)
-AS my_value FROM t1;
-my_value
-1
-INSERT INTO t1 SET f1 = 0 , f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
-my_value
-1
-INSERT INTO t1 SET f1 = 200 + 1, f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 1 AND f2 = '#######';
-my_value
-1
-UPDATE t1 SET f1 = 200 + 2, f2 = 'ZZZZZZZ'
-     WHERE  f1 = 0 AND f2 = '#######';
-SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-my_value
-1
-DELETE FROM t1 WHERE f1 = 200 + 2 AND f2 = 'ZZZZZZZ';
-SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
-my_value
-1
-TRUNCATE t1;
-SELECT COUNT(*) = 0 AS my_value FROM t1;
-my_value
-1
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 0;
-ERROR HY000: Number of partitions = 0 is not an allowed value
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 0
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR HY000: Number of subpartitions = 0 is not an allowed value
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS -1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS -1
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 1000000;
-ERROR HY000: Too many partitions were defined
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 1000000
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR HY000: Too many partitions were defined
-# 3.2.4 partition/subpartition numbers STRING notation
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2.0';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2.0'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2.0'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '0.2E+1';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '0.2E+1'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''0.2E+1'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS T' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '2A';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS '2A'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''2A'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN ' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 'A2';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 'A2'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''A2'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN ' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS '';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS ''
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '''
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 'GARBAGE';
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 'GARBAGE'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''GARBAGE'
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS ' at line 3
-# 3.2.5 partition/subpartition numbers other notations
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS 2A;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS 2A
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2A
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS A2;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS A2
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'A2
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS GARBAGE;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS GARBAGE
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'GARBAGE
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS TH' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "2";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "2"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "2A";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "2A"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"2A"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN ' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "A2";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "A2"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"A2"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN ' at line 3
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION BY HASH(f1) PARTITIONS "GARBAGE";
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
-SUBPARTITIONS "GARBAGE"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS THAN (2147483647));
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"GARBAGE"
-(PARTITION part1 VALUES LESS THAN (1000), PARTITION part2 VALUES LESS ' at line 3
-# 3.3 Mixups of number and names of partition/subpartition assigned
-# 3.3.1 (positive) number of partition/subpartition = number of named partition/subpartition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1) PARTITIONS    2 ( PARTITION    part1,    PARTITION    part2 ) ;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY HASH (f1) (PARTITION part1  ENGINE = ndbcluster, PARTITION part2  ENGINE = ndbcluster)
-DROP TABLE t1;
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) PARTITIONS    2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `f1` int(11) default NULL,
-  `f2` char(20) default NULL
-) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (f1) SUBPARTITION BY HASH (f1) (PARTITION part1 VALUES LESS THAN (1000)  (SUBPARTITION subpart11 ENGINE = ndbcluster, SUBPARTITION subpart12 ENGINE = ndbcluster), PARTITION part2 VALUES LESS THAN (2147483647)  (SUBPARTITION subpart21 ENGINE = ndbcluster, SUBPARTITION subpart22 ENGINE = ndbcluster))
-DROP TABLE t1;
-# 3.3.2 (positive) number of partition/subpartition , 0 (= no) named partition/subpartition
-#                  already checked above
-# 3.3.3 (negative) number of partitions > number of named partitions
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1) PARTITIONS    2 ( PARTITION    part1 ) ;
-ERROR 42000: Wrong number of partitions defined, mismatch with previous setting near ')' at line 2
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11                        ),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPARTITION subpart22)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21, SUBPAR' at line 5
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1)
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2000)
-(SUBPARTITION subpart21                        ),
-PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31, SUBPARTITION subpart32)
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near '),
-PARTITION part3 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart31, SUBPAR' at line 7
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY RANGE(f1) PARTITIONS    2
-SUBPARTITION BY HASH(f1) SUBPARTITIONS 2
-( PARTITION part1 VALUES LESS THAN (1000)
-(SUBPARTITION subpart11, SUBPARTITION subpart12),
-PARTITION part2 VALUES LESS THAN (2147483647)
-(SUBPARTITION subpart21                        )
-);
-ERROR 42000: Wrong number of subpartitions defined, mismatch with previous setting near ')
-)' at line 7
-#------------------------------------------------------------------------
-#  4. Checks of logical partition/subpartition name
-#     file name clashes during CREATE TABLE
-#------------------------------------------------------------------------
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1) (PARTITION part1, PARTITION part1);
-ERROR HY000: Duplicate partition name part1
-#------------------------------------------------------------------------
-#  5. Alter table experiments
-#------------------------------------------------------------------------
-# 5.1 alter table add partition
-# 5.1.1 (negative) add partition to non partitioned table
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20));
-# FIXME Why does the error numbers of MyISAM(1482) and NDB(1005) differ ?
-ALTER TABLE t1 ADD PARTITION (PARTITION part1);
-Got one of the listed errors
-DROP TABLE t1;
-# 5.1.2 Add one partition to a table with one partition
-CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
-PARTITION    BY HASH(f1);
-INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND 100;
diff -Nrup a/mysql-test/suite/ndb/t/partition_03ndb.test b/mysql-test/suite/ndb/t/partition_03ndb.test
--- a/mysql-test/suite/ndb/t/partition_03ndb.test	2007-06-27 14:27:28 +02:00
+++ /dev/null	Wed Dec 31 16:00:00 196900
@@ -1,26 +0,0 @@
-###############################################
-#                                             #
-#  Partition tests NDB tables                 #
-#                                             #
-###############################################
-
-#    
-# NOTE: PLEASE DO NOT ADD NOT NDB SPECIFIC TESTCASES HERE !
-#       NON STORAGE SPECIFIC TESTCASES SHOULD BE ADDED IN
-#       THE SOURCED FIELS ONLY.
-#
-
-# Storage engine to be tested
-let $engine= 'NDB' ;
--- source include/have_ndb.inc
-eval SET SESSION storage_engine=$engine;
-
-
-# Other storage engine <> storage engine to be tested
-let $engine_other= 'MEMORY';
-# number of rows for the INSERT/UPDATE/DELETE/SELECT experiments
-#                on partioned tables
-# Attention: In the moment the result files fit to @max_row = 200 only
-SET @max_row = 200;
-
--- source include/partition_1.inc
diff -Nrup a/mysql-test/suite/parts/inc/methods1.inc b/mysql-test/suite/parts/inc/methods1.inc
--- a/mysql-test/suite/parts/inc/methods1.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/methods1.inc	2007-11-16 21:38:55 +01:00
@@ -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;
diff -Nrup a/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc b/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc
--- a/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc	2007-11-16 21:38:55 +01:00
@@ -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;
diff -Nrup a/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc b/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc
--- a/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_delete.inc	2007-11-16 21:38:55 +01:00
@@ -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                  #
 #                                                                              #
diff -Nrup a/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc b/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc
--- a/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc	2007-11-16 21:38:55 +01:00
@@ -38,7 +38,6 @@ let $val2 = 13 ;
 let $val3 = 17 ;
 let $val4 = 15 ;
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 
 let $sqlfunc = ceiling(col1);
@@ -51,7 +50,6 @@ let $val3 = 17.987;
 let $val4 = 15.654 ;
 # DISABLED due to bug 30577
 #--source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = floor(col1);
 let $valsqlfunc = floor(15.123);
@@ -63,7 +61,6 @@ let $val3 = 17.987;
 let $val4 = 15.654 ;
 # DISABLED due to bug 30577
 #--source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = mod(col1,10);
 let $valsqlfunc = mod(15,10);
@@ -74,7 +71,6 @@ let $val2 = 19;
 let $val3 = 17;
 let $val4 = 15 ;
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = day(col1);
 let $valsqlfunc = day('2006-12-21');
@@ -85,7 +81,6 @@ let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofmonth(col1);
 let $valsqlfunc = dayofmonth('2006-12-24');
@@ -96,7 +91,6 @@ let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofweek(col1);
 let $valsqlfunc = dayofweek('2006-12-24');
@@ -107,7 +101,6 @@ let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = dayofyear(col1);
 let $valsqlfunc = dayofyear('2006-12-25');
@@ -118,10 +111,8 @@ let $val2 =  '2006-01-17';
 let $val3 =  '2006-02-25';
 let $val4 =  '2006-02-05';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = extract(month from col1);
 let $valsqlfunc = extract(year from '1998-11-23');
@@ -132,7 +123,6 @@ let $val2 =  '2006-02-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-05';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = hour(col1);
 let $valsqlfunc = hour('18:30');
@@ -143,7 +133,6 @@ let $val2 =  '14:30';
 let $val3 =  '21:59';
 let $val4 =  '10:30';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = microsecond(col1);
 let $valsqlfunc = microsecond('10:30:10.000010');
@@ -154,7 +143,6 @@ let $val2 =  '04:30:01.000018';
 let $val3 =  '00:59:22.000024';
 let $val4 =  '05:30:34.000037';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = minute(col1);
 let $valsqlfunc = minute('18:30');
@@ -164,7 +152,6 @@ let $val2 =  '14:30:45';
 let $val3 =  '21:59:22';
 let $val4 =  '10:24:23';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = second(col1);
 let $valsqlfunc = second('18:30:14');
@@ -175,10 +162,8 @@ let $val2 =  '14:30:20';
 let $val3 =  '21:59:22';
 let $val4 =  '10:22:33';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 let $coltype = char(30);
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = month(col1);
 let $valsqlfunc = month('2006-10-14');
@@ -189,7 +174,6 @@ let $val2 =  '2006-12-17';
 let $val3 =  '2006-05-25';
 let $val4 =  '2006-11-06';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = quarter(col1);
 let $valsqlfunc = quarter('2006-10-14');
@@ -200,7 +184,6 @@ let $val2 =  '2006-12-17';
 let $val3 =  '2006-09-25';
 let $val4 =  '2006-07-30';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = time_to_sec(col1)-(time_to_sec(col1)-20);
 let $valsqlfunc = time_to_sec('18:30:14')-(time_to_sec('17:59:59'));
@@ -211,7 +194,6 @@ let $val2 =  '14:30:45';
 let $val3 =  '21:59:22';
 let $val4 =  '10:33:11';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = to_days(col1)-to_days('2006-01-01');
 let $valsqlfunc = to_days('2006-02-02')-to_days('2006-01-01');
@@ -222,7 +204,6 @@ let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-06';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 # DATEDIFF() is implemented as (TO_DAYS(d1) - TO_DAYS(d2))
 let $sqlfunc = datediff(col1, '2006-01-01');
@@ -234,7 +215,6 @@ let $val2 =  '2006-01-17';
 let $val3 =  '2006-01-25';
 let $val4 =  '2006-02-06';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = weekday(col1);
 let $valsqlfunc = weekday('2006-10-14');
@@ -245,7 +225,6 @@ let $val2 =  '2006-11-17';
 let $val3 =  '2006-05-25';
 let $val4 =  '2006-02-06';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = year(col1)-1990;
 let $valsqlfunc = year('2005-10-14')-1990;
@@ -256,7 +235,6 @@ let $val2 =  '2000-02-17';
 let $val3 =  '2004-05-25';
 let $val4 =  '2002-02-15';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
 
 let $sqlfunc = yearweek(col1)-200600;
 let $valsqlfunc = yearweek('2006-10-14')-200600;
@@ -267,4 +245,3 @@ let $val2 =  '2006-08-17';
 let $val3 =  '2006-03-25';
 let $val4 =  '2006-11-15';
 --source suite/parts/inc/partition_supported_sql_funcs.inc
-# --source include/partition_supported_sql_funcs.inc
diff -Nrup a/mysql-test/suite/parts/inc/partition.pre b/mysql-test/suite/parts/inc/partition.pre
--- a/mysql-test/suite/parts/inc/partition.pre	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition.pre	2007-11-16 21:38:55 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition.pre                                                        #
+# inc/partition.pre                                                            #
 #                                                                              #
 # Purpose:                                                                     #
 #   Auxiliary script creating prerequisites needed by the partitioning tests   #
@@ -26,27 +26,21 @@
 eval SET @@session.storage_engine = $engine;
 
 ##### Disabled/affected testcases, because of open bugs #####
---echo
---echo #------------------------------------------------------------------------
---echo # There are several testcases disabled because of the open bugs
---echo # #15890
-if (`SELECT @@session.storage_engine IN('ndbcluster')`)
-{
---echo # #18730, Bug#18735
-}
---echo #------------------------------------------------------------------------
-# Attention: Only bugs appearing in all storage engines should be mentioned above.
-#            The top level test wrapper (example: t/partition_basic_ndb.test)
-#            may set the $fixed_bug<nnnnn> variable to 0 after sourcing
-#            this file.
-# Bug#15890 Partitions: Strange interpretation of partition number
-let $fixed_bug15890= 0;
-# Bug#18730: Partitions: NDB, crash on SELECT MIN(<unique column>)
-# Attention: NDB testcases set this variable later to 0
-let $fixed_bug18730= 1;
-# Bug#18735: Partitions: NDB, UNIQUE INDEX, UPDATE, strange server response
-# Attention: NDB testcases set this variable later to 0
-let $fixed_bug18735= 1;
+# --echo
+# --echo #------------------------------------------------------------------------
+# --echo # There are several testcases disabled because of the open bugs
+# if (`SELECT @@session.storage_engine IN('ndbcluster')`)
+# {
+# --echo # #18730
+# }
+# --echo #------------------------------------------------------------------------
+# # Attention: Only bugs appearing in all storage engines should be mentioned above.
+# #            The top level test wrapper (example: t/partition_basic_ndb.test)
+# #            may set the $fixed_bug<nnnnn> variable to 0 after sourcing
+# #            this file.
+# # Bug#18730: Partitions: NDB, crash on SELECT MIN(<unique column>)
+# # Attention: NDB testcases set this variable later to 0
+# let $fixed_bug18730= 1;
 
 --echo
 --echo #------------------------------------------------------------------------
@@ -308,23 +302,23 @@ if (0)
 #      (t/partition_<feature>_<engine>.test)
 #      a) General not engine specific settings and requirements
 #         $debug, $ls, @max_row, $more_trigger_tests, .....
-#         --source include/have_partition.inc
+#         --source inc/have_partition.inc
 #      b) Engine specific settings and requirements
 #         $do_pk_tests, $MAX_VALUE, $engine
 #         SET SESSION storage_engine
 #         $engine_other
 #      c) Generate the prerequisites ($variables, @variables, tables) needed
 #         via
-#         --source include/partition.pre
+#         --source inc/partition.pre
 #      d) Set "fixed_bug<number>" variables to 1 if there are open engine
 #         specific bugs which need worarounds.
 #      e) Execute the feature specific testscript via
-#         --source include/partition_<feature>.inc
+#         --source inc/partition_<feature>.inc
 #      f) Perform a cleanup by removing all objects created within the tests
-#         --source include/partition_cleanup.inc
+#         --source inc/partition_cleanup.inc
 #
 # 2.2. script generating the prerequisites needed in all tests
-#      (include/partition.pre)
+#      (inc/partition.pre)
 #      a) Message about open bugs causing that
 #         - some testcases are disabled
 #         - it cannot be avoided that the file with expected results suffers
@@ -341,7 +335,7 @@ if (0)
 #      d) Creation of auxiliary tables ....
 #
 # 3. script checking a feature
-#    (include/partition_<feature.inc>.inc)
+#    (inc/partition_<feature.inc>.inc)
 #    Example:
 #    a) "set/compute" a CREATE TABLE t1 .. and an ALTER TABLE ... statement
 #    b) CREATE TABLE t1 ...
@@ -353,13 +347,13 @@ if (0)
 #    Now t1 and t0_template should have the same content.
 #    f) Check the "usability" of the current table t1
 #       via
-#       --source include/partition_check.pre
+#       --source inc/partition_check.pre
 #    g) DROP TABLE t1
 #    Switch to other CREATE and ALTER statements and run sequence a)-g) again
 #    ...
 #
 # 4. script checking if a certain table shows the expected behaviour
-#    ("usability" check):   include/partition_check.inc
+#    ("usability" check):   inc/partition_check.inc
 #    - SELECT/INSERT/UPDATE/DELETE affecting single and multiple records
 #    - check of values of special interest like NULL etc.
 #    - INSERT/UPDATE with BEFORE/AFTER triggers
@@ -382,19 +376,19 @@ if (0)
 #                protocolling of some queries.
 # In most cases you will find that the r/<testcase>.<log/reject> contains at
 # least a line "#       # check <something>:       0".
-# That means that a check within include/partition_check did not got the
+# That means that a check within inc/partition_check did not got the
 # expected result.
 # A good start for a replay script would be
 #   1. Copy t/partition_<feature>_<engine>.test to t/my_test.test
 #   2. Edit t/my_test.test
 #      - set $debug to 1
 #      - replace the line
-#        "--source include/partition_<feature>.inc"
+#        "--source inc/partition_<feature>.inc"
 #        with all statements between the last
 #        CREATE TABLE t1 statement (included this)
 #        and the line
-#        "# Start usability test (include/partition_check.inc)"
-#      - add the content of include/partition_check.inc at the end.
+#        "# Start usability test (inc/partition_check.inc)"
+#      - add the content of inc/partition_check.inc at the end.
 #
 # Please excuse that the partitioning tests generate such huge protocols which
 # and are not very handy when it comes to bug analysis. I tried to squeez out
diff -Nrup a/mysql-test/suite/parts/inc/partition_10.inc b/mysql-test/suite/parts/inc/partition_10.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/parts/inc/partition_10.inc	2007-11-16 21:38:55 +01:00
@@ -0,0 +1,67 @@
+# inc/partition_10.inc
+#
+#     Do some basic checks on a table.
+#
+# FIXME: Do not write the statements and results, if SQL return code = 0
+#        and result set like expected. Write a message, that all is like
+#        expected instead.
+#
+# All SELECTs are so written, that we get my_value = 1, when everything
+# is like expected.
+#
+
+--source suite/parts/inc/partition_layout.inc
+
+####### Variations with multiple records
+#      Select on empty table
+SELECT COUNT(*) = 0 AS my_value FROM t1;
+#      (mass) Insert of $max_row records
+eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN 1 AND $max_row;
+#      Select
+eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
+            AS my_value FROM t1;
+# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+#      (mass) Update $max_row_div4 * 2 + 1 records
+eval UPDATE t1 SET f1 = f1 + $max_row
+WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;
+#      Select
+eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )
+            AS my_value FROM t1;
+# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+#      (mass) Delete $max_row_div4 * 2 + 1 records
+eval DELETE FROM t1
+WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;
+#      Select
+eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
+            AS my_value FROM t1;
+# DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+
+####### Variations with single records
+#      Insert one record at beginning
+INSERT INTO t1 SET f1 = 0 , f2 = '#######';
+#      Select this record
+SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
+#      Insert one record at end
+eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';
+#      Select this record
+eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';
+#      Update one record
+eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'
+     WHERE  f1 = 0 AND f2 = '#######';
+#      Select
+eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
+# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)
+eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'
+     WHERE  f1 = $max_row + 1 AND f2 = '#######';
+#      Select
+SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
+#      Delete
+eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
+DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
+#      Select
+SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
+
+#      Truncate
+TRUNCATE t1;
+#      Select on empty table
+SELECT COUNT(*) = 0 AS my_value FROM t1;
diff -Nrup a/mysql-test/suite/parts/inc/partition_11.inc b/mysql-test/suite/parts/inc/partition_11.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/parts/inc/partition_11.inc	2007-11-16 21:38:55 +01:00
@@ -0,0 +1,34 @@
+# inc/partition_11.inc
+#
+#    Try to create a table with the given partition number
+#
+
+eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
+PARTITION BY HASH(f1) PARTITIONS $part_number;
+--disable_query_log
+eval SET @my_errno= $mysql_errno ;
+let $run= `SELECT @my_errno = 0`;
+--enable_query_log
+#
+# If this operation was successfull, check + drop this table
+if ($run)
+{
+   --source suite/parts/inc/partition_10.inc
+   eval DROP TABLE t1;
+}
+#### Try to create a table with the given subpartition number
+eval CREATE TABLE t1 ( f1 INTEGER, f2 char(20))
+PARTITION    BY RANGE(f1) SUBPARTITION BY HASH(f1)
+SUBPARTITIONS $part_number
+(PARTITION part1 VALUES LESS THAN ($max_row_div2), PARTITION part2 VALUES LESS THAN ($max_int_4));
+--disable_query_log
+eval SET @my_errno= $mysql_errno ;
+let $run= `SELECT @my_errno = 0`;
+--enable_query_log
+#
+# If this operation was successfull, check + drop this table
+if ($run)
+{
+   --source suite/parts/inc/partition_10.inc
+   eval DROP TABLE t1;
+}
diff -Nrup a/mysql-test/suite/parts/inc/partition_12.inc b/mysql-test/suite/parts/inc/partition_12.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/parts/inc/partition_12.inc	2007-11-16 21:38:55 +01:00
@@ -0,0 +1,59 @@
+# inc/partition_12.inc
+#
+# Do some basic things on a table, if the SQL command executed just before
+# sourcing this file was successful.
+#
+
+--source suite/parts/inc/partition_layout.inc
+
+####### Variations with multiple records
+   #      (mass) Insert max_row_div2 + 1 records
+   eval INSERT INTO t1 SELECT * FROM t0_template WHERE f1 BETWEEN $max_row_div2 AND $max_row;
+   #      Select
+   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
+            AS my_value FROM t1;
+   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+   #      (mass) Update $max_row_div4 * 2 + 1 records
+   eval UPDATE t1 SET f1 = f1 + $max_row
+   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 AND $max_row_div2 + $max_row_div4;
+   #      Select
+   eval SELECT (COUNT(*) = $max_row) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row_div2 + $max_row_div4 + $max_row )
+            AS my_value FROM t1;
+   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+   #      (mass) Delete $max_row_div4 * 2 + 1 records
+   eval DELETE FROM t1
+   WHERE f1 BETWEEN $max_row_div2 - $max_row_div4 + $max_row AND $max_row_div2 + $max_row_div4 + $max_row;
+   #      Select
+   eval SELECT (COUNT(*) = $max_row - $max_row_div4 - $max_row_div4 - 1) AND (MIN(f1) = 1) AND (MAX(f1) = $max_row)
+            AS my_value FROM t1;
+   # DEBUG SELECT COUNT(*),MIN(f1),MAX(f1) FROM t1;
+
+####### Variations with single records
+#      Insert one record at beginning
+INSERT INTO t1 SET f1 = 0 , f2 = '#######';
+#      Select this record
+SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = 0 AND f2 = '#######';
+#      Insert one record at end
+eval INSERT INTO t1 SET f1 = $max_row + 1, f2 = '#######';
+#      Select this record
+eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 1 AND f2 = '#######';
+#      Update one record
+eval UPDATE t1 SET f1 = $max_row + 2, f2 = 'ZZZZZZZ'
+     WHERE  f1 = 0 AND f2 = '#######';
+#      Select
+eval SELECT COUNT(*) = 1 AS my_value FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
+# Bug #15968: Partitions: crash when INSERT with f1 = -1 into PARTITION BY HASH(f1)
+eval UPDATE t1 SET f1 = 0 - 1, f2 = 'ZZZZZZZ'
+     WHERE  f1 = $max_row + 1 AND f2 = '#######';
+#      Select
+SELECT COUNT(*) AS my_value FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
+#      Delete
+eval DELETE FROM t1 WHERE f1 = $max_row + 2 AND f2 = 'ZZZZZZZ';
+DELETE FROM t1 WHERE f1 = 0 - 1 AND f2 = 'ZZZZZZZ';
+#      Select
+SELECT COUNT(*) = 0 AS my_value FROM t1 WHERE f2 = 'ZZZZZZZ';
+
+#      Truncate
+TRUNCATE t1;
+#      Select on empty table
+SELECT COUNT(*) = 0 AS my_value FROM t1;
diff -Nrup a/mysql-test/suite/parts/inc/partition_20.inc b/mysql-test/suite/parts/inc/partition_20.inc
--- a/mysql-test/suite/parts/inc/partition_20.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_20.inc	2007-11-16 21:38:55 +01:00
@@ -1,10 +1,11 @@
 ################################################################################
-# include/partition_20.inc                                                     #
+# inc/partition_20.inc                                                         #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_check.inc. #
+#   Auxiliary script, only useful when sourced by                              #
+#   suite/parts/inc/partition_check.inc.                                       #
 #                                                                              #
-# 1. Check if the preceeding statement caused that the expected number of      #
+# 1. Check if the preceding statement caused that the expected number of       #
 #    records was                                                               #
 #    - inserted                                                                #
 #    - updated or deleted+inserted                                             #
@@ -17,19 +18,13 @@
 #    must be set before sourcing this routine.                                 #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
 # Change:                                                                      #
 ################################################################################
 
-# include/partition_20.inc
-#
-# Auxiliary script, only useful when sourced by include/partition_check.inc.
-#
-
-# Check of preceeding statement via Select
 if ($no_debug)
 {
   --disable_query_log
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter1.inc b/mysql-test/suite/parts/inc/partition_alter1.inc
--- a/mysql-test/suite/parts/inc/partition_alter1.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter1.inc	2007-11-16 21:38:55 +01:00
@@ -1,12 +1,12 @@
 ################################################################################
-# include/partition_alter1.inc                                                 #
+# inc/partition_alter1.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   ADD/DROP PRIMARY KEYs and/or UNIQUE INDEXes tests on partitioned tables    #
 #   This routine is only useful for the partition_<feature>_<engine> tests.    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -26,7 +26,7 @@
 --echo #        within the partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: Only f_int1 is used within the partitioning function
-#         ---> include/partition_alter_11.inc
+#         ---> inc/partition_alter_11.inc
 if ($do_pk_tests)
 {
    # The value of the following test is maybe covered by 1.1.3.
@@ -35,12 +35,10 @@ if ($do_pk_tests)
       --echo #  1.1.1 PRIMARY KEY consisting of one column
       let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    # This must fail, because PRIMARY KEY does not contain f_int1
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 # The value of the following test is maybe covered by 1.1.4.
 if ($more_pk_ui_tests)
@@ -48,65 +46,52 @@ if ($more_pk_ui_tests)
    --echo #  1.1.2 UNIQUE INDEX consisting of one column
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 # This must fail, because UNIQUE INDEX does not contain f_int1
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 if ($do_pk_tests)
 {
    --echo #  1.1.3 PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 --echo #  1.1.4 UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 --echo #------------------------------------------------------------------------
 --echo #  1.2   ADD PRIMARY KEY or UNIQUE INDEX to table with two columns
 --echo #        (f_int1 and f_int2) within the partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: f_int1 and f_int2 is used within the partitioning function
-#         ---> include/partition_alter_13.inc
+#         ---> inc/partition_alter_13.inc
 if ($do_pk_tests)
 {
    --echo #  1.2.1 PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 --echo #  1.2.2 UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 if ($do_pk_tests)
 {
    --echo #  1.2.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int1,f_int2), ADD PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $alter= ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f_int2,f_int1), ADD PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= ;
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 #
 #
@@ -122,7 +107,7 @@ if ($do_pk_tests)
 --echo #  2.1   Partitioning function contains one column(f_int1)
 --echo #------------------------------------------------------------------------
 #         Rule: Only f_int1 is used within the partitioning function
-#         ---> include/partition_alter_11.inc
+#         ---> inc/partition_alter_11.inc
 # The value of the following test is maybe covered by 2.1.5.
 if ($more_pk_ui_tests)
 {
@@ -132,14 +117,12 @@ if ($more_pk_ui_tests)
       let $unique= , PRIMARY KEY(f_int1);
       let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    #
    --echo #  2.1.2 DROP UNIQUE INDEX consisting of one column
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
    let $alter= ALTER TABLE t1 DROP INDEX uidx1;
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    #
    if ($do_pk_tests)
    {
@@ -147,20 +130,16 @@ if ($more_pk_ui_tests)
       let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
       let $unique= , PRIMARY KEY(f_int1,f_int2);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       let $unique= , PRIMARY KEY(f_int2,f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    #
    --echo #  2.1.4 DROP UNIQUE INDEX consisting of two columns
    let $alter= ALTER TABLE t1 DROP INDEX uidx1;
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    }
 #
 if ($do_pk_tests)
@@ -169,42 +148,35 @@ if ($do_pk_tests)
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 let $alter= ALTER TABLE t1 DROP INDEX uidx1, DROP INDEX uidx2;
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 --echo #------------------------------------------------------------------------
 --echo #  2.2   Partitioning function contains two columns (f_int1,f_int2)
 --echo #------------------------------------------------------------------------
 #         Rule: f_int1 and f_int2 is used within the partitioning function
-#         ---> include/partition_alter_13.inc
+#         ---> inc/partition_alter_13.inc
 if ($do_pk_tests)
 {
    --echo #  2.2.1 DROP PRIMARY KEY consisting of two columns
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY;
    let $unique= , PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= , PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 #
 --echo #  2.2.2 DROP UNIQUE INDEX consisting of two columns
 let $alter= ALTER TABLE t1 DROP INDEX uidx1;
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 #
 if ($do_pk_tests)
 {
@@ -212,26 +184,23 @@ if ($do_pk_tests)
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
    --source suite/parts/inc/partition_alter_13.inc
-      # --source include/partition_alter_13.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    let $alter= ALTER TABLE t1 DROP PRIMARY KEY, DROP INDEX uidx1;
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 let $alter= ALTER TABLE t1 DROP INDEX uidx1, DROP INDEX uidx2;
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 
 if (0)
 {
 --echo
 --echo #========================================================================
 --echo #  3.    ALTER TABLE "ALTER" PRIMARY KEY
---echo #        ML: I think that an ALTER TABLE statement where a PRIMARY KEY is
---echo #            dropped and recreated (with different layout) might be of
---echo #            interest, if the tree containing the table data has to be
---echo #            reorganized during this operation.
+--echo #        mleich: I think that an ALTER TABLE statement where a PRIMARY
+--echo #            KEY is dropped and recreated (with different layout) might
+--echo #            be of interest, if the tree containing the table data has
+--echo #            to be reorganized during this operation.
 --echo #        To be implemented
 --echo #========================================================================
 --echo
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter2.inc b/mysql-test/suite/parts/inc/partition_alter2.inc
--- a/mysql-test/suite/parts/inc/partition_alter2.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter2.inc	2007-11-16 21:38:55 +01:00
@@ -1,12 +1,12 @@
 ################################################################################
-# include/partition_alter2.inc                                                 #
+# inc/partition_alter2.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests where the columns used within the partitioning function are altered. #
 #   This routine is only useful for the partition_<feature>_<engine> tests.   .#
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -22,12 +22,11 @@
 --echo #  1.1   ALTER column f_int2 not used in partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: Only f_int1 is used within the partitioning function
-#         ---> include/partition_alter_11.inc
+#         ---> inc/partition_alter_11.inc
 let $alter= ALTER TABLE t1 MODIFY f_int2 BIGINT;
 --echo #  1.1.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 if ($do_pk_tests)
 {
@@ -38,14 +37,11 @@ if ($do_pk_tests)
    {
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    let $unique= , PRIMARY KEY (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , PRIMARY KEY (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 #
 --echo #  1.1.3 UNIQUE INDEX exists
@@ -55,14 +51,11 @@ if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 if ($more_pk_ui_tests)
 {
@@ -71,47 +64,35 @@ if ($more_pk_ui_tests)
    --echo #  1.2   ALTER column f_int1 used in partitioning function
    --echo #------------------------------------------------------------------------
    #         Rule: Only f_int1 is used within the partitioning function
-   #         ---> include/partition_alter_11.inc
+   #         ---> inc/partition_alter_11.inc
    let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT;
    --echo #  1.2.1 no PRIMARY KEY or UNIQUE INDEX exists
    let $unique= ;
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    #
    if ($do_pk_tests)
    {
       --echo #  1.2.2 PRIMARY KEY exists
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       let $unique= , PRIMARY KEY (f_int1,f_int2);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       --source suite/parts/inc/partition_alter_13.inc
-      # --source include/partition_alter_13.inc
       let $unique= , PRIMARY KEY (f_int2,f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       --source suite/parts/inc/partition_alter_13.inc
-      # --source include/partition_alter_13.inc
    }
    #
    --echo #  1.2.3 UNIQUE INDEX exists
    let $unique= , UNIQUE INDEX uidx (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 #
 --echo #------------------------------------------------------------------------
@@ -119,14 +100,12 @@ if ($more_pk_ui_tests)
 --echo #        f_int1 or (f_int1 and f_int2) used in partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: f_int1 and f_int2 is used within the partitioning function
-#         ---> include/partition_alter_13.inc
+#         ---> inc/partition_alter_13.inc
 let $alter= ALTER TABLE t1 MODIFY f_int1 BIGINT, MODIFY f_int2 BIGINT;
 --echo #  1.3.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 #
 if ($do_pk_tests)
 {
@@ -137,18 +116,13 @@ if ($do_pk_tests)
    {
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    let $unique= , PRIMARY KEY (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= , PRIMARY KEY (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 #
 --echo #  1.3.3 UNIQUE INDEX exists
@@ -158,18 +132,13 @@ if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 
 --echo
 --echo #========================================================================
@@ -180,12 +149,11 @@ let $unique= , UNIQUE INDEX uidx (f_int2
 --echo #  2.1   ALTER column f_int2 not used in partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: Only f_int1 is used within the partitioning function
-#         ---> include/partition_alter_11.inc
+#         ---> inc/partition_alter_11.inc
 let $alter= ALTER TABLE t1 MODIFY f_int2 MEDIUMINT;
 --echo #  2.1.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 if ($do_pk_tests)
 {
@@ -196,14 +164,11 @@ if ($do_pk_tests)
       --echo #  2.1.2 PRIMARY KEY exists
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
    }
    let $unique= , PRIMARY KEY (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , PRIMARY KEY (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 #
 --echo #  2.1.3 UNIQUE INDEX exists
@@ -213,14 +178,11 @@ if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 #
 if ($more_pk_ui_tests)
 {
@@ -229,61 +191,47 @@ if ($more_pk_ui_tests)
    --echo #  2.2   ALTER column f_int1 used in partitioning function
    --echo #------------------------------------------------------------------------
    #         Rule: Only f_int1 is used within the partitioning function
-   #         ---> include/partition_alter_11.inc
+   #         ---> inc/partition_alter_11.inc
    let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT;
    --echo #  2.2.1 no PRIMARY KEY or UNIQUE INDEX exists
    let $unique= ;
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    #
    if ($do_pk_tests)
    {
       --echo #  2.2.2 PRIMARY KEY exists
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       let $unique= , PRIMARY KEY (f_int1,f_int2);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       --source suite/parts/inc/partition_alter_13.inc
-      # --source include/partition_alter_13.inc
       let $unique= , PRIMARY KEY (f_int2,f_int1);
       --source suite/parts/inc/partition_alter_11.inc
-      # --source include/partition_alter_11.inc
       --source suite/parts/inc/partition_alter_13.inc
-      # --source include/partition_alter_13.inc
    }
    #
    --echo #  2.2.3 UNIQUE INDEX exists
    let $unique= , UNIQUE INDEX uidx (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-         # --source include/partition_alter_13.inc
 }
 #
 --echo #------------------------------------------------------------------------
 --echo #  2.3   ALTER column f_int1 and f_int2 used in partitioning function
 --echo #------------------------------------------------------------------------
 #         Rule: f_int1 and f_int2 is used within the partitioning function
-#         ---> include/partition_alter_13.inc
+#         ---> inc/partition_alter_13.inc
 let $alter= ALTER TABLE t1 MODIFY f_int1 MEDIUMINT, MODIFY f_int2 MEDIUMINT;
 --echo #  2.3.1 no PRIMARY KEY or UNIQUE INDEX exists
 let $unique= ;
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 #
 if ($do_pk_tests)
 {
@@ -295,17 +243,12 @@ if ($do_pk_tests)
       let $unique= , PRIMARY KEY (f_int1);
       --source suite/parts/inc/partition_alter_11.inc
    }
-   # --source include/partition_alter_11.inc
    let $unique= , PRIMARY KEY (f_int1,f_int2);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
    let $unique= , PRIMARY KEY (f_int2,f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
    --source suite/parts/inc/partition_alter_13.inc
-   # --source include/partition_alter_13.inc
 }
 #
 --echo #  2.3.3 UNIQUE INDEX exists
@@ -315,18 +258,13 @@ if ($more_pk_ui_tests)
 {
    let $unique= , UNIQUE INDEX uidx (f_int1);
    --source suite/parts/inc/partition_alter_11.inc
-   # --source include/partition_alter_11.inc
 }
 let $unique= , UNIQUE INDEX uidx (f_int1,f_int2);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 let $unique= , UNIQUE INDEX uidx (f_int2,f_int1);
 --source suite/parts/inc/partition_alter_11.inc
-# --source include/partition_alter_11.inc
 --source suite/parts/inc/partition_alter_13.inc
-# --source include/partition_alter_13.inc
 #
 
 if (0)
@@ -338,8 +276,8 @@ if (0)
 --echo #                   INTEGER --> FLOAT
 --echo #                   INTEGER --> DECIMAL
 --echo #                   INTEGER --> VARCHAR
---echo #        ML: I assume that at least the first two variants are of some
---echo #            interest. But I am unsure if the server allows such
+--echo #        mleich: I assume that at least the first two variants are of
+--echo #            some interest. But I am unsure if the server allows such
 --echo #            conversions. I also think that such operations have a
 --echo #            conversions very small likelihood.
 --echo #            To be implemented.
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter3.inc b/mysql-test/suite/parts/inc/partition_alter3.inc
--- a/mysql-test/suite/parts/inc/partition_alter3.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter3.inc	2007-11-16 21:38:55 +01:00
@@ -1,11 +1,11 @@
 ################################################################################
-# include/partition_alter3.inc                                                 #
+# inc/partition_alter3.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests for partition management commands for HASH and KEY partitioning      #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-04-11                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -32,7 +32,7 @@ SELECT IF(9999 - 1000 + 1 > @max_row, @m
        INTO @exp_row_count;
 # DEBUG SELECT @exp_row_count;
 # 4.   Print the layout, check Readability
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #------------------------------------------------------------------------
@@ -44,16 +44,16 @@ ALTER TABLE t1 ADD PARTITION (PARTITION 
 #
 --echo #  1.1.2 Assign HASH partitioning
 ALTER TABLE t1 PARTITION BY HASH(YEAR(f_date));
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.3 Assign other HASH partitioning to already partitioned table
 --echo #        + test and switch back + test
 ALTER TABLE t1 PARTITION BY HASH(DAYOFYEAR(f_date));
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 ALTER TABLE t1 PARTITION BY HASH(YEAR(f_date));
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.4 Add PARTITIONS not fitting to HASH --> must fail
@@ -64,7 +64,7 @@ ALTER TABLE t1 ADD PARTITION (PARTITION 
 #
 --echo #  1.1.5 Add two named partitions + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.6 Add two named partitions, name clash --> must fail
@@ -73,12 +73,12 @@ ALTER TABLE t1 ADD PARTITION (PARTITION 
 #
 --echo #  1.1.7 Add one named partition + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part2);
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.1.8 Add four not named partitions + test
 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 
 --echo #------------------------------------------------------------------------
@@ -89,7 +89,7 @@ ALTER TABLE t1 ADD PARTITION PARTITIONS 
 ALTER TABLE t1 DROP PARTITION part1;
 #
 --echo #  1.2.2 COALESCE PARTITION partitionname is not supported
---error 1064
+--error ER_PARSE_ERROR
 ALTER TABLE t1 COALESCE PARTITION part1;
 #
 --echo #  1.2.3 Decrease by 0 is non sense --> must fail
@@ -101,7 +101,7 @@ let $loop= 7;
 while ($loop)
 {
    ALTER TABLE t1 COALESCE PARTITION 1;
-   --source include/partition_layout.inc
+   --source suite/parts/inc/partition_layout.inc
    --source suite/parts/inc/partition_check_read1.inc
    dec $loop;
 }
@@ -111,14 +111,13 @@ ALTER TABLE t1 COALESCE PARTITION 1;
 #
 --echo #  1.2.6 Remove partitioning
 ALTER TABLE t1 REMOVE PARTITIONING;
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read1.inc
 #
 --echo #  1.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
-# --source suite/parts/inc/partition_check_drop.inc
 
 --echo
 --echo #========================================================================
@@ -134,7 +133,7 @@ $column_list
 # 2.   Fill the table t1 with some records
 eval $insert_all;
 # 4.   Print the layout, check Readability
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #------------------------------------------------------------------------
@@ -143,7 +142,7 @@ eval $insert_all;
 --echo #------------------------------------------------------------------------
 --echo #  2.1.1 Assign KEY partitioning
 ALTER TABLE t1 PARTITION BY KEY(f_int1);
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.2 Add PARTITIONS not fitting to KEY --> must fail
@@ -154,17 +153,17 @@ ALTER TABLE t1 ADD PARTITION (PARTITION 
 #
 --echo #  2.1.3 Add two named partitions + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part1, PARTITION part7);
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.4 Add one named partition + test
 ALTER TABLE t1 ADD PARTITION (PARTITION part2);
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.1.5 Add four not named partitions + test
 ALTER TABLE t1 ADD PARTITION PARTITIONS 4;
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 
 --echo #------------------------------------------------------------------------
@@ -180,7 +179,7 @@ let $loop= 7;
 while ($loop)
 {
    ALTER TABLE t1 COALESCE PARTITION 1;
-   --source include/partition_layout.inc
+   --source suite/parts/inc/partition_layout.inc
    --source suite/parts/inc/partition_check_read2.inc
    dec $loop;
 }
@@ -190,12 +189,11 @@ ALTER TABLE t1 COALESCE PARTITION 1;
 #
 --echo #  2.2.6 Remove partitioning
 ALTER TABLE t1 REMOVE PARTITIONING;
---source include/partition_layout.inc
+--source suite/parts/inc/partition_layout.inc
 --source suite/parts/inc/partition_check_read2.inc
 #
 --echo #  2.2.7 Remove partitioning from not partitioned table --> ????
 ALTER TABLE t1 REMOVE PARTITIONING;
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
-# --source suite/parts/inc/partition_check_drop.inc
 
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter4.inc b/mysql-test/suite/parts/inc/partition_alter4.inc
--- a/mysql-test/suite/parts/inc/partition_alter4.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter4.inc	2007-11-16 21:38:55 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_alter1.inc                                                 #
+# inc/partition_alter1.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   Execute ALTER ... OPTIMIZE/CHECK/REBUID/ANALYZE statements (maintenance)   #
@@ -22,19 +22,15 @@
 --echo #  1.1 ALTER ... ANALYZE PARTITION part_1;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  1.2 ALTER ... ANALYZE PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_2;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  1.3 ALTER ... ANALYZE PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_2,part_5,part_6,part_10;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  1.4 ALTER ... ANALYZE PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 ANALYZE PARTITION part_1,part_1,part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  2   ALTER ... CHECK PARTITION
@@ -42,19 +38,15 @@ let $alter= ALTER TABLE t1 ANALYZE PARTI
 --echo #  2.1 ALTER ... CHECK PARTITION part_1;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  2.2 ALTER ... CHECK PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_2;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  2.3 ALTER ... CHECK PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_2,part_5,part_6,part_10;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  2.4 ALTER ... CHECK PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 CHECK PARTITION part_1,part_1,part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  3   ALTER ... OPTIMIZE PARTITION
@@ -62,19 +54,15 @@ let $alter= ALTER TABLE t1 CHECK PARTITI
 --echo #  3.1 ALTER ... OPTIMIZE PARTITION part_1;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  3.2 ALTER ... OPTIMIZE PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  3.3 ALTER ... OPTIMIZE PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_2,part_5,part_6,part_10;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  3.4 ALTER ... OPTIMIZE PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 OPTIMIZE PARTITION part_1,part_1,part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  4   ALTER ... REBUILD PARTITION
@@ -82,19 +70,15 @@ let $alter= ALTER TABLE t1 OPTIMIZE PART
 --echo #  4.1 ALTER ... REBUILD PARTITION part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  4.2 ALTER ... REBUILD PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  4.3 ALTER ... REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  4.4 ALTER ... REBUILD PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  5   ALTER ... REPAIR PARTITION
@@ -102,19 +86,15 @@ let $alter= ALTER TABLE t1 REBUILD PARTI
 --echo #  5.1 ALTER ... REBUILD PARTITION part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  5.2 ALTER ... REBUILD PARTITION part_1,part_2;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  5.3 ALTER ... REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_2,part_5,part_6,part_10;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 --echo #  5.4 ALTER ... REBUILD PARTITION part_1,part_1,part_1;
 let $alter= ALTER TABLE t1 REBUILD PARTITION part_1,part_1,part_1;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  6   ALTER ... REMOVE PARTITIONING
@@ -122,5 +102,4 @@ let $alter= ALTER TABLE t1 REBUILD PARTI
 --echo #  6.1 ALTER ... REMOVE PARTITIONING;
 let $alter= ALTER TABLE t1 REMOVE PARTITIONING;
 --source suite/parts/inc/partition_alter_41.inc
-# --source include/partition_alter_41.inc
 
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter_1.inc b/mysql-test/suite/parts/inc/partition_alter_1.inc
--- a/mysql-test/suite/parts/inc/partition_alter_1.inc	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter_1.inc	2007-11-16 21:38:56 +01:00
@@ -1,17 +1,17 @@
 ################################################################################
-# include/partition_alter_1.inc                                                #
+# inc/partition_alter_1.inc                                                    #
 #                                                                              #
 # Purpose:                                                                     #
 #   Alter a partioned table and check the usability afterwards                 #
 #   This script is only usefule when sourced by                                #
-#        include/partition_alter_1[1|3].inc                                    #
+#        inc/partition_alter_1[1|3].inc                                        #
 #                                                                              #
 #    0. Expect there is a table t1                                             #
 #    1. Insert the first half of the table t0_template into t1                 #
 #    2. Execute the ALTER TABLE statement within the variable $alter           #
 #       Case SQL code in                                                       #
 #          0: 1. Insert the second half of the table t0_template into t1       #
-#             2. Execute the usability test include/partition_check.inc        #
+#             2. Execute the usability test inc/partition_check.inc            #
 #          >0, but expected: nothing                                           #
 #          >0 and unexpected: abort                                            #
 #    3. DROP the table t1                                                      #
@@ -20,10 +20,10 @@
 # Example:                                                                     #
 #          CREATE TABLE t1 (f_int1 INT,f_int2 INT, .... );                     #
 #          let $alter= ALTER TABLE t1 ADD PRIMARY KEY(f_int2);                 #
-#          include/partition_alter_1.inc                                       #
+#          inc/partition_alter_1.inc                                           #
 #                                                                              #
 # The parameters $insert_first_half and $insert_second_half                    #
-# are also to be set outside (source ./include/partition.pre).                 #
+# are also to be set outside (source ./inc/partition.pre).                     #
 #                                                                              #
 #------------------------------------------------------------------------------#
 # Original Author: mleich                                                      #
@@ -66,6 +66,5 @@ if ($run_test)
 {
 eval $insert_second_half;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 }
 DROP TABLE t1;
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter_11.inc b/mysql-test/suite/parts/inc/partition_alter_11.inc
--- a/mysql-test/suite/parts/inc/partition_alter_11.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter_11.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_alter_11.inc                                               #
+# inc/partition_alter_11.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
 #   Check ALTER partitioned table and the state of the table afterwards        #
@@ -10,7 +10,7 @@
 #        PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ...              #
 #   do                                                                         #
 #     1. Create the partitioned table                                          #
-#     2. Execute include/partition_alter_1.inc, which will                     #
+#     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             #
@@ -26,14 +26,14 @@
 #   Example:                                                                   #
 #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
 #          let $alter= ALTER TABLE t1 DROP UNIQUE INDEX uidx1;                 #
-#          include/partition_alter1.inc                                        #
+#          inc/partition_alter1.inc                                            #
 #                                                                              #
 # Attention: The routine include/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: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -56,7 +56,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
 if ($with_partitioning)
@@ -69,7 +68,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
 if ($with_partitioning)
@@ -90,7 +88,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
@@ -112,7 +109,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -133,7 +129,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -157,7 +152,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -178,7 +172,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -199,4 +192,3 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter_13.inc b/mysql-test/suite/parts/inc/partition_alter_13.inc
--- a/mysql-test/suite/parts/inc/partition_alter_13.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter_13.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_alter_13.inc                                               #
+# inc/partition_alter_13.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
 #   Check ALTER partitioned table and the state of the table afterwards        #
@@ -10,7 +10,7 @@
 #        PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ...              #
 #   do                                                                         #
 #     1. Create the partitioned table                                          #
-#     2. Execute include/partition_alter_1.inc, which will                     #
+#     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             #
@@ -26,14 +26,14 @@
 #   Example:                                                                   #
 #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
 #          let $alter= ALTER TABLE t1 DROP UNIQUE INDEX uidx1;                 #
-#          include/partition_alter1.inc                                        #
+#          inc/partition_alter1.inc                                            #
 #                                                                              #
 # Attention: The routine include/partition_alter_11.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:                                                                 #
@@ -56,7 +56,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
 if ($with_partitioning)
@@ -69,7 +68,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
 if ($with_partitioning)
@@ -90,7 +88,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
@@ -112,7 +109,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -133,7 +129,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -157,7 +152,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -178,7 +172,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -199,4 +192,3 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
diff -Nrup a/mysql-test/suite/parts/inc/partition_alter_41.inc b/mysql-test/suite/parts/inc/partition_alter_41.inc
--- a/mysql-test/suite/parts/inc/partition_alter_41.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_alter_41.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_alter_11.inc                                               #
+# inc/partition_alter_11.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
 #   Check ALTER partitioned table and the state of the table afterwards        #
@@ -10,11 +10,11 @@
 #        PARTITION BY RANGE/LIST ... SUBPARTITION BY HASH/KEY ...              #
 #   do                                                                         #
 #     1. Create the partitioned table                                          #
-#     2. Execute include/partition_alter_1.inc, which will                     #
+#     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 include/partition_check.inc              #
+#        - Execute the usability test inc/partition_check.inc              #
 #        - Drop the table t1                                                   #
 #   done                                                                       #
 #                                                                              #
@@ -26,14 +26,14 @@
 #   Example:                                                                   #
 #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
 #          let $alter= ALTER TABLE t1 DROP UNIQUE INDEX uidx1;                 #
-#          include/partition_alter1.inc                                        #
+#          inc/partition_alter1.inc                                        #
 #                                                                              #
-# Attention: The routine include/partition_alter_13.inc is very similar        #
+# 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: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -56,7 +56,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY KEY
 if ($with_partitioning)
@@ -69,7 +68,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST
 if ($with_partitioning)
@@ -90,7 +88,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE
 if ($with_partitioning)
@@ -112,7 +109,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -133,7 +129,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -157,7 +152,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 if ($with_partitioning)
@@ -178,7 +172,6 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
 
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 if ($with_partitioning)
@@ -199,4 +192,3 @@ $unique
 )
 $partitioning;
 --source suite/parts/inc/partition_alter_1.inc
-# --source include/partition_alter_1.inc
diff -Nrup a/mysql-test/suite/parts/inc/partition_basic.inc b/mysql-test/suite/parts/inc/partition_basic.inc
--- a/mysql-test/suite/parts/inc/partition_basic.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_basic.inc	2007-11-16 21:38:56 +01:00
@@ -1,12 +1,12 @@
 ################################################################################
-# include/partition_basic.inc                                                  #
+# inc/partition_basic.inc                                                      #
 #                                                                              #
 # Purpose:                                                                     #
 #   Basic tests around create partitioned table with/without PRIMARY KEY and   #
 #   /or UNIQUE INDEX                                                           #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -29,7 +29,6 @@
 --echo #  1.1 The partitioning function contains one column.
 let $unique= ;
 --source suite/parts/inc/partition_methods1.inc
-# --source include/partition_methods1.inc
 #
    --echo # 1.1.1 with DATA DIECTORY/INDEX DIRECTORY
    #
@@ -50,16 +49,13 @@ let $unique= ;
 
    let $with_directories= 1;
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
    --source suite/parts/inc/partition_directory.inc
-   # --source include/partition_methods1.inc
    let $with_directories= 0;
    --enable_query_log
    #
 --echo #  1.2 The partitioning function contains two columns.
 let $unique= ;
 --source suite/parts/inc/partition_methods2.inc
-# --source include/partition_methods2.inc
 #
 --echo #------------------------------------------------------------------------
 --echo #  2   Tables with PRIMARY KEY and/or UNIQUE INDEXes
@@ -72,12 +68,10 @@ if ($more_pk_ui_tests)
       --echo #  2.1 PRIMARY KEY consisting of one column
       let $unique= , PRIMARY KEY(f_int1);
       --source suite/parts/inc/partition_methods1.inc
-      # --source include/partition_methods1.inc
    }
    --echo #  2.2 UNIQUE INDEX consisting of one column
    let $unique= , UNIQUE INDEX uidx1 (f_int1);
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
 
    --echo # 2.2.1 with DATA DIECTORY/INDEX DIRECTORY
    #
@@ -98,7 +92,6 @@ if ($more_pk_ui_tests)
 
    let $with_directories= TRUE;
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
    let $with_directories= FALSE;
    --enable_query_log
    #
@@ -107,19 +100,15 @@ if ($more_pk_ui_tests)
       --echo #  2.3 PRIMARY KEY consisting of two columns
       let $unique= , PRIMARY KEY(f_int1,f_int2);
       --source suite/parts/inc/partition_methods1.inc
-      # --source include/partition_methods1.inc
       let $unique= , PRIMARY KEY(f_int2,f_int1);
       --source suite/parts/inc/partition_methods1.inc
-      # --source include/partition_methods1.inc
    }
    #
    --echo #  2.4 UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
    #
 }
 --echo #  2.5 PRIMARY KEY + UNIQUE INDEX consisting of two columns
@@ -127,14 +116,11 @@ if ($do_pk_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_methods1.inc
-   # --source include/partition_methods1.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 --source suite/parts/inc/partition_methods1.inc
-# --source include/partition_methods1.inc
 
 --echo #------------------------------------------------------------------------
 --echo #  3   Tables with PRIMARY KEY and/or UNIQUE INDEXes
@@ -148,20 +134,16 @@ if ($more_pk_ui_tests)
       --echo #  3.1 PRIMARY KEY consisting of two columns
       let $unique= , PRIMARY KEY(f_int1,f_int2);
       --source suite/parts/inc/partition_methods2.inc
-      # --source include/partition_methods2.inc
 
       let $unique= , PRIMARY KEY(f_int2,f_int1);
       --source suite/parts/inc/partition_methods2.inc
-      # --source include/partition_methods2.inc
    }
    #
    --echo #  3.2 UNIQUE INDEX consisting of two columns
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2);
    --source suite/parts/inc/partition_methods2.inc
-   # --source include/partition_methods2.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1);
    --source suite/parts/inc/partition_methods2.inc
-   # --source include/partition_methods2.inc
 }
 #
 --echo #  3.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns
@@ -169,11 +151,8 @@ if ($do_pk_tests)
 {
    let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), PRIMARY KEY(f_int2,f_int1);
    --source suite/parts/inc/partition_methods2.inc
-   # --source include/partition_methods2.inc
    let $unique= , UNIQUE INDEX uidx1 (f_int2,f_int1), PRIMARY KEY(f_int1,f_int2);
    --source suite/parts/inc/partition_methods2.inc
-   # --source include/partition_methods2.inc
 }
 let $unique= , UNIQUE INDEX uidx1 (f_int1,f_int2), UNIQUE INDEX uidx2 (f_int2,f_int1);
 --source suite/parts/inc/partition_methods2.inc
-# --source include/partition_methods2.inc
diff -Nrup a/mysql-test/suite/parts/inc/partition_binary.inc b/mysql-test/suite/parts/inc/partition_binary.inc
--- a/mysql-test/suite/parts/inc/partition_binary.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_binary.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and binary data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
@@ -43,6 +45,9 @@ select count(*) from t2;
 select hex(a) from t2;
 drop table t2;
 
+# mleich: Several partitioning functions are no more allowed.
+if (0)
+{
 eval create table t3 (a binary(255) not null, primary key(a)) engine=$engine 
 partition by range (ascii(a)) subpartition by key (a) subpartitions 4 (
 partition pa16 values less than (16),
@@ -66,6 +71,7 @@ select count(*) from t3;
 select hex(a) from t3;
 drop table t3;
 
+
 eval create table t4 (a binary(255) not null, primary key(a)) engine=$engine 
 partition by list (ascii(a)) subpartition by key (a) subpartitions 4 (
 partition pa16 values in (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16),
@@ -86,6 +92,9 @@ eval insert into t4 values (repeat(char(
 dec $count;
 inc $letter;
 }
+
 select count(*) from t4;
 select hex(a) from t4;
 drop table t4;
+}
+# End of tests with disallowed partitioning functions.
diff -Nrup a/mysql-test/suite/parts/inc/partition_bit.inc b/mysql-test/suite/parts/inc/partition_bit.inc
--- a/mysql-test/suite/parts/inc/partition_bit.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_bit.inc	2007-11-16 21:38:56 +01:00
@@ -14,7 +14,7 @@ let $index_directory = `select @indx_dir
 drop table if exists t1;
 --enable_warnings
 
---error 1439
+--error ER_TOO_BIG_DISPLAYWIDTH
 eval create table t1 (a bit(65), primary key (a)) engine=$engine partition by key (a);
 
 eval create table t1 (a bit(0), primary key (a)) engine=$engine partition by key (a);
diff -Nrup a/mysql-test/suite/parts/inc/partition_blob.inc b/mysql-test/suite/parts/inc/partition_blob.inc
--- a/mysql-test/suite/parts/inc/partition_blob.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_blob.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and blob data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
diff -Nrup a/mysql-test/suite/parts/inc/partition_char.inc b/mysql-test/suite/parts/inc/partition_char.inc
--- a/mysql-test/suite/parts/inc/partition_char.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_char.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and char data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
@@ -42,6 +44,7 @@ select count(*) from t2;
 select * from t2;
 drop table t2;
 
+# mleich: Several partitioning functions are no more allowed.
 if (0)
 {
 eval create table t3 (a char(255) not null, primary key(a)) engine=$engine 
@@ -91,5 +94,4 @@ select count(*) from t4;
 select a from t4;
 drop table t4;
 }
-#if (0)
-
+# End of tests with disallowed partitioning functions.
diff -Nrup a/mysql-test/suite/parts/inc/partition_check.inc b/mysql-test/suite/parts/inc/partition_check.inc
--- a/mysql-test/suite/parts/inc/partition_check.inc	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_check.inc                                                  #
+# inc/partition_check.inc                                                      #
 #                                                                              #
 # Purpose:                                                                     #
 #   Do some basic usability checks on table t1.                                #
@@ -27,7 +27,7 @@
 #              Records can be deleted or inserted, but the content of the      #
 #              records after a test/testsequence should follow this scheme.    #
 #                                                                              #
-#   All checks of preceeding statements via Select are so written,             #
+#   All checks of preceding statements via Select are so written,              #
 #   that they deliver a                                                        #
 #       # check <n> success:        1                                          #
 #   when everything is like expected.                                          #
@@ -47,10 +47,9 @@
 ################################################################################
 
 
---echo # Start usability test (include/partition_check.inc)
+--echo # Start usability test (inc/partition_check.inc)
 # Print the CREATE TABLE STATEMENT and store the current layout of the table
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 
 
 #-------------------------------------------------------------------------------
@@ -289,14 +288,11 @@ if ($any_unique)
 #       per f_int1 used in partitioning function
 let $col_to_check= f_int1;
 --source suite/parts/inc/partition_check_read.inc
-# --source include/partition_check_read.inc
 ## 2.2  Read all existing and some not existing records of table
 #       per f_int2 used in partitioning function
 let $col_to_check= f_int2;
 --source suite/parts/inc/partition_check_read.inc
 
-if ($fixed_bug18735)
-{
 
 #-------------------------------------------------------------------------------
 # 3    Some operations with multiple records
@@ -321,7 +317,7 @@ SELECT '# check multiple-2 success: ' AS
 #             (Insert the records deleted in 3.2)
 INSERT INTO t1 SELECT * FROM t0_template
 WHERE MOD(f_int1,3) = 0;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -337,7 +333,7 @@ FROM t1;
 UPDATE t1 SET f_int1 = f_int1 + @max_row
 WHERE f_int1 BETWEEN @max_row_div2 - @max_row_div4
   AND @max_row_div2 + @max_row_div4;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -352,7 +348,7 @@ SELECT '# check multiple-4 success: ' AS
 DELETE FROM t1
 WHERE f_int1 BETWEEN @max_row_div2 - @max_row_div4 + @max_row
   AND @max_row_div2 + @max_row_div4 + @max_row;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -405,7 +401,7 @@ INSERT INTO t1
 SET f_int1 = @cur_value , f_int2 = @cur_value,
     f_char1 = CAST(@cur_value AS CHAR), f_char2 = CAST(@cur_value AS CHAR),
     f_charbig = '#SINGLE#';
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -423,7 +419,7 @@ INSERT INTO t1
 SET f_int1 = @cur_value , f_int2 = @cur_value,
     f_char1 = CAST(@cur_value AS CHAR), f_char2 = CAST(@cur_value AS CHAR),
     f_charbig = '#SINGLE#';
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -443,7 +439,7 @@ SELECT MAX(f_int1) + 1 INTO @cur_value2 
 # Bug#18735: Partitions: NDB, UNIQUE INDEX, UPDATE, strange server response
 UPDATE t1 SET f_int1 = @cur_value2
 WHERE  f_int1 = @cur_value1 AND f_charbig = '#SINGLE#';
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -464,7 +460,7 @@ SELECT MAX(f_int1) INTO @cur_value2 FROM
 # Bug#18735: Partitions: NDB, UNIQUE INDEX, UPDATE, strange server response
 UPDATE t1 SET f_int1 = @cur_value1
 WHERE  f_int1 = @cur_value2 AND f_charbig = '#SINGLE#';
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -476,7 +472,7 @@ WHERE f_int1 = @cur_value1 AND f_charbig
 # 4.5  Delete the record with the highest value of f_int1.
 SELECT MAX(f_int1) INTO @cur_value FROM t1;
 DELETE FROM t1 WHERE f_int1 = @cur_value AND f_charbig = '#SINGLE#';
-#      Check of preceeding statements via Select
+#      Check of preceding statements via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -487,7 +483,7 @@ WHERE f_charbig = '#SINGLE#' AND f_int1 
 #
 # 4.6  Delete the record with f_int1 = -1
 DELETE FROM t1 WHERE f_int1 = -1 AND f_charbig = '#SINGLE#';
-#      Check of preceeding statements via Select
+#      Check of preceding statements via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -520,7 +516,7 @@ if ($unexpected_error)
    exit;
    --echo
 }
-#      Check of preceeding statement via Select, if the INSERT was successful
+#      Check of preceding statement via Select, if the INSERT was successful
 let $run= `SELECT @my_errno = 0`;
 if ($run)
 {
@@ -538,8 +534,6 @@ eval DELETE FROM t1 WHERE f_charbig = '#
 }
 --enable_query_log
 
-}
-# End workaround for Bug#18735
 
 #-------------------------------------------------------------------------------
 # 5    Experiments with NULL
@@ -569,7 +563,7 @@ INSERT INTO t1
    SET f_int1 = NULL , f_int2 = -@max_row,
        f_char1 = CAST(-@max_row AS CHAR), f_char2 = CAST(-@max_row AS CHAR),
        f_charbig = '#NULL#';
-#      Some other NULL experiments if preceeding INSERT was successfull
+#      Some other NULL experiments if preceding INSERT was successfull
 --enable_abort_on_error
 if ($no_debug)
 {
@@ -593,7 +587,7 @@ if ($unexpected_error)
 # The following checks do not make sense if f_int1 cannot be NULL
 if ($run)
 {
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -612,7 +606,7 @@ if ($no_debug)
 {
 --disable_query_log
 }
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 SELECT '# check null-2 success: ' AS "",COUNT(*) = 1 AS "" FROM t1
 WHERE f_int1 = -@max_row AND f_charbig = '#NULL#';
 --enable_query_log
@@ -624,7 +618,7 @@ if ($no_debug)
 {
 --disable_query_log
 }
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 SELECT '# check null-3 success: ' AS "",COUNT(*) = 1 AS "" FROM t1
 WHERE f_int1 IS NULL AND f_charbig = '#NULL#';
 --enable_query_log
@@ -632,7 +626,7 @@ WHERE f_int1 IS NULL AND f_charbig = '#N
 DELETE FROM t1
 WHERE f_int1 IS NULL AND f_int2 = -@max_row AND f_char1 = CAST(-@max_row AS CHAR)
   AND f_char2 = CAST(-@max_row AS CHAR) AND f_charbig = '#NULL#';
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -697,7 +691,6 @@ if ($any_unique)
       UPDATE f_int1 = 2 * @max_row + source_tab.f_int1,
              f_charbig = 'was updated';
       --source suite/parts/inc/partition_20.inc
-      # --source include/partition_20.inc
    }
 
    if ($f_int2_is_unique)
@@ -713,7 +706,6 @@ if ($any_unique)
       UPDATE f_int2 = 2 * @max_row + source_tab.f_int1,
              f_charbig = 'was updated';
       --source suite/parts/inc/partition_20.inc
-      # --source include/partition_20.inc
    }
 
    ## 6.3 f_int1, f_int2 is UNIQUE, UPDATE f_int1, f_int2 when DUPLICATE KEY
@@ -727,7 +719,6 @@ if ($any_unique)
           f_int2 = 2 * @max_row + source_tab.f_int1,
           f_charbig = 'was updated';
    --source suite/parts/inc/partition_20.inc
-      # --source include/partition_20.inc
 
    ## 6.4 REPLACE
    # Bug#16782: Partitions: crash, REPLACE .. on table with PK, DUPLICATE KEY
@@ -736,7 +727,7 @@ if ($any_unique)
    FROM t0_template source_tab
    WHERE MOD(f_int1,3) = 0 AND f_int1 BETWEEN @max_row_div2 AND @max_row;
    # DEBUG SELECT * FROM t1 ORDER BY f_int1, f_int2;
-   # Check of preceeding statement via Select
+   # Check of preceding statement via Select
    if ($no_debug)
    {
       --disable_query_log
@@ -763,10 +754,6 @@ if ($any_unique)
    # DEBUG SELECT * FROM t1 ORDER BY f_int1, f_int2;
 }
 
-if ($fixed_bug18735)
-{
-   # The following tests work cannot like intended, if we had to omit
-   # tests because of Bug#18735
 
 #-------------------------------------------------------------------------------
 # 7    Transactions
@@ -943,14 +930,12 @@ if ($debug)
    SELECT * FROM t1 ORDER BY f_int1;
 }
 
-}
-# End workaround for Bug#18735
 
 #-------------------------------------------------------------------------------
 # 8    Some special cases
 # 8.1  Dramatic increase of the record/partition/subpartition/table sizes
 UPDATE t1 SET f_charbig = REPEAT('b', 1000);
-#      partial check of preceeding statement via Select
+#      partial check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -961,7 +946,7 @@ WHERE f_int1 = 1 AND f_charbig = REPEAT(
 #
 # 8.2  Dramatic decrease of the record/partition/subpartition/table sizes
 UPDATE t1 SET f_charbig = '';
-#      partial check of preceeding statement via Select
+#      partial check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -977,8 +962,7 @@ if ($debug)
    SELECT * FROM t1 ORDER BY f_int1;
 }
 
-if ($fixed_bug18735)
-{
+
 #-------------------------------------------------------------------------------
 # 9    TRIGGERs
 let $num= 1;
@@ -998,28 +982,22 @@ SELECT f_int1,f_int2,f_char1,f_char2,NUL
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
 let $event= BEFORE INSERT;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER INSERT;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 
 let $statement= UPDATE t0_aux SET f_int1 =  - f_int1, f_int2 = - f_int2
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE UPDATE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER UPDATE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 
 let $statement= DELETE FROM t0_aux
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE DELETE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER DELETE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 
 # Cleanup
 eval DELETE FROM $tab_in_trigg
@@ -1052,28 +1030,22 @@ SELECT f_int1,f_int2,f_char1,f_char2,NUL
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
 let $event= BEFORE INSERT;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER INSERT;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 
 let $statement= UPDATE t1 SET f_int1 =  - f_int1, f_int2 = - f_int2
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE UPDATE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER UPDATE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 
 let $statement= DELETE FROM t1
 WHERE f_int1 IN (- (@max_row_div2 - 1),- @max_row_div2,- (@max_row_div2 + 1));
 let $event= BEFORE DELETE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 let $event= AFTER DELETE;
 --source suite/parts/inc/partition_trigg1.inc
-# --source include/partition_trigg1.inc
 eval DELETE FROM $tab_in_trigg
 WHERE f_int1 BETWEEN @max_row_div2 - 1 AND @max_row_div2 + 1;
 }
@@ -1095,7 +1067,6 @@ SET f_charbig = '####updated per update 
 let $source= old;
 let $event= BEFORE UPDATE;
 --source suite/parts/inc/partition_trigg2.inc
-# --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 # Currently (2006-02-23) a AFTER TRIGGER is not allowed to modify a row, which
 # was just modified: 1362: Updating of NEW row is not allowed in after trigger
@@ -1111,7 +1082,6 @@ f_charbig = '####updated per update stat
 let $source= old;
 let $event= BEFORE UPDATE;
 --source suite/parts/inc/partition_trigg2.inc
-# --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 # Currently (2006-02-23) a AFTER TRIGGER is not allowed to modify a row, which
 # was just modified: 1362: Updating of NEW row is not allowed in after trigger
@@ -1119,7 +1089,6 @@ let $event= BEFORE UPDATE;
 let $source= new;
 let $event= BEFORE UPDATE;
 --source suite/parts/inc/partition_trigg2.inc
-# --source include/partition_trigg2.inc
 # FIXME when AFTER TRIGGER can be used
 
 if ($debug)
@@ -1138,7 +1107,6 @@ ORDER BY f_int1;
 let $event= BEFORE INSERT;
 let $source= new;
 --source suite/parts/inc/partition_trigg3.inc
-# --source include/partition_trigg3.inc
 # FIXME when AFTER TRIGGER can be used
 
 # 9.4.2  INSERT assigns no values to the recalculate columns
@@ -1150,7 +1118,6 @@ ORDER BY f_int1;
 let $event= BEFORE INSERT;
 let $source= new;
 --source suite/parts/inc/partition_trigg3.inc
-# --source include/partition_trigg3.inc
 # FIXME when AFTER TRIGGER can be used
 
 if ($debug)
@@ -1158,8 +1125,6 @@ if ($debug)
    SELECT * FROM t1 ORDER BY f_int1;
 }
 
-}
-# End workaround for Bug#18735
 
 #-------------------------------------------------------------------------------
 # 10   ANALYZE/CHECK/CHECKSUM
@@ -1181,17 +1146,15 @@ CHECKSUM TABLE t1 EXTENDED;
 #      FIXME What will happen with NDB ?
 OPTIMIZE TABLE t1;
 --source suite/parts/inc/partition_layout_check2.inc
-# --source include/partition_layout_check2.inc
 # 10.2 REPAIR TABLE
 REPAIR   TABLE t1 EXTENDED;
 --source suite/parts/inc/partition_layout_check2.inc
-# --source include/partition_layout_check2.inc
 #
 # 11.3 Truncate
 # Manual about TRUNCATE on tables ( != InnoDB table with FOREIGN KEY ):
 # Truncate operations drop and re-create the table ....
 TRUNCATE t1;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
 --disable_query_log
@@ -1199,6 +1162,5 @@ if ($no_debug)
 SELECT '# check TRUNCATE success: ' AS "",COUNT(*) = 0 AS "" FROM t1;
 --enable_query_log
 --source suite/parts/inc/partition_layout_check2.inc
-# --source include/partition_layout_check2.inc
---echo # End usability test (include/partition_check.inc)
+--echo # End usability test (inc/partition_check.inc)
 
diff -Nrup a/mysql-test/suite/parts/inc/partition_check_drop.inc b/mysql-test/suite/parts/inc/partition_check_drop.inc
--- a/mysql-test/suite/parts/inc/partition_check_drop.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check_drop.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_check_drop.inc                                             #
+# inc/partition_check_drop.inc                                                 #
 #                                                                              #
 # Purpose:                                                                     #
 #   Check that a drop table removes all files belonging to this table.         #
@@ -9,7 +9,7 @@
 #   This routine is only useful for the partition_<feature>_<engine> tests.    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-05-12                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -52,7 +52,7 @@ if ($found_garbage)
    if ($ls)
    {
       --echo # Attention: There are unused files.
-      --echo #            Either the DROP TABLE or a preceeding ALTER TABLE
+      --echo #            Either the DROP TABLE or a preceding ALTER TABLE
       --echo #            <alter partitioning> worked incomplete.
       --echo # We found:
       # Print the list of files into the protocol
diff -Nrup a/mysql-test/suite/parts/inc/partition_check_read.inc b/mysql-test/suite/parts/inc/partition_check_read.inc
--- a/mysql-test/suite/parts/inc/partition_check_read.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check_read.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_check_read.inc                                             #
+# inc/partition_check_read.inc                                                 #
 #                                                                              #
 # Purpose:                                                                     #
 #   Read table t1 row by row                                                   #
@@ -10,7 +10,7 @@
 #       - the table contains all expected rows                                 #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -80,7 +80,7 @@ if ($no_debug)
 --disable_query_log
 }
 --echo # check read via $col_to_check success: $success
-# ML: The following is omitted because of not reported mysqltest bug
+# mleich: The following is omitted because of not reported mysqltest bug
 #     (@max_row time the success message)
 if (0)
 {
diff -Nrup a/mysql-test/suite/parts/inc/partition_check_read1.inc b/mysql-test/suite/parts/inc/partition_check_read1.inc
--- a/mysql-test/suite/parts/inc/partition_check_read1.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check_read1.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_check_read1.inc                                             #
+# inc/partition_check_read1.inc                                                #
 #                                                                              #
 # Purpose:                                                                     #
 #   Read rows from table t1 in different ways                                  #
@@ -10,7 +10,7 @@
 # must be set before sourcing this routine.                                    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-04-11                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_check_read2.inc b/mysql-test/suite/parts/inc/partition_check_read2.inc
--- a/mysql-test/suite/parts/inc/partition_check_read2.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_check_read2.inc	2007-11-16 21:38:56 +01:00
@@ -1,12 +1,12 @@
 ################################################################################
-# include/partition_check_read2.inc                                            #
+# inc/partition_check_read2.inc                                                #
 #                                                                              #
 # Purpose:                                                                     #
 #   Read rows from table t1 in different ways                                  #
 #   This routine is only useful for the partition_<feature>_<engine> tests.    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-04-11                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_cleanup.inc b/mysql-test/suite/parts/inc/partition_cleanup.inc
--- a/mysql-test/suite/parts/inc/partition_cleanup.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_cleanup.inc	2007-11-16 21:38:56 +01:00
@@ -1,12 +1,12 @@
 ################################################################################
-# include/partition_cleanup.inc                                                #
+# inc/partition_cleanup.inc                                                    #
 #                                                                              #
 # Purpose:                                                                     #
 #   Removal of the objects created by the t/partition_<feature>_<engine>.test  #
 #   scripts.                                                                   #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_directory.inc b/mysql-test/suite/parts/inc/partition_directory.inc
--- a/mysql-test/suite/parts/inc/partition_directory.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_directory.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_rectory.inc                                                #
+# inc/partition_directory.inc                                                  #
 #                                                                              #
 # Purpose:                                                                     #
 #   Create and check partitioned tables                                        #
@@ -9,7 +9,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                                                                       #
 #------------------------------------------------------------------------------#
@@ -49,7 +49,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -86,7 +85,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -122,7 +120,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -153,7 +150,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -181,7 +177,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -212,7 +207,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -256,7 +250,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
diff -Nrup a/mysql-test/suite/parts/inc/partition_engine.inc b/mysql-test/suite/parts/inc/partition_engine.inc
--- a/mysql-test/suite/parts/inc/partition_engine.inc	2007-04-30 16:24:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_engine.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_engine.inc                                                 #
+# inc/partition_engine.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests around Create/Alter partitioned tables and storage engine settings   #
@@ -17,7 +17,7 @@
 #    storage engine to use.                                                    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -45,7 +45,6 @@ $column_list
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 #
 --echo #------------------------------------------------------------------------
@@ -62,7 +61,6 @@ PARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -79,7 +77,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 #
 --echo #------------------------------------------------------------------------
@@ -96,7 +93,6 @@ PARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -108,7 +104,6 @@ PARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -125,7 +120,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -142,7 +136,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 #
 --echo #------------------------------------------------------------------------
@@ -164,7 +157,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -181,7 +173,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 #
 --echo #------------------------------------------------------------------------
@@ -199,7 +190,6 @@ PARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -216,7 +206,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --echo # 6.2 Storage engine assignment after partition name + after
 --echo #     subpartition name
@@ -236,7 +225,6 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 --echo #------------------------------------------------------------------------
@@ -252,7 +240,6 @@ PARTITION BY HASH(f_int1) ( PARTITION pa
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 # Bug#15966 Partitions: crash if session default engine <> engine used in create table
 eval CREATE TABLE t1 (
@@ -266,6 +253,5 @@ SUBPARTITION BY HASH(f_int1)
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 eval SET SESSION storage_engine=$engine;
diff -Nrup a/mysql-test/suite/parts/inc/partition_enum.inc b/mysql-test/suite/parts/inc/partition_enum.inc
--- a/mysql-test/suite/parts/inc/partition_enum.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_enum.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and enum data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
@@ -47,6 +49,9 @@ select count(*) from t2;
 select * from t2;
 drop table t2;
 
+# mleich: Several partitioning functions are no more allowed.
+if (0)
+{
 eval create table t3 (a enum (
 '1','2','3','4','5','6','7','8','9','0',
 'A','B','C','D','E','F','G','H','I','J','K','L',
@@ -71,4 +76,5 @@ dec $letter;
 select count(*) from t3;
 select * from t3;
 drop table t3;
-
+}
+# End of tests with disallowed partitioning functions.
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout.inc b/mysql-test/suite/parts/inc/partition_layout.inc
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/parts/inc/partition_layout.inc	2007-11-16 21:38:56 +01:00
@@ -0,0 +1,14 @@
+# inc/partition_layout.inc
+#
+# Print partitioning related informations about the table t1
+#
+
+eval SHOW CREATE TABLE t1;
+
+# Optional (most probably issues with separators and case sensitivity)
+# listing of files belonging to the table t1
+if ($ls)
+{
+   --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+   --exec ls $MYSQLTEST_VARDIR/master-data/test/t1*
+}
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout_check1.inc b/mysql-test/suite/parts/inc/partition_layout_check1.inc
--- a/mysql-test/suite/parts/inc/partition_layout_check1.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc	2007-11-16 21:38:56 +01:00
@@ -1,17 +1,17 @@
 ################################################################################
-# include/partition_layout_check1.inc                                          #
+# inc/partition_layout_check1.inc                                          #
 #                                                                              #
 # Purpose:                                                                     #
 #   Store the SHOW CREATE TABLE output and the list of files belonging to      #
 #   this table + print this into the protocol                                  #
 #   This script is only usefule when sourced within the partitioning tests.    #
 #                                                                              #
-# Attention: The routine include/partition_layout_check2.inc is very similar   #
+# Attention: The routine inc/partition_layout_check2.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:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_layout_check2.inc b/mysql-test/suite/parts/inc/partition_layout_check2.inc
--- a/mysql-test/suite/parts/inc/partition_layout_check2.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc	2007-11-16 21:38:56 +01:00
@@ -1,18 +1,18 @@
 ################################################################################
-# include/partition_layout_check2.inc                                          #
+# inc/partition_layout_check2.inc                                              #
 #                                                                              #
 # Purpose:                                                                     #
 #   Store the SHOW CREATE TABLE output and the list of files belonging to      #
 #   this table + Check if the layout of the table was not modified             #
-#   since the call of include/partition_layout_check1.inc                      #
+#   since the call of inc/partition_layout_check1.inc                          #
 #   This script is only usefule when sourced within the partitioning tests.    #
 #                                                                              #
-# Attention: The routine include/partition_layout_check1.inc is very similar   #
+# Attention: The routine inc/partition_layout_check1.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:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_methods1.inc b/mysql-test/suite/parts/inc/partition_methods1.inc
--- a/mysql-test/suite/parts/inc/partition_methods1.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_methods1.inc	2007-11-16 21:38:56 +01:00
@@ -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: HH                                                            #
 # Change Date:   2006-05-12                                                    #
@@ -66,7 +66,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -107,7 +106,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -143,7 +141,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -180,7 +177,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -212,7 +208,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -247,7 +242,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -299,7 +293,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 
@@ -329,7 +322,6 @@ $partitioning;
 --enable_query_log
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 --source suite/parts/inc/partition_check_drop.inc
 let $with_directories= FALSE;
diff -Nrup a/mysql-test/suite/parts/inc/partition_methods2.inc b/mysql-test/suite/parts/inc/partition_methods2.inc
--- a/mysql-test/suite/parts/inc/partition_methods2.inc	2007-04-30 16:24:07 +02:00
+++ b/mysql-test/suite/parts/inc/partition_methods2.inc	2007-11-16 21:38:56 +01:00
@@ -1,5 +1,5 @@
 ################################################################################
-# include/partition_methods2.inc                                               #
+# inc/partition_methods2.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
 #   Create and check partitioned tables                                        #
@@ -10,7 +10,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                                                                       #
 #                                                                              #
@@ -20,14 +20,14 @@
 #   has to be set before sourcing this routine.                                #
 #   Example:                                                                   #
 #          let $unique= , UNIQUE INDEX uidx1 (f_int1);                         #
-#          include/partition_methods2.inc                                      #
+#          inc/partition_methods2.inc                                          #
 #                                                                              #
-# Attention: The routine include/partition_methods1.inc is very similar        #
+# Attention: The routine inc/partition_methods1.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:                                                                 #
@@ -51,7 +51,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY KEY
@@ -66,7 +65,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY LIST
@@ -89,7 +87,6 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
 
 #----------- PARTITION BY RANGE
@@ -113,7 +110,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
@@ -136,7 +132,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
@@ -162,7 +157,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
@@ -185,7 +179,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
@@ -208,5 +201,4 @@ $unique
 $partitioning;
 eval $insert_all;
 --source suite/parts/inc/partition_check.inc
-# --source include/partition_check.inc
 DROP TABLE t1;
diff -Nrup a/mysql-test/suite/parts/inc/partition_set.inc b/mysql-test/suite/parts/inc/partition_set.inc
--- a/mysql-test/suite/parts/inc/partition_set.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_set.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and set data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
diff -Nrup a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc
--- a/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc	2007-11-16 21:38:56 +01:00
@@ -234,7 +234,6 @@ subpartition by hash($sqlfunc) subpartit
 	let $t5=t5;
 	let $t6=t6;
 	--source suite/parts/inc/part_supported_sql_funcs_delete.inc
-	# --source include/part_supported_sql_funcs_delete.inc
 
 	let $t1=t11;
 	let $t2=t22;
@@ -243,7 +242,6 @@ subpartition by hash($sqlfunc) subpartit
 	let $t5=t55;
 	let $t6=t66;
 	--source suite/parts/inc/part_supported_sql_funcs_delete.inc
-	# --source include/part_supported_sql_funcs_delete.inc
         --echo -------------------------
         --echo ---- some alter table end
         --echo -------------------------
diff -Nrup a/mysql-test/suite/parts/inc/partition_syntax.inc b/mysql-test/suite/parts/inc/partition_syntax.inc
--- a/mysql-test/suite/parts/inc/partition_syntax.inc	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_syntax.inc	2007-11-16 21:38:56 +01:00
@@ -1,11 +1,11 @@
 ################################################################################
-# include/partition_syntax.inc                                                 #
+# inc/partition_syntax.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests around Create partitioned tables syntax                              #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -107,17 +107,13 @@ let $unique_index= UNIQUE INDEX (f_int2)
 #----------- PARTITION BY HASH
 let $partition_scheme= PARTITION BY HASH(f_int1) PARTITIONS 2;
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY HASH(f_int1 + f_int2) PARTITIONS 2;
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY KEY
 let $partition_scheme= PARTITION BY KEY(f_int1) PARTITIONS 2;
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY KEY(f_int1,f_int2) PARTITIONS 2;
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST
 let $partition_scheme= PARTITION BY LIST(MOD(f_int1,3))
    (PARTITION partN VALUES IN (NULL),
@@ -125,25 +121,21 @@ let $partition_scheme= PARTITION BY LIST
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY LIST(MOD(f_int1 + f_int2,3))
    (PARTITION partN VALUES IN (NULL),
     PARTITION part0 VALUES IN (0),
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY RANGE
 let $partition_scheme= PARTITION BY RANGE(f_int1)
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 let $partition_scheme= PARTITION BY RANGE(f_int1 + f_int2)
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 
 #
 --echo #------------------------------------------------------------------------
@@ -200,14 +192,12 @@ SUBPARTITION BY HASH(f_int1) SUBPARTITIO
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY RANGE -- SUBPARTITION BY KEY
 let $partition_scheme= PARTITION BY RANGE(f_int2)
 SUBPARTITION BY KEY(f_int1) SUBPARTITIONS 3
    (PARTITION part1 VALUES LESS THAN (1),
     PARTITION part2 VALUES LESS THAN (2147483646));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST -- SUBPARTITION BY HASH
 let $partition_scheme= PARTITION BY LIST(MOD(f_int2,3))
 SUBPARTITION BY HASH(f_int1) SUBPARTITIONS 2
@@ -216,7 +206,6 @@ SUBPARTITION BY HASH(f_int1) SUBPARTITIO
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 #----------- PARTITION BY LIST -- SUBPARTITION BY KEY
 let $partition_scheme= PARTITION BY LIST(MOD(f_int2,3))
 SUBPARTITION BY KEY(f_int1) SUBPARTITIONS 2
@@ -225,7 +214,6 @@ SUBPARTITION BY KEY(f_int1) SUBPARTITION
     PARTITION part1 VALUES IN (1),
     PARTITION part2 VALUES IN (2));
 --source suite/parts/inc/partition_syntax_2.inc
-# --source include/partition_syntax_2.inc
 
 --echo
 --echo #========================================================================
@@ -359,7 +347,6 @@ PARTITION BY LIST(MOD(f_int1,2))
 ( PARTITION part1 VALUES IN (NULL),
   PARTITION part3 VALUES IN (1));
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo #  3.5.3 Reveal that IN (...NULL) is not mapped to IN(0)
 # Bug#15447: Partitions: NULL is treated as zero
@@ -372,7 +359,6 @@ PARTITION BY LIST(MOD(f_int1,2))
   PARTITION part2 VALUES IN (0),
   PARTITION part3 VALUES IN (1));
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 
 # FIXME Implement some non integer constant tests
@@ -395,7 +381,6 @@ $column_list
 )
 PARTITION BY HASH(f_int1);
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo # 4.1.2 no partition number, named partitions
 eval CREATE TABLE t1 (
@@ -403,7 +388,6 @@ $column_list
 )
 PARTITION BY HASH(f_int1) (PARTITION part1, PARTITION part2);
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 # Attention: Several combinations are impossible
 #           If subpartitioning exists
@@ -470,7 +454,6 @@ eval $part01 $column_list $part02 $part1
 eval $part01 $column_list $part02 $part1_Y $part2_Y $part3_N ;
 eval $part01 $column_list $part02 $part1_Y $part2_Y $part3_Y ;
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 
 --echo #------------------------------------------------------------------------
@@ -480,163 +463,119 @@ DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 --echo # 4.2.1 partition/subpartition numbers INTEGER notation
-# ML: "positive/negative" is my private judgement. It need no to correspond
-#     with the server response.
+# mleich: "positive/negative" is my private judgement. It need not to
+#     correspond with the server response.
 # (positive) number = 2
 let $part_number= 2;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (positive) special case number = 1
 let $part_number= 1;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) 0 is non sense
 let $part_number= 0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) -1 is non sense
 let $part_number= -1;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) 1000000 is too huge
 let $part_number= 1000000;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 
 --echo # 4.2.2 partition/subpartition numbers DECIMAL notation
 # (positive) number = 2.0
 let $part_number= 2.0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) -2.0 is non sense
 let $part_number= -2.0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) case number = 0.0 is non sense
 let $part_number= 0.0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-if ($fixed_bug15890)
-{
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) number = 1.6 is non sense
 let $part_number= 1.6;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-}
 # (negative) number is too huge
 let $part_number= 999999999999999999999999999999.999999999999999999999999999999;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) number is nearly zero
 let $part_number= 0.000000000000000000000000000001;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 
 --echo # 4.2.3 partition/subpartition numbers FLOAT notation
 ##### FLOAT notation
 # (positive) number = 2.0E+0
 let $part_number= 2.0E+0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-if ($fixed_bug15890)
-{
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (positive) number = 0.2E+1
 let $part_number= 0.2E+1;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-}
 # (negative) -2.0E+0 is non sense
 let $part_number= -2.0E+0;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-if ($fixed_bug15890)
-{
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) 0.16E+1 is non sense
 let $part_number= 0.16E+1;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-}
 # (negative) 0.0E+300 is zero
 let $part_number= 0.0E+300;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-if ($fixed_bug15890)
-{
 # Bug#15890 Partitions: Strange interpretation of partition number
 # (negative) 1E+300 is too huge
 let $part_number= 1E+300;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) 1E-300 is nearly zero
 let $part_number= 1E-300;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
-}
 
 --echo # 4.2.4 partition/subpartition numbers STRING notation
 ##### STRING notation
 # (negative?) case number = '2'
 let $part_number= '2';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative?) case number = '2.0'
 let $part_number= '2.0';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative?) case number = '0.2E+1'
 let $part_number= '0.2E+1';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= '2A';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= 'A2';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) empty string
 let $part_number= '';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= 'GARBAGE';
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 
 --echo # 4.2.5 partition/subpartition numbers other notations
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= 2A;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= A2;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= GARBAGE;
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 
 # (negative?) double quotes
 let $part_number= "2";
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) Strings starts with digit, but 'A' follows
 let $part_number= "2A";
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) Strings starts with 'A', but digit follows
 let $part_number= "A2";
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 # (negative) string without any digits
 let $part_number= "GARBAGE";
 --source suite/parts/inc/partition_syntax_1.inc
-# --source include/partition_syntax_1.inc
 
 --echo # 4.2.6 (negative) partition/subpartition numbers per @variables
 SET @aux = 5;
@@ -665,7 +604,6 @@ $column_list
 )
 PARTITION BY HASH(f_int1) PARTITIONS 2 ( PARTITION part1, PARTITION part2 ) ;
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 eval CREATE TABLE t1 (
 $column_list
@@ -678,7 +616,6 @@ SUBPARTITION BY HASH(f_int1) SUBPARTITIO
     (SUBPARTITION subpart21, SUBPARTITION subpart22)
 );
 --source suite/parts/inc/partition_layout_check1.inc
-# --source include/partition_layout_check1.inc
 DROP TABLE t1;
 --echo # 4.3.2 (positive) number of partition/subpartition ,
 --echo #                  0 (= no) named partition/subpartition
diff -Nrup a/mysql-test/suite/parts/inc/partition_syntax_1.inc b/mysql-test/suite/parts/inc/partition_syntax_1.inc
--- a/mysql-test/suite/parts/inc/partition_syntax_1.inc	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/inc/partition_syntax_1.inc	2007-11-16 21:38:56 +01:00
@@ -1,8 +1,8 @@
 ################################################################################
-# include/partition_syntax_1.inc                                               #
+# inc/partition_syntax_1.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_syntax.inc #
+#   Auxiliary script, only useful when sourced by inc/partition_syntax.inc     #
 #                                                                              #
 #    Try to create a table with number of partitions/subpartitions             #
 #    = $part_number. Print the layout of the table and drop it.                #
@@ -50,7 +50,6 @@ if ($unexpected_error)
 if ($run)
 {
    --source suite/parts/inc/partition_layout_check1.inc
-   # --source include/partition_layout_check1.inc
    eval DROP TABLE t1;
 }
 #### Try to create a table with the given subpartition number
@@ -88,6 +87,5 @@ if ($unexpected_error)
 if ($run)
 {
    --source suite/parts/inc/partition_layout_check1.inc
-   # --source include/partition_layout_check1.inc
    eval DROP TABLE t1;
 }
diff -Nrup a/mysql-test/suite/parts/inc/partition_syntax_2.inc b/mysql-test/suite/parts/inc/partition_syntax_2.inc
--- a/mysql-test/suite/parts/inc/partition_syntax_2.inc	2007-04-30 16:24:07 +02:00
+++ b/mysql-test/suite/parts/inc/partition_syntax_2.inc	2007-11-16 21:38:56 +01:00
@@ -1,11 +1,11 @@
 ################################################################################
-# include/partition_syntax_2.inc                                               #
+# inc/partition_syntax_2.inc                                                   #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_syntax.inc.#
+#   Auxiliary script, only useful when sourced by inc/partition_syntax.inc.    #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-05-11                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -35,11 +35,7 @@ if (`SELECT @@session.storage_engine IN(
    )
    $partition_scheme;
    eval $insert_all;
-   if ($fixed_bug18735)
-   {
    --source suite/parts/inc/partition_check.inc
-   # --source include/partition_check.inc
-   }
    DROP TABLE t1;
    eval CREATE TABLE t1 (
    $column_list,
@@ -47,10 +43,6 @@ if (`SELECT @@session.storage_engine IN(
    )
    $partition_scheme;
    eval $insert_all;
-   if ($fixed_bug18735)
-   {
    --source suite/parts/inc/partition_check.inc
-   # --source include/partition_check.inc
-   }
    DROP TABLE t1;
 }
diff -Nrup a/mysql-test/suite/parts/inc/partition_text.inc b/mysql-test/suite/parts/inc/partition_text.inc
--- a/mysql-test/suite/parts/inc/partition_text.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_text.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and text data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
@@ -53,4 +55,3 @@ partition by key (a) partitions 30;
 #select count(*) from t2;
 #select * from t2;
 #drop table t2;
-
diff -Nrup a/mysql-test/suite/parts/inc/partition_trigg1.inc b/mysql-test/suite/parts/inc/partition_trigg1.inc
--- a/mysql-test/suite/parts/inc/partition_trigg1.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_trigg1.inc	2007-11-16 21:38:56 +01:00
@@ -1,8 +1,8 @@
 ################################################################################
-# include/partition_trigg1.inc                                                 #
+# inc/partition_trigg1.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_check.inc. #
+#   Auxiliary script, only useful when sourced by inc/partition_check.inc. #
 #   One trigger uses new values (--> event UPDATE, INSERT only)                #
 #   One trigger uses old values (--> event UPDATE, DELETE only)                #
 #                                                                              #
@@ -12,7 +12,7 @@
 # 4. Revert the modifications                                                  #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -45,7 +45,7 @@ if ($run1)
 
    eval $statement;
 
-   #      Check of preceeding statement via Select
+   #      Check of preceding statement via Select
    if ($no_debug)
    {
      --disable_query_log
@@ -94,7 +94,7 @@ if ($run1)
 
    eval $statement;
 
-   #      Check of preceeding statement via Select
+   #      Check of preceding statement via Select
    if ($no_debug)
    {
      --disable_query_log
diff -Nrup a/mysql-test/suite/parts/inc/partition_trigg2.inc b/mysql-test/suite/parts/inc/partition_trigg2.inc
--- a/mysql-test/suite/parts/inc/partition_trigg2.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_trigg2.inc	2007-11-16 21:38:56 +01:00
@@ -1,8 +1,8 @@
 ################################################################################
-# include/partition_trigg2.inc                                                 #
+# inc/partition_trigg2.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_check.inc. #
+#   Auxiliary script, only useful when sourced by inc/partition_check.inc.     #
 #   The trigger uses new values (--> event UPDATE, INSERT only)                #
 #                                                                              #
 # 1. Create a trigger                                                          #
@@ -11,7 +11,7 @@
 # 4. Revert the modifications                                                  #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
@@ -27,7 +27,7 @@ BEGIN
 END|
 delimiter ;|
 eval $statement;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
   --disable_query_log
diff -Nrup a/mysql-test/suite/parts/inc/partition_trigg3.inc b/mysql-test/suite/parts/inc/partition_trigg3.inc
--- a/mysql-test/suite/parts/inc/partition_trigg3.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_trigg3.inc	2007-11-16 21:38:56 +01:00
@@ -1,8 +1,8 @@
-###############################################################################
-# include/partition_trigg3.inc                                                 #
+################################################################################
+# inc/partition_trigg3.inc                                                     #
 #                                                                              #
 # Purpose:                                                                     #
-#   Auxiliary script, only useful when sourced by include/partition_check.inc. #
+#   Auxiliary script, only useful when sourced by inc/partition_check.inc.     #
 #   The trigger uses new values (--> event UPDATE, INSERT only)                #
 #                                                                              #
 # 1. Create a trigger                                                          #
@@ -11,23 +11,13 @@
 # 4. Revert the modifications                                                  #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-03-05                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
 # Change:                                                                      #
 ################################################################################
 
-# include/partition_trigg3.inc
-#
-# Auxiliary script, only useful when sourced by include/partition_check.inc.
-#
-# 1. Create a trigger
-# 2. Execute a statement, which activates the trigger
-# 3. Check the results of the trigger activity
-# 4. Revert the modifications
-#
-
 delimiter |;
 # Original version of the trigger
 # eval CREATE TRIGGER trg_3 $event ON t1 FOR EACH ROW
@@ -55,20 +45,12 @@ END|
 delimiter ;|
 # Additional statements because of Bug(limitation)#17704
 SET @counter = 1;
-if ($fixed_bug18730)
-{
 # Bug#18730 Partitions: NDB, crash on SELECT MIN(<unique column>)
 SELECT MAX(f_int1), MIN(f_int2) INTO @my_max1,@my_min2 FROM t1;
-}
-if (!$fixed_bug18730)
-{
-# Bug#18730 Partitions: NDB, crash on SELECT MIN(<unique column>)
-SELECT @max_row, 1 INTO @my_max1,@my_min2;
-}
 # Additional statements end
 eval $statement;
 DROP TRIGGER trg_3;
-#      Check of preceeding statement via Select
+#      Check of preceding statement via Select
 if ($no_debug)
 {
   --disable_query_log
diff -Nrup a/mysql-test/suite/parts/inc/partition_value.inc b/mysql-test/suite/parts/inc/partition_value.inc
--- a/mysql-test/suite/parts/inc/partition_value.inc	2007-08-27 20:09:09 +02:00
+++ b/mysql-test/suite/parts/inc/partition_value.inc	2007-11-16 21:38:56 +01:00
@@ -1,11 +1,11 @@
 ################################################################################
-# include/partition_value.inc                                                  #
+# inc/partition_value.inc                                                      #
 #                                                                              #
 # Purpose:                                                                     #
 #   Tests around "exotic" values calculated by the partitioning function       #
 #                                                                              #
 #------------------------------------------------------------------------------#
-# Original Author: ML                                                          #
+# Original Author: mleich                                                      #
 # Original Date: 2006-04-11                                                    #
 # Change Author:                                                               #
 # Change Date:                                                                 #
diff -Nrup a/mysql-test/suite/parts/inc/partition_varbinary.inc b/mysql-test/suite/parts/inc/partition_varbinary.inc
--- a/mysql-test/suite/parts/inc/partition_varbinary.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_varbinary.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and varbinary data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
diff -Nrup a/mysql-test/suite/parts/inc/partition_varchar.inc b/mysql-test/suite/parts/inc/partition_varchar.inc
--- a/mysql-test/suite/parts/inc/partition_varchar.inc	2007-04-30 15:12:31 +02:00
+++ b/mysql-test/suite/parts/inc/partition_varchar.inc	2007-11-16 21:38:56 +01:00
@@ -1,3 +1,5 @@
+--echo ---- Partitioning and varchar data type
+
 --disable_query_log
 # DATA DIRECTORY
 eval SET @data_dir = 'DATA DIRECTORY =
diff -Nrup a/mysql-test/suite/parts/r/partition_alter1_innodb.result b/mysql-test/suite/parts/r/partition_alter1_innodb.result
--- a/mysql-test/suite/parts/r/partition_alter1_innodb.result	2007-10-10 22:03:06 +02:00
+++ b/mysql-test/suite/parts/r/partition_alter1_innodb.result	2007-11-16 21:38:56 +01:00
@@ -2,11 +2,6 @@ SET @max_row = 20;
 SET @@session.storage_engine = 'InnoDB';
 
 #------------------------------------------------------------------------
-# There are several testcases disabled because of the open bugs
-# #15890
-#------------------------------------------------------------------------
-
-#------------------------------------------------------------------------
 #  0. Setting of auxiliary variables + Creation of an auxiliary tables
 #     needed in many testcases
 #------------------------------------------------------------------------
@@ -386,7 +381,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -857,7 +852,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -875,7 +870,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1346,7 +1341,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -1372,7 +1367,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -1843,7 +1838,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -1867,7 +1862,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -2336,7 +2331,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -2358,7 +2353,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -2829,7 +2824,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -2855,7 +2850,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -3324,7 +3319,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -3350,7 +3345,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -3821,7 +3816,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -3843,7 +3838,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -4314,7 +4309,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -4333,7 +4328,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -4804,7 +4799,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -4822,7 +4817,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -5293,7 +5288,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -5319,7 +5314,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -5790,7 +5785,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -5814,7 +5809,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -6283,7 +6278,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -6305,7 +6300,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -6776,7 +6771,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -6802,7 +6797,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -7271,7 +7266,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -7297,7 +7292,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -7768,7 +7763,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -7790,7 +7785,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -8261,7 +8256,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 #  1.1.4 UNIQUE INDEX consisting of two columns
 DROP TABLE IF EXISTS t1;
@@ -8281,7 +8276,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -8768,7 +8763,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -8786,7 +8781,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -9273,7 +9268,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -9299,7 +9294,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -9786,7 +9781,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -9810,7 +9805,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -10295,7 +10290,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -10317,7 +10312,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -10804,7 +10799,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -10830,7 +10825,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -11315,7 +11310,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -11341,7 +11336,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -11828,7 +11823,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -11850,7 +11845,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -12337,7 +12332,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -12356,7 +12351,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -12843,7 +12838,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -12861,7 +12856,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -13348,7 +13343,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -13374,7 +13369,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -13861,7 +13856,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -13885,7 +13880,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -14370,7 +14365,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -14392,7 +14387,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -14879,7 +14874,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -14905,7 +14900,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -15390,7 +15385,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -15416,7 +15411,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -15903,7 +15898,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -15925,7 +15920,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -16412,7 +16407,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 #------------------------------------------------------------------------
 #  1.2   ADD PRIMARY KEY or UNIQUE INDEX to table with two columns
@@ -16436,7 +16431,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -16907,7 +16902,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -16925,7 +16920,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -17396,7 +17391,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -17422,7 +17417,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -17893,7 +17888,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -17917,7 +17912,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -18386,7 +18381,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -18408,7 +18403,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -18877,7 +18872,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -18903,7 +18898,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -19372,7 +19367,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -19398,7 +19393,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -19869,7 +19864,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -19891,7 +19886,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int1,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -20362,7 +20357,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -20381,7 +20376,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -20852,7 +20847,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -20870,7 +20865,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -21341,7 +21336,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -21367,7 +21362,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -21838,7 +21833,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -21862,7 +21857,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -22331,7 +22326,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -22353,7 +22348,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -22822,7 +22817,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -22848,7 +22843,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -23317,7 +23312,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -23343,7 +23338,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -23814,7 +23809,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -23836,7 +23831,7 @@ ALTER TABLE t1 ADD PRIMARY KEY(f_int2,f_
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -24307,7 +24302,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 #  1.2.2 UNIQUE INDEX consisting of two columns
 DROP TABLE IF EXISTS t1;
@@ -24327,7 +24322,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -24814,7 +24809,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -24832,7 +24827,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -25319,7 +25314,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -25345,7 +25340,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -25832,7 +25827,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -25856,7 +25851,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -26341,7 +26336,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -26363,7 +26358,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -26848,7 +26843,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -26874,7 +26869,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -27359,7 +27354,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -27385,7 +27380,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -27872,7 +27867,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -27894,7 +27889,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -28381,7 +28376,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -28400,7 +28395,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -28887,7 +28882,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -28905,7 +28900,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -29392,7 +29387,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -29418,7 +29413,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -29905,7 +29900,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -29929,7 +29924,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -30414,7 +30409,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -30436,7 +30431,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -30921,7 +30916,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -30947,7 +30942,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -31432,7 +31427,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -31458,7 +31453,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -31945,7 +31940,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -31967,7 +31962,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -32454,7 +32449,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 #  1.2.3 PRIMARY KEY and UNIQUE INDEX consisting of two columns
 DROP TABLE IF EXISTS t1;
@@ -32474,7 +32469,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -32946,7 +32941,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -32964,7 +32959,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -33436,7 +33431,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -33462,7 +33457,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -33934,7 +33929,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -33958,7 +33953,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -34428,7 +34423,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -34450,7 +34445,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -34920,7 +34915,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -34946,7 +34941,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -35416,7 +35411,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -35442,7 +35437,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -35914,7 +35909,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -35936,7 +35931,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -36408,7 +36403,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -36427,7 +36422,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -36899,7 +36894,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -36917,7 +36912,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -37389,7 +37384,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -37415,7 +37410,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -37887,7 +37882,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -37911,7 +37906,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -38381,7 +38376,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -38403,7 +38398,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -38873,7 +38868,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -38899,7 +38894,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -39369,7 +39364,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -39395,7 +39390,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -39867,7 +39862,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -39889,7 +39884,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -40361,7 +40356,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (
@@ -40380,7 +40375,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -40852,7 +40847,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -40870,7 +40865,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -41342,7 +41337,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -41368,7 +41363,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -41840,7 +41835,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -41864,7 +41859,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -42334,7 +42329,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -42356,7 +42351,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -42826,7 +42821,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -42852,7 +42847,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -43322,7 +43317,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -43348,7 +43343,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -43820,7 +43815,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -43842,7 +43837,7 @@ ALTER TABLE t1 ADD UNIQUE INDEX uidx1 (f
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -44314,7 +44309,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 
 #========================================================================
@@ -44341,7 +44336,7 @@ ALTER TABLE t1 DROP PRIMARY KEY, DROP IN
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -44760,7 +44755,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
+# End usability test (inc/partition_check.inc)
 DROP TABLE t1;
 CREATE TABLE t1 (
 f_int1 INTEGER,
@@ -44778,7 +44773,7 @@ ALTER TABLE t1 DROP PRIMARY KEY, DROP IN
 INSERT INTO t1(f_int1,f_int2,f_char1,f_char2,f_charbig)
 SELECT f_int1,f_int2,f_char1,f_char2,f_charbig FROM t0_template
 WHERE f_int1 BETWEEN @max_row_div2 AND @max_row;
-# Start usability test (include/partition_check.inc)
+# Start usability test (inc/partition_check.inc)
 create_command
 SHOW CREATE TABLE t1;
 Table	Create Table
@@ -45197,7 +45192,7 @@ TRUNCATE t1;
 	
 # check TRUNCATE success: 	1
 # check layout success:    1
-# End usability test (include/partition_check.inc)
Thread
bk commit into 5.1 tree (mleich:1.2622) BUG#31610mleich16 Nov