diff options
| author | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
| commit | 82e8d0eb03fb3bd88062e99065f990b26fb9fc8b (patch) | |
| tree | 1df0307a474e42e031b5a7aafcf7bfe762de4b4a /tests/sql/mysqli_multiselect.phpt | |
| parent | c8724cde260e6c8bab4aefffffa1aa46f92a57ee (diff) | |
| parent | ff4edc6ecf463211c6527879d6b23f991fd5b73b (diff) | |
Merge branch 'buf2' (closes #52 and #54)
Conflicts:
tests/filter/suhosin_upload_disallow_binary_utf8.phpt
tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
tests/filter/suhosin_upload_remove_binary_utf8.phpt
tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
Diffstat (limited to 'tests/sql/mysqli_multiselect.phpt')
| -rw-r--r-- | tests/sql/mysqli_multiselect.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/sql/mysqli_multiselect.phpt b/tests/sql/mysqli_multiselect.phpt index 63d6c19..2595441 100644 --- a/tests/sql/mysqli_multiselect.phpt +++ b/tests/sql/mysqli_multiselect.phpt | |||
| @@ -11,7 +11,7 @@ suhosin.log.stdout=32 | |||
| 11 | --SKIPIF-- | 11 | --SKIPIF-- |
| 12 | <?php | 12 | <?php |
| 13 | include('skipifmysqli.inc'); | 13 | include('skipifmysqli.inc'); |
| 14 | include('skipif.inc'); | 14 | include('../skipif.inc'); |
| 15 | ?> | 15 | ?> |
| 16 | --FILE-- | 16 | --FILE-- |
| 17 | <?php | 17 | <?php |