From d7027d952247e83544898f38276a58b4acc12350 Mon Sep 17 00:00:00 2001
From: Jon Olav Hauglid <jon.hauglid@oracle.com>
Date: Tue, 22 Nov 2011 14:16:13 +0100
Subject: Disabling main.query_cache_28249.test since this test fails
 sporadically on 5.1. See Bug#12584161.

Test runs successfully on 5.5/trunk, so this changeset will
be null-merged.
---
 mysql-test/t/disabled.def | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mysql-test')

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 84c981c08c1..bfa051de4b6 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -12,4 +12,4 @@
 kill                     : Bug#11748945 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
 read_many_rows_innodb    : Bug#11748886 2010-11-15 mattiasj report already exists
 main.log_tables-big      : Bug#11756699 2010-11-15 mattiasj report already exists
-
+query_cache_28249        : Bug#12584161 2011-11-17 joh      fails sporadically in 5.1 only
-- 
cgit v1.2.1


From cb660cc333dafe69b3f01831673e79ff3a22b820 Mon Sep 17 00:00:00 2001
From: Ashish Agarwal <ashish.y.agarwal@oracle.com>
Date: Wed, 23 Nov 2011 18:33:29 +0530
Subject: BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGE            
           AND HANG IN SHOW TABLE STATUS.

ISSUE: Table corruption due to concurrent queries.
       Different threads running insert and check
       query leads to table corruption. Not properly locked,
       rows are inserted in between check query.

SOLUTION: In check query mutex lock is acquired
          for a longer time to handle concurrent
          insert and check query.

NOTE: Additionally we backported the fix for CHECKSUM
      issue(bug#11758979).
---
 mysql-test/r/archive.result | 19 +++++++++++++++++++
 mysql-test/t/archive.test   | 14 ++++++++++++++
 2 files changed, 33 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index 15ded03f414..69f5adf5b5d 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -12772,3 +12772,22 @@ a	b	c	d	e	f
 -1	b	c	d	e	1
 DROP TABLE t1;
 SET sort_buffer_size=DEFAULT;
+#
+# BUG#11758979 - 51252: ARCHIVE TABLES CAUSE 100% CPU USAGE
+#                       AND HANG IN SHOW TABLE STATUS
+# (to be executed with valgrind)
+CREATE TABLE t1(a BLOB, b VARCHAR(200)) ENGINE=ARCHIVE;
+INSERT INTO t1 VALUES(NULL, '');
+FLUSH TABLE t1;
+# we need this select to workaround BUG#11764364
+SELECT * FROM t1;
+a	b
+NULL	
+CHECKSUM TABLE t1 EXTENDED;
+Table	Checksum
+test.t1	286155052
+FLUSH TABLE t1;
+OPTIMIZE TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	optimize	status	OK
+DROP TABLE t1;
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index 98ba5e03ede..0364c95db0b 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1693,3 +1693,17 @@ INSERT INTO t1 SELECT t1.* FROM t1,t1 t2,t1 t3,t1 t4,t1 t5,t1 t6;
 SELECT * FROM t1 ORDER BY f LIMIT 1;
 DROP TABLE t1;
 SET sort_buffer_size=DEFAULT;
+
+--echo #
+--echo # BUG#11758979 - 51252: ARCHIVE TABLES CAUSE 100% CPU USAGE
+--echo #                       AND HANG IN SHOW TABLE STATUS
+--echo # (to be executed with valgrind)
+CREATE TABLE t1(a BLOB, b VARCHAR(200)) ENGINE=ARCHIVE;
+INSERT INTO t1 VALUES(NULL, '');
+FLUSH TABLE t1;
+--echo # we need this select to workaround BUG#11764364
+SELECT * FROM t1;
+CHECKSUM TABLE t1 EXTENDED;
+FLUSH TABLE t1;
+OPTIMIZE TABLE t1;
+DROP TABLE t1;
-- 
cgit v1.2.1


From 1582738201075199ed1c6a6193ad9057dda5f41e Mon Sep 17 00:00:00 2001
From: Mattias Jonsson <mattias.jonsson@oracle.com>
Date: Mon, 12 Dec 2011 14:07:02 +0100
Subject: Bug#12361113: CRASH WHEN "LOAD INDEX INTO CACHE" WITH TOO SMALL KEY
 CACHE

The server crashed on division by zero because the key cache was not
initialized and the block length was 0 which was used in a division.

The fix was to not allow CACHE INDEX if the key cache was not initiallized.
Thus never try LOAD INDEX INTO CACHE for an uninitialized key cache.

Also added some windows files/directories to .bzrignore.
---
 mysql-test/r/key_cache.result | 16 ++++++++++++++++
 mysql-test/t/key_cache.test   | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/key_cache.result b/mysql-test/r/key_cache.result
index 9ada5dc0784..6513c4eb374 100644
--- a/mysql-test/r/key_cache.result
+++ b/mysql-test/r/key_cache.result
@@ -368,3 +368,19 @@ Variable_name	Value
 key_cache_block_size	1536
 SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
 DROP TABLE t1;
+#
+# Bug#12361113: crash when load index into cache
+#
+# Note that this creates an empty disabled key cache!
+SET GLOBAL key_cache_none.key_cache_block_size = 1024;
+CREATE TABLE t1 (a INT, b INTEGER NOT NULL, KEY (b) ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1, 1);
+CACHE INDEX t1 in key_cache_none;
+ERROR HY000: Unknown key cache 'key_cache_none'
+# The bug crashed the server at LOAD INDEX below. Now it will succeed 
+# since the default cache is used due to CACHE INDEX failed for
+# key_cache_none.
+LOAD INDEX INTO CACHE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	preload_keys	status	OK
+DROP TABLE t1;
diff --git a/mysql-test/t/key_cache.test b/mysql-test/t/key_cache.test
index 4c14dc96aaa..9d865b9b5fe 100644
--- a/mysql-test/t/key_cache.test
+++ b/mysql-test/t/key_cache.test
@@ -247,3 +247,19 @@ SET GLOBAL key_cache_block_size= @bug28478_key_cache_block_size;
 DROP TABLE t1;
 
 # End of 4.1 tests
+
+--echo #
+--echo # Bug#12361113: crash when load index into cache
+--echo #
+
+--echo # Note that this creates an empty disabled key cache!
+SET GLOBAL key_cache_none.key_cache_block_size = 1024;
+CREATE TABLE t1 (a INT, b INTEGER NOT NULL, KEY (b) ) ENGINE = MYISAM;
+INSERT INTO t1 VALUES (1, 1);
+--error ER_UNKNOWN_KEY_CACHE
+CACHE INDEX t1 in key_cache_none;
+--echo # The bug crashed the server at LOAD INDEX below. Now it will succeed 
+--echo # since the default cache is used due to CACHE INDEX failed for
+--echo # key_cache_none.
+LOAD INDEX INTO CACHE t1;
+DROP TABLE t1;
-- 
cgit v1.2.1


From f080e98e503c6e8191ea0dede00e0c35365e5590 Mon Sep 17 00:00:00 2001
From: Annamalai Gurusami <annamalai.gurusami@oracle.com>
Date: Tue, 13 Dec 2011 14:26:12 +0530
Subject: Bug #13117023: Innodb increments handler_read_key when it should not

The counter handler_read_key (SSV::ha_read_key_count) is incremented
incorrectly.

The mysql server maintains a per thread system_status_var (SSV)
object.  This object contains among other things the counter
SSV::ha_read_key_count. The purpose of this counter is to measure the
number of requests to read a row based on a key (or the number of
index lookups).

This counter was wrongly incremented in the
ha_innobase::innobase_get_index(). The fix removes
this increment statement (for both innodb and innodb_plugin).

The various callers of the innobase_get_index() was checked to
determine if anybody must increment this counter (if they first call
innobase_get_index() and then perform an index lookup).  It was found
that no caller of innobase_get_index() needs to worry about the
SSV::ha_read_key_count counter.
---
 mysql-test/suite/innodb/r/innodb.result        |  5 +++++
 mysql-test/suite/innodb/t/innodb.test          | 11 +++++++++++
 mysql-test/suite/innodb_plugin/r/innodb.result | 11 +++++++++++
 mysql-test/suite/innodb_plugin/t/innodb.test   | 11 +++++++++++
 4 files changed, 38 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result
index ad140cc59be..fd311de001c 100644
--- a/mysql-test/suite/innodb/r/innodb.result
+++ b/mysql-test/suite/innodb/r/innodb.result
@@ -2365,3 +2365,8 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 drop table t1;
 set storage_engine=MyISAM;
+Variable_name	Value
+Handler_read_key	0
+f1
+Variable_name	Value
+Handler_read_key	1
diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test
index ef050390b48..f20ea46b200 100644
--- a/mysql-test/suite/innodb/t/innodb.test
+++ b/mysql-test/suite/innodb/t/innodb.test
@@ -1389,6 +1389,17 @@ eval set storage_engine=$default;
 -- disable_query_log
 SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
 
+#
+# Test fix for bug 13117023. InnoDB increments HA_READ_KEY_COUNT (aka
+# HANDLER_READ_KEY) when it should not.
+#
+create table t1 (f1 integer primary key) engine=innodb;
+flush status;
+show status like "handler_read_key";
+select f1 from t1;
+show status like "handler_read_key";
+drop table t1;
+
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #
diff --git a/mysql-test/suite/innodb_plugin/r/innodb.result b/mysql-test/suite/innodb_plugin/r/innodb.result
index cdb61f3ba98..9435670f42d 100644
--- a/mysql-test/suite/innodb_plugin/r/innodb.result
+++ b/mysql-test/suite/innodb_plugin/r/innodb.result
@@ -3257,3 +3257,14 @@ Handler_update	1
 Variable_name	Value
 Handler_delete	1
 DROP TABLE bug58912;
+create table t1 (f1 integer primary key) engine=innodb;
+flush status;
+show status like "handler_read_key";
+Variable_name	Value
+Handler_read_key	0
+select f1 from t1;
+f1
+show status like "handler_read_key";
+Variable_name	Value
+Handler_read_key	1
+drop table t1;
diff --git a/mysql-test/suite/innodb_plugin/t/innodb.test b/mysql-test/suite/innodb_plugin/t/innodb.test
index 1480492cf2a..d4f2088cc50 100644
--- a/mysql-test/suite/innodb_plugin/t/innodb.test
+++ b/mysql-test/suite/innodb_plugin/t/innodb.test
@@ -2571,6 +2571,17 @@ SET GLOBAL innodb_thread_concurrency = @innodb_thread_concurrency_orig;
 # Clean up after the Bug#55284/Bug#58912 test case.
 DROP TABLE bug58912;
 
+#
+# Test fix for bug 13117023. InnoDB increments HA_READ_KEY_COUNT (aka
+# HANDLER_READ_KEY) when it should not.
+#
+create table t1 (f1 integer primary key) engine=innodb;
+flush status;
+show status like "handler_read_key";
+select f1 from t1;
+show status like "handler_read_key";
+drop table t1;
+
 #######################################################################
 #                                                                     #
 # Please, DO NOT TOUCH this file as well as the innodb.result file.   #
-- 
cgit v1.2.1


From 3441e35736d31827a024486711a2c686c1dacdb8 Mon Sep 17 00:00:00 2001
From: Mattias Jonsson <mattias.jonsson@oracle.com>
Date: Thu, 15 Dec 2011 16:59:18 +0100
Subject: Post push fix for merge.test and mysqlcheck.test on windows

---
 mysql-test/r/mysqlcheck.result |  1 +
 mysql-test/t/merge.test        | 10 +++++++---
 mysql-test/t/mysqlcheck.test   |  1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 5f1a0565b10..ffba0d443e7 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -147,6 +147,7 @@ DROP TABLE `@`;
 CREATE TABLE `я` (a INT);
 SET NAMES DEFAULT;
 mysqlcheck --default-character-set="latin1" --databases test
+call mtr.add_suppression("Can't find file: '..test.@003f.frm'");
 test.?
 Error    : Table doesn't exist
 status   : Operation failed
diff --git a/mysql-test/t/merge.test b/mysql-test/t/merge.test
index a6affbb0540..7954aed6a55 100644
--- a/mysql-test/t/merge.test
+++ b/mysql-test/t/merge.test
@@ -1817,9 +1817,13 @@ CREATE TABLE t1(a INT);
 --echo # Test reattach merge failure
 LOCK TABLES m1 READ;
 --echo # Replace 't1' with 't3' table using file operations.
-remove_file $MYSQLD_DATADIR/test/t1.frm;
-remove_file $MYSQLD_DATADIR/test/t1.MYI;
-remove_file $MYSQLD_DATADIR/test/t1.MYD;
+# move + remove is a work around for windows.
+move_file $MYSQLD_DATADIR/test/t1.frm $MYSQLD_DATADIR/test/oldt1.frm;
+move_file $MYSQLD_DATADIR/test/t1.MYI $MYSQLD_DATADIR/test/oldt1.MYI;
+move_file $MYSQLD_DATADIR/test/t1.MYD $MYSQLD_DATADIR/test/oldt1.MYD;
+remove_file $MYSQLD_DATADIR/test/oldt1.frm;
+remove_file $MYSQLD_DATADIR/test/oldt1.MYI;
+remove_file $MYSQLD_DATADIR/test/oldt1.MYD;
 copy_file $MYSQLD_DATADIR/test/t3.frm $MYSQLD_DATADIR/test/t1.frm;
 copy_file $MYSQLD_DATADIR/test/t3.MYI $MYSQLD_DATADIR/test/t1.MYI;
 copy_file $MYSQLD_DATADIR/test/t3.MYD $MYSQLD_DATADIR/test/t1.MYD;
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 986b5aba385..bf99d48fd6a 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -138,6 +138,7 @@ CREATE TABLE `я` (a INT);
 SET NAMES DEFAULT;
 --echo mysqlcheck --default-character-set="latin1" --databases test
 # Error returned depends on platform, replace it with "Table doesn't exist"
+call mtr.add_suppression("Can't find file: '..test.@003f.frm'");
 --replace_result "Can't find file: './test/@003f.frm' (errno: 22)" "Table doesn't exist" "Table 'test.?' doesn't exist" "Table doesn't exist"
 --exec $MYSQL_CHECK --default-character-set="latin1" --databases test
 --echo mysqlcheck --default-character-set="utf8" --databases test
-- 
cgit v1.2.1


From 93677ddca3bf5bce73ae03d6afd9a341b12732c0 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Wed, 25 Jan 2012 11:34:43 +0100
Subject: mtr runs only "big" tests, if --big-test is repeated twice

---
 mysql-test/lib/mtr_cases.pm  | 7 +++++++
 mysql-test/mysql-test-run.pl | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 727e56ac77a..8b87ad367e3 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -925,6 +925,13 @@ sub collect_one_test_case {
     return $tinfo
   }
 
+  if ( ! $tinfo->{'big_test'} and $::opt_big_test > 1 )
+  {
+    $tinfo->{'skip'}= 1;
+    $tinfo->{'comment'}= "Small test";
+    return $tinfo
+  }
+
   if ( $tinfo->{'need_debug'} && ! $::debug_compiled_binaries )
   {
     $tinfo->{'skip'}= 1;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index b2c7ee2fc37..cb6f7b4a486 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -986,7 +986,7 @@ sub command_line_setup {
              'skip-test=s'              => \&collect_option,
              'do-test=s'                => \&collect_option,
              'start-from=s'             => \&collect_option,
-             'big-test'                 => \$opt_big_test,
+             'big-test+'                => \$opt_big_test,
 	     'combination=s'            => \@opt_combinations,
              'skip-combinations'        => \&collect_option,
              'experimental=s'           => \@opt_experimentals,
@@ -5984,7 +5984,8 @@ Options to control what test suites or cases to run
                         list of suite names.
                         The default is: "$DEFAULT_SUITES"
   skip-rpl              Skip the replication test cases.
-  big-test              Also run tests marked as "big"
+  big-test              Also run tests marked as "big". Repeat this option
+                        twice to run only "big" tests.
   staging-run           Run a limited number of tests (no slow tests). Used
                         for running staging trees with valgrind.
   enable-disabled       Run also tests marked as disabled
-- 
cgit v1.2.1


From 2fef5b52a4e2b33e6fe2befc77417eeded61058c Mon Sep 17 00:00:00 2001
From: Igor Babaev <igor@askmonty.org>
Date: Thu, 16 Feb 2012 16:06:49 -0800
Subject: Fixed LP bug #933117. The bug was fixed with the code back-ported
 from the patch for LP bug 800184 pushed into mariadb-5.3.

---
 mysql-test/r/range.result | 15 +++++++++++++++
 mysql-test/t/range.test   | 14 ++++++++++++++
 2 files changed, 29 insertions(+)

(limited to 'mysql-test')

diff --git a/mysql-test/r/range.result b/mysql-test/r/range.result
index ae63edf87b9..13ae77c13e3 100644
--- a/mysql-test/r/range.result
+++ b/mysql-test/r/range.result
@@ -1768,3 +1768,18 @@ SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
 pk	i4	pk	i4
 DROP TABLE t1;
 End of 5.1 tests
+#
+# LP Bug #533117: Wrong use_count in SEL_ARG trees
+#   (Bug #58731)
+#
+create table t1 (a int, b int, c int, key idx (a,b,c));
+insert into t1 values (0,0,0), (2,2,0), (1,1,1), (2,2,1);
+explain
+select * from t1 force index (idx) where a >=1 and c <= 1 and a=b and b > 1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	idx	idx	5	NULL	3	Using where; Using index
+select * from t1 force index (idx) where a >=1 and c <= 1 and a=b and b > 1;
+a	b	c
+2	2	0
+2	2	1
+drop table t1;
diff --git a/mysql-test/t/range.test b/mysql-test/t/range.test
index 6c9320b708a..a5ab6905b74 100644
--- a/mysql-test/t/range.test
+++ b/mysql-test/t/range.test
@@ -1393,3 +1393,17 @@ SELECT * FROM t1, t1 as t2 WHERE t1.i4 BETWEEN t2.pk AND t2.pk;
 DROP TABLE t1;
 
 --echo End of 5.1 tests
+
+--echo #
+--echo # LP Bug #533117: Wrong use_count in SEL_ARG trees
+--echo #   (Bug #58731)
+--echo #
+
+create table t1 (a int, b int, c int, key idx (a,b,c));
+insert into t1 values (0,0,0), (2,2,0), (1,1,1), (2,2,1);
+
+explain
+select * from t1 force index (idx) where a >=1 and c <= 1 and a=b and b > 1;
+select * from t1 force index (idx) where a >=1 and c <= 1 and a=b and b > 1;
+
+drop table t1;
-- 
cgit v1.2.1


From 866cdc0a24ff8b0703ba3053ad5b36a1a6c5dac5 Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Mon, 20 Feb 2012 14:03:44 +0200
Subject: Fixed lp:902654 "MariaDB consistently crashes in collect_tables on
 Aria checkpoint execution" This happend when you have more than 1024 open
 Aria tables during checkpoint.

mysql-test/mysql-test-run.pl:
  Fixed that variable names are consistent between external and internal server.
mysql-test/suite/maria/suite.pm:
  Test for aria-block-size instead of 'aria' as 'aria' is not set for embedded server.
  This should be ok for aria tests, as aria is never disabled for these.
storage/maria/ma_checkpoint.c:
  Fixed bug when there are more than 1024 open Aria tables during checkpoint.
---
 mysql-test/mysql-test-run.pl    | 14 ++++++++++----
 mysql-test/suite/maria/suite.pm |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index dc03a6bf5b5..9ccfe5df054 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1758,8 +1758,11 @@ sub collect_mysqld_features {
 	# Put variables into hash
 	if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
 	{
-	  # print "$1=\"$2\"\n";
-	  $mysqld_variables{$1}= $2;
+          my $name= $1;
+          my $value=$2;
+          $name =~ s/_/-/g;
+          # print "$name=\"$value\"\n";
+          $mysqld_variables{$name}= $value;
 	}
 	else
 	{
@@ -1813,8 +1816,11 @@ sub collect_mysqld_features_from_running_server ()
     # Put variables into hash
     if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
     {
-      # print "$1=\"$2\"\n";
-      $mysqld_variables{$1}= $2;
+      my $name= $1;
+      my $value=$2;
+      $name =~ s/_/-/g;
+      # print "$name=\"$value\"\n";
+      $mysqld_variables{$name}= $value;
     }
   }
 
diff --git a/mysql-test/suite/maria/suite.pm b/mysql-test/suite/maria/suite.pm
index e6efcdca829..3176782404b 100644
--- a/mysql-test/suite/maria/suite.pm
+++ b/mysql-test/suite/maria/suite.pm
@@ -2,7 +2,7 @@ package My::Suite::Maria;
 
 @ISA = qw(My::Suite);
 
-return "Need Aria engine" unless $::mysqld_variables{'aria'} eq "ON";
+return "Need Aria engine" unless $::mysqld_variables{'aria-block-size'} > 0;
 
 bless { };
 
-- 
cgit v1.2.1