Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle)
See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix test after fix for bug #63943 (Bad warning text from strpos() on empty needle) See commit c05ee74e7ff28b49018bf3e8f452bfd5386d1b68
MySQL 5.6 EXPIRE PASSWORD flag tests
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  MySQL 5.6 EXPIRE PASSWORD flag tests
Merge branch 'PHP-5.5'

* PHP-5.5:
  MySQL 5.6 EXPIRE PASSWORD flag tests
Fixed uninitialized zval.type (Yoram)
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed uninitialized zval.type (Yoram)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed uninitialized zval.type (Yoram)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed uninitialized zval.type (Yoram)