From: Ole John Aske
Date: February 22 2011 3:44pm
Subject: bzr commit into mysql-trunk branch (ole.john.aske:3702) Bug#11766256
List-Archive: http://lists.mysql.com/commits/131866
X-Bug: 11766256
Message-Id: <20110222154409.B8F4F223@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1773271325701135868=="

--===============1773271325701135868==
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/ based on revid:ole.john.aske@stripped

 3702 Ole John Aske	2011-02-22
      Addendum to fix for bug#11766256: Added missing include files for MTR test.

    added:
      mysql-test/include/check_qep.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-22 15:44:04 +0000
@@ -0,0 +1,50 @@
+# include/check_qep.inc
+#
+# SUMMARY
+#
+#    Designed to be used together with include/check_qep.inc
+#
+#    $query should be assigned a select statement using 
+#    straight_join to force the tables to be joined in most 
+#    optimal order.
+#
+#    expect_qep.inc will then store the estimated 'Last_query_cost'
+#    and total # 'Handler_read%' for this straight_joined query.
+#
+#    We should then assign a non-straight_join'ed version of
+#    the same query to $query and execute it using 
+#    'include/check_qep.inc'. Its estimated cost and
+#    #handler_reads will then be verified against the
+#    previous straight_joined query.
+#
+# USAGE
+#
+#    let $query= <select straight_join optimal statement>;
+#    --source include/expect_qep.inc
+#    let $query= <select statement>;
+#    --source include/check_qep.inc
+#
+# EXAMPLE
+#    t/greedy_optimizer.test
+#
+
+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/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-22 15:44:04 +0000
@@ -0,0 +1,44 @@
+# include/expect_qep.inc
+#
+# SUMMARY
+#
+#    Designed to be used together with include/check_qep.inc
+#
+#    $query should be assigned a select statement using 
+#    straight_join to force the tables to be joined in most 
+#    optimal order.
+#
+#    expect_qep.inc will then store the estimated 'Last_query_cost'
+#    and total # 'Handler_read%' for this straight_joined query.
+#
+#    We should then assign a non-straight_join'ed version of
+#    the same query to $query and execute it using 
+#    'include/check_qep.inc'. Its estimated cost and
+#    #handler_reads will then be verified against the
+#    previous straight_joined query.
+#
+# USAGE
+#
+#    let $query= <select straight_join optimal statement>;
+#    --source include/expect_qep.inc
+#    let $query= <select statement>;
+#    --source include/check_qep.inc
+#
+# EXAMPLE
+#    t/greedy_optimizer.test
+#
+
+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;
+


--===============1773271325701135868==
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\
#   8sjsvr3on6mslnru
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-trunk/
# testament_sha1: 8bfab9d7958c5abc2f1ef0955d3cae3b425f96ac
# timestamp: 2011-02-22 16:44:09 +0100
# source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.5/
# base_revision_id: ole.john.aske@stripped\
#   qxyq15e56quh2w6d
# 
# Begin bundle
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


--===============1773271325701135868==--