Avoid query rerun. Partial fix: #13587#13589

frikiluser wants to merge 1 commit intophp:masterphp/php-src:masterfrom

frikiluser:fix-13587-partialfrikiluser/php-src:fix-13587-partialCopy head branch name to clipboard