From 5df39c48f86639c76f14ae54baf805d2324afd37 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Mon, 28 Feb 2011 19:47:19 +0200 Subject: [PATCH] Increase version number Taged a couple of tests with --big-test configure.in: Upgrade version number mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test: Removed duplicate big_test tag mysql-test/suite/parts/t/partition_alter1_2_innodb.test: Removed duplicate big_test tag mysql-test/suite/parts/t/partition_decimal_innodb.test: Added big_test tag as this takes forever with valgrind mysql-test/suite/parts/t/partition_decimal_myisam.test: Removed duplicate big_test tag --- configure.in | 2 +- mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test | 3 --- mysql-test/suite/parts/t/partition_alter1_2_innodb.test | 2 -- mysql-test/suite/parts/t/partition_decimal_innodb.test | 1 + mysql-test/suite/parts/t/partition_decimal_myisam.test | 3 +-- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index b5a8768d718..5662b8946e0 100644 --- a/configure.in +++ b/configure.in @@ -12,7 +12,7 @@ dnl dnl When changing the major version number please also check the switch dnl statement in mysqlbinlog::check_master_version(). You may also need dnl to update version.c in ndb. -AC_INIT([MariaDB Server], [5.1.55-MariaDB], [], [mysql]) +AC_INIT([MariaDB Server], [5.1.56-MariaDB], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM diff --git a/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test b/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test index 5a6488dfba0..240bfb4de1d 100644 --- a/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test +++ b/mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test @@ -51,9 +51,6 @@ let $more_pk_ui_tests= 0; # The server must support partitioning. --source include/have_partition.inc -# This test takes long time, so only run it with the --big mtr-flag. ---source include/big_test.inc - #------------------------------------------------------------------------------# # Engine specific settings and requirements diff --git a/mysql-test/suite/parts/t/partition_alter1_2_innodb.test b/mysql-test/suite/parts/t/partition_alter1_2_innodb.test index 4a57bdd007d..71f9d33c72b 100644 --- a/mysql-test/suite/parts/t/partition_alter1_2_innodb.test +++ b/mysql-test/suite/parts/t/partition_alter1_2_innodb.test @@ -28,8 +28,6 @@ #------------------------------------------------------------------------------# # General not engine specific settings and requirements ---source include/big_test.inc - ##### Options, for debugging support ##### let $debug= 0; let $with_partitioning= 1; diff --git a/mysql-test/suite/parts/t/partition_decimal_innodb.test b/mysql-test/suite/parts/t/partition_decimal_innodb.test index 6d0aa156abe..5be42fb8fc3 100644 --- a/mysql-test/suite/parts/t/partition_decimal_innodb.test +++ b/mysql-test/suite/parts/t/partition_decimal_innodb.test @@ -28,6 +28,7 @@ ##### Options, for debugging support ##### let $debug= 0; +--source include/big_test.inc # The server must support partitioning. --source include/have_partition.inc diff --git a/mysql-test/suite/parts/t/partition_decimal_myisam.test b/mysql-test/suite/parts/t/partition_decimal_myisam.test index 9808dc878f8..2715f2b9afb 100644 --- a/mysql-test/suite/parts/t/partition_decimal_myisam.test +++ b/mysql-test/suite/parts/t/partition_decimal_myisam.test @@ -22,14 +22,13 @@ # any of the variables. # ---source include/long_test.inc - #------------------------------------------------------------------------------# # General not engine specific settings and requirements ##### Options, for debugging support ##### let $debug= 0; +--source include/big_test.inc # The server must support partitioning. --source include/have_partition.inc