Permalink
Browse files

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test
  • Loading branch information...
2 parents 915c428 + 064ba17 commit df7321359e0c11a1de99285dee64c8e69ee28653 @rlerdorf rlerdorf committed Nov 9, 2013
Showing with 2 additions and 3 deletions.
  1. +2 −3 ext/pdo/tests/bug65946.phpt
@@ -16,8 +16,7 @@ $db = PDOTest::factory();
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
$db->exec('CREATE TABLE test(id int)');
$db->exec('INSERT INTO test VALUES(1)');
-$db->exec('INSERT INTO test VALUES(2)');
-$stmt = $db->prepare('SELECT * FROM testtable LIMIT :limit');
+$stmt = $db->prepare('SELECT * FROM test LIMIT :limit');
$stmt->bindValue('limit', 1, PDO::PARAM_INT);
if(!($res = $stmt->execute())) var_dump($stmt->errorInfo());
if(!($res = $stmt->execute())) var_dump($stmt->errorInfo());
@@ -28,6 +27,6 @@ array(1) {
[0]=>
array(1) {
["id"]=>
- string(1) "2"
+ string(1) "1"
}
}

0 comments on commit df73213

Please sign in to comment.