This test needs local infile enabled
Merge commit 'ea75b1b'

* commit 'ea75b1b':
  This test needs local infile enabled