From: Ole John Aske
Date: February 4 2011 7:40am
Subject: bzr commit into mysql-trunk branch (ole.john.aske:3588)
List-Archive: http://lists.mysql.com/commits/130359
Message-Id: <20110204074100.AC42F223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4838839968411612193=="

--===============4838839968411612193==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-trunk-opt-bug59326/ based on revid:ole.john.aske@stripped

 3588 Ole John Aske	2011-02-04
      Added new MTR include files missing from previous commit

    added:
      mysql-test/include/check_qep.inc
      mysql-test/include/execute_with_statistics.inc
      mysql-test/include/expect_qep.inc
=== added file 'mysql-test/include/check_qep.inc'
--- a/mysql-test/include/check_qep.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/check_qep.inc	2011-02-04 07:39:30 +0000
@@ -0,0 +1,20 @@
+flush status;
+eval EXPLAIN $query;
+eval $query;
+
+let $cost=
+ query_get_value(SHOW STATUS LIKE 'Last_query_cost', Value, 1);
+
+let $reads=
+`select sum(variable_value)
+   from information_schema.session_status
+   where VARIABLE_NAME like 'Handler_read%'`;
+
+#echo Cost: $cost, Handler_reads: $reads;
+
+if ($cost != $best_cost)
+{ echo ### FAILED: Query_cost: $cost, expected: $best_cost ###;
+}
+if ($reads != $best_reads)
+{ echo ### FAILED: Handler_reads: $reads, expected: $best_reads ###;
+}

=== added file 'mysql-test/include/execute_with_statistics.inc'
--- a/mysql-test/include/execute_with_statistics.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/execute_with_statistics.inc	2011-02-04 07:39:30 +0000
@@ -0,0 +1,8 @@
+eval EXPLAIN $query;
+show status like 'Last_query_cost';
+
+flush status;
+eval $query;
+select sum(variable_value) as Total_handler_reads
+   from information_schema.session_status
+   where VARIABLE_NAME like 'Handler_read%';

=== added file 'mysql-test/include/expect_qep.inc'
--- a/mysql-test/include/expect_qep.inc	1970-01-01 00:00:00 +0000
+++ b/mysql-test/include/expect_qep.inc	2011-02-04 07:39:30 +0000
@@ -0,0 +1,14 @@
+flush status;
+eval EXPLAIN $query;
+eval $query;
+
+let $best_cost=
+  query_get_value(SHOW STATUS LIKE 'Last_query_cost', Value, 1);
+
+let $best_reads=
+`select sum(variable_value)
+   from information_schema.session_status
+   where VARIABLE_NAME like 'Handler_read%'`;
+
+#echo Expect, cost: $best_cost, Handler_reads: $best_reads;
+


--===============4838839968411612193==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   ij79jzeay6ebsscr
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-trunk-opt-bug59326/
# testament_sha1: 43810807c2422c4c2a1927f6382aeeea29f4a1cb
# timestamp: 2011-02-04 08:41:00 +0100
# base_revision_id: ole.john.aske@stripped\
#   5ewndbkina5zatr8
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbZ5OWcAArTfgAAQfuf//39/
/8D////6YAZfPbPp4pS7sd3dOsQ20g4ZJBTTaNMFNGDJNPUBoZDA0J6nogeptTTQEklNkptPQ0Go
EyI9EBoyaBkaAAAAOAYRhNMQwCAZADCNMmTCMBDQgqfqjQAaDIGjQADQAAGQyaaGQEUkCeiTyJp6
CnhTak9Q8p+iRmhNMhoAMENBJEEGlNpkT0FTzU9Jp6FD9U2U0PUyMTQB6RtRk2A3y51/HgaVPZkb
YIf36BlvLiuVHhNjmmOg/uxG6Sju54wIssL5wRfWUGICxTMqZ8Rn33s7OzsN/IZAIjA1xvgTATqI
ri2yEKghYB+JmV03yacaHMRElQiokhINy8o42CyLSyv4IFwPr9tmeeagwloXCx1qLFK8sA9tMSgK
SOB9HQvKrVvuXv6ejqRFkl5AuBgwHA7mQMy0LA7WgJxj5hsyc46pwxGHO4Yjf/oNWomkJCeMxaZv
XKgTB8HYceOw7LCYtovxM8BIXc6VzKdslzy1saw7xD6onwN9RcMkFYIZRlgQAHjI0AEU5CZOQoJz
Adioi8NjhM+5XIZMboLkZIOrNoNdfNtVaQUPmVUU3ZcYSLXovs1Rna86LdduBmUGYcVLDIab426W
maEgziRRoxmS2RIZIlRLnMHC1yNQ2k5ygueqhFdzrrTEnIxN8mwlXRG0zYK2kBBBYsaLLCGBoNJD
LMY6yotOWslyzJWF+IRVg8YP0t6pXqxX4lQ5tiwd34GhOVy0SjdN1lRTaT2Tz0RbiK770PC+sxOE
RfeZmN2DNRQzZyTnAExlAw2lC521iM2fOiJyUrPMWSo1xiVmV+isgUJqNfEZsCqzYQddRtUBxIul
EsN3AYPfkHiJ40XFMYYPHRleXD942FVRIRhxtNwx6h+WlUsRm6yLQg4HYIwQ02iFQp1NZ4nWPu9D
Mw6Y4nENWBI9QqAuBIAgRV8qA59B6GQTrMw9jIaDtF92k8gCIh2H00wfyf013FTDD7DayfvaSaUZ
j2sH1NBY1MqX4vgZ/FSxqXifkRLzCRCYyPgaReTpTDMx58lviJxN7UyO8GGTHD8JqAnTpyYtRzno
8q9hacNkqAedFyh1958rV7qCV4Bg4viLGbo7C5Rl0K9l66IK1v+gS7aziqUkyUhHaxJsXnlDm6jp
OiBrH9J9wFh5lDXMoicBE14wk010DeqqGwoKD4cEr7rUEedIzWDoqkyFrDeLwx194wUSJTE+ZttQ
zkJc87qq1GRynVylMUVoi9CKXtc9xFd2sIbs/UKaX5reRBu/TuTx9rDblWGSrxM3iNbVRU6m/Sc5
1vY3i1vZGomzGGlzPCAZiYCZeJ7CtyOwfk7tGUwOngjNrNquw4Wy/hxqV6gHKmR/hS0XTSpW9mU9
oJ/Dsg7wmwFFQbjUOC9Hc8uTEeEuW3mNpx2nbmOBby6zfM+cgWFpIt2B0FWZZg8VksQZZLKBndOD
vtDauxLiOuH2jbVACParJC8FxSThPMKs7IF4dQ18qXJM9ZMICOkNQiRjxXck9igKyCu/HLRKIpsP
KGB2UMYsUt/U+ATeWGYXeJr0wFYTVyOgdhsNo8pBW3yCn0zbRcgsmxhtbHatHQGsLZcOovb+YK13
PBwDrZskdBGDUNjtwJuGwyFdYSY8LZypgWFJNjC1wJuZLT1FVSWXwcZnVqT2QysiG4l/ecS1l65D
ugyd2KQ1AHKqwTQMP+EuAs4u11WI+LL17dxdqMtQt3mXNpZMjaUh3jdm32WYtX0jaHoGTWc5xhb3
FhekmCcKGsLGGYGGqrQZuTruDJSVlbKguTYEbaKc5snBZYpixyECfAdEUxVjamEVa14GfD6VeqKB
uYta6C2Yw+Vqftzi3mEPU+QM+wS6TihIhJLkYS0dYVZhkxK8qCvS0DEOjXJKYCTDSwu4ay6hSjFq
M2t5hjK3TnuvKRpKR5mhjTXJLKV+sMpe45VO1D5QY9Lwwb40OeAm5XEdSeV0NC2ERpamgfxgHI3P
QJAPeYBR9jqe4SPMz8QP8XckU4UJC2eTlnA=


--===============4838839968411612193==--