From d4ed9407dd7f1607e64a87825d41661e3f83ee42 Mon Sep 17 00:00:00 2001
From: vasil <Unknown>
Date: Thu, 27 Mar 2008 12:02:34 +0000
Subject: [PATCH] branches/5.1:

Swap the order in which mysql_thd, mysql_query_str and *mysql_query_str
are checked for non-NULL.

Suggested by:	Marko
---
 row/row0sel.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/row/row0sel.c b/row/row0sel.c
index 9d2e08e0929..616b442ccbd 100644
--- a/row/row0sel.c
+++ b/row/row0sel.c
@@ -3577,9 +3577,9 @@ shortcut_fails_too_big_rec:
 
 	if (trx->isolation_level <= TRX_ISO_READ_COMMITTED
 	    && prebuilt->select_lock_type != LOCK_NONE
+	    && trx->mysql_thd != NULL
 	    && trx->mysql_query_str != NULL
-	    && *trx->mysql_query_str != NULL
-	    && trx->mysql_thd != NULL) {
+	    && *trx->mysql_query_str != NULL) {
 
 		/* Scan the MySQL query string; check if SELECT is the first
 		word there */