Bug#36213938:QEP regression with prefer_ordering_index=off

 post push fix:
  This patch fixes the order_by_limit.test failure seen on PB2
  hypergraph enabled runs.

Change-Id: I7cf47e03bf5289447562cbb6b11949da3432332a

Author: Justin Jose

mysql-test/t/order_by_limit.test

@@ -604,8 +604,14 @@ SET optimizer_switch = "prefer_ordering_index=off";
 
 # Verify that the index usage recheck function is called
 --connection default
---let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.threads WHERE NAME = "thread/sql/one_connection" AND PROCESSLIST_INFO LIKE "EXPLAIN SELECT * FROM t1%" AND PROCESSLIST_STATE = "preparing" ;
---source include/wait_condition.inc
+--let $using_hypergraph = `SELECT FIND_IN_SET('hypergraph_optimizer=on', @@optimizer_switch)`
+if ($using_hypergraph) {
+  --echo <ignored hypergraph optimizer error:  Depends on the query plan>
+}
+if (!$using_hypergraph) {
+  --let $wait_condition= SELECT COUNT(*)=1 FROM performance_schema.threads WHERE NAME = "thread/sql/one_connection" AND PROCESSLIST_INFO LIKE "EXPLAIN SELECT * FROM t1%" AND PROCESSLIST_STATE = "preparing" ;
+  --source include/wait_condition.inc
+}
 
 # Continue execution
 SET DEBUG_SYNC= "now SIGNAL signal.prefer_ordering_index_check_continue";