mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 15:24:16 +01:00
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
This commit is contained in:
parent
7da8b3d5a0
commit
d4ed9407dd
1 changed files with 2 additions and 2 deletions
|
@ -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 */
|
||||
|
|
Loading…
Add table
Reference in a new issue