Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Merge from HEAD: looks more than it is. Whitespace, some SQL formatting changes etc. 

No "real" changes.
PECL
Ulf Wendel 19 years ago
parent
016ee0bf39
commit
b0b510f6e6
38 changed files with 183 additions and 136 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      ext/mysqli/tests/002.phpt
  2. 1
      ext/mysqli/tests/003.phpt
  3. 9
      ext/mysqli/tests/004.phpt
  4. 11
      ext/mysqli/tests/005.phpt
  5. 5
      ext/mysqli/tests/006.phpt
  6. 5
      ext/mysqli/tests/007.phpt
  7. 5
      ext/mysqli/tests/008.phpt
  8. 2
      ext/mysqli/tests/009.phpt
  9. 11
      ext/mysqli/tests/010.phpt
  10. 15
      ext/mysqli/tests/011.phpt
  11. 5
      ext/mysqli/tests/012.phpt
  12. 5
      ext/mysqli/tests/013.phpt
  13. 19
      ext/mysqli/tests/014.phpt
  14. 49
      ext/mysqli/tests/015.phpt
  15. 8
      ext/mysqli/tests/017.phpt
  16. 27
      ext/mysqli/tests/019.phpt
  17. 1
      ext/mysqli/tests/020.phpt
  18. 5
      ext/mysqli/tests/021.phpt
  19. 5
      ext/mysqli/tests/022.phpt
  20. 5
      ext/mysqli/tests/023.phpt
  21. 5
      ext/mysqli/tests/024.phpt
  22. 5
      ext/mysqli/tests/025.phpt
  23. 6
      ext/mysqli/tests/026.phpt
  24. 11
      ext/mysqli/tests/029.phpt
  25. 8
      ext/mysqli/tests/030.phpt
  26. 6
      ext/mysqli/tests/031.phpt
  27. 11
      ext/mysqli/tests/032.phpt
  28. 6
      ext/mysqli/tests/036.phpt
  29. 7
      ext/mysqli/tests/037.phpt
  30. 9
      ext/mysqli/tests/038.phpt
  31. 4
      ext/mysqli/tests/039.phpt
  32. 10
      ext/mysqli/tests/040.phpt
  33. 7
      ext/mysqli/tests/042.phpt
  34. 7
      ext/mysqli/tests/043.phpt
  35. 7
      ext/mysqli/tests/046.phpt
  36. 3
      ext/mysqli/tests/047.phpt
  37. 7
      ext/mysqli/tests/048.phpt
  38. 2
      ext/mysqli/tests/061.phpt

5
ext/mysqli/tests/002.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_result 1
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -42,6 +42,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
@mysqli_query($link, "DROP TABLE IF EXISTS test_fetch_null");
mysqli_close($link);
print "done!";
?>

1
ext/mysqli/tests/003.phpt
View File

@ -68,6 +68,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
mysqli_close($link);
print "done!";
?>

9
ext/mysqli/tests/004.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli fetch char/text
mysqli fetch char/text
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
printf("[001] [%d] string\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text) ENGINE=" . $engine))
printf("[002] [%d] string\n", mysqli_errno($link), mysqli_error($link));
@ -43,6 +43,7 @@ require_once('skipifconnectfailure.inc');
}
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

11
ext/mysqli/tests/005.phpt
View File

@ -1,20 +1,20 @@
--TEST--
mysqli fetch char/text long
mysqli fetch char/text long
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 char(10), c2 text) ENGINE=" . $engine))
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@ -33,6 +33,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/006.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli fetch long values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/007.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli fetch short values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/008.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli fetch tinyint values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

2
ext/mysqli/tests/009.phpt
View File

@ -73,6 +73,8 @@ mysqli fetch bigint values (ok to fail with 4.1.x)
echo $c1, "\n", $c2, "\n";
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch_uint");
mysqli_close($link);
print "done!";
?>

11
ext/mysqli/tests/010.phpt
View File

@ -3,14 +3,14 @@ mysqli fetch float values
--INI--
precision=12
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@ -19,13 +19,13 @@ require_once('skipifconnectfailure.inc');
if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch"))
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$rc = mysqli_query($link, "CREATE TABLE test_bind_fetch(c1 float(3),
c2 float,
c3 float unsigned,
c4 float,
c5 float,
c6 float,
c6 float,
c7 float(10) unsigned) ENGINE=" . $engine);
if (!$rc)
printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@ -44,6 +44,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

15
ext/mysqli/tests/011.phpt
View File

@ -3,24 +3,24 @@ mysqli fetch mixed values
--INI--
precision=12
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result"))
printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint,
c3 int, c4 bigint,
$rc = mysqli_query($link, "CREATE TABLE test_bind_result(c1 tinyint, c2 smallint,
c3 int, c4 bigint,
c5 float, c6 double,
c7 varbinary(10),
c7 varbinary(10),
c8 varchar(50)) ENGINE=" . $engine);
if (!$rc)
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
@ -30,7 +30,7 @@ require_once('skipifconnectfailure.inc');
'foobar','mysql rulez')");
if (!$rc)
printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8);
mysqli_execute($stmt);
@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/012.phpt
View File

@ -3,8 +3,8 @@ mysqli fetch mixed values 2
--INI--
precision=12
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -40,6 +40,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/013.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli fetch mixed / mysql_query (may fail when using 4.1 library with 5.x server)
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -52,6 +52,7 @@ require_once('skipifconnectfailure.inc');
else
echo "error";
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
mysqli_close($link);
print "done!";
?>

19
ext/mysqli/tests/014.phpt
View File

@ -27,28 +27,28 @@ mysqli autocommit/commit/rollback
if (!mysqli_autocommit($link, TRUE))
printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "DROP TABLE IF EXISTS ac_01"))
if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "CREATE TABLE ac_01(a int, b varchar(10)) type=InnoDB"))
if (!mysqli_query($link, "CREATE TABLE test(a int, b varchar(10)) engine=InnoDB"))
printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')"))
if (!mysqli_query($link, "INSERT INTO test VALUES (1, 'foobar')"))
printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_autocommit($link, FALSE))
printf("[005] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "DELETE FROM ac_01"))
if (!mysqli_query($link, "DELETE FROM test"))
printf("[006] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"))
if (!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
printf("[007] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_rollback($link))
printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!$result = mysqli_query($link, "SELECT * FROM ac_01"))
if (!$result = mysqli_query($link, "SELECT * FROM test"))
printf("[009] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
printf("Num_of_rows=%d\n", mysqli_num_rows($result));
@ -59,16 +59,16 @@ mysqli autocommit/commit/rollback
var_dump($row);
if (!mysqli_query($link, "DELETE FROM ac_01"))
if (!mysqli_query($link, "DELETE FROM test"))
printf("[011] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')"))
if (!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_commit($link))
printf("[012] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!$result = mysqli_query($link, "SELECT * FROM ac_01"))
if (!$result = mysqli_query($link, "SELECT * FROM test"))
printf("[013] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!$row = mysqli_fetch_row($result))
@ -78,6 +78,7 @@ mysqli autocommit/commit/rollback
var_dump($row);
mysqli_query($link, "DROP TABLE IF EXISTS test");
mysqli_close($link);
print "done!";
?>

49
ext/mysqli/tests/015.phpt
View File

@ -20,39 +20,60 @@ mysqli autocommit/commit/rollback with innodb
include "connect.inc";
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!$link)
printf("[001] Cannot connect, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
mysqli_select_db($link, $db);
if (!mysqli_select_db($link, $db))
printf("[002] Cannot select DB '%s', [%d] %s\n", $db,
mysqli_errno($link), mysqli_error($link));
mysqli_autocommit($link, TRUE);
if (!mysqli_autocommit($link, TRUE))
printf("[003] Cannot turn on autocommit mode, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_query($link,"DROP TABLE IF EXISTS ac_01");
if (!mysqli_query($link,"DROP TABLE IF EXISTS test") ||
!mysqli_query($link,"CREATE TABLE test(a int, b varchar(10)) Engine=InnoDB") ||
!mysqli_query($link, "INSERT INTO test VALUES (1, 'foobar')"))
printf("[004] Cannot create test data, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) Engine=InnoDB");
if (!mysqli_autocommit($link, FALSE))
printf("[005] Cannot turn off autocommit mode, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')");
mysqli_autocommit($link, FALSE);
if (!mysqli_query($link, "DELETE FROM test") ||
!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
printf("[006] Cannot modify test data, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_query($link, "DELETE FROM ac_01");
mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')");
if (!mysqli_rollback($link))
printf("[007] Cannot call rollback, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_rollback($link);
$result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM ac_01");
$result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM test");
if (!$result)
printf("[008] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$row = mysqli_fetch_row($result);
mysqli_free_result($result);
var_dump($row);
mysqli_query($link, "DELETE FROM ac_01");
mysqli_query($link, "INSERT INTO ac_01 VALUES (2, 'egon')");
if (!mysqli_query($link, "DELETE FROM test") ||
!mysqli_query($link, "INSERT INTO test VALUES (2, 'egon')"))
printf("[009] Cannot modify test data, [%d] %s\n",
mysqli_errno($link), mysqli_error($link));
mysqli_commit($link);
$result = mysqli_query($link, "SELECT * FROM ac_01");
$result = mysqli_query($link, "SELECT * FROM test");
if (!$result)
printf("[010] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$row = mysqli_fetch_row($result);
mysqli_free_result($result);
var_dump($row);
mysqli_query($link, "DROP TABLE IF EXISTS test");
mysqli_close($link);
print "done!";
?>

8
ext/mysqli/tests/017.phpt
View File

@ -1,7 +1,7 @@
--TEST--
mysqli fetch functions
mysqli fetch functions
--SKIPIF--
<?php
<?php
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
@ -9,14 +9,14 @@ require_once('skipifconnectfailure.inc');
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!$stmt = mysqli_prepare($link, "SELECT md5('bar'), database(), 'foo'"))
printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
mysqli_bind_result($stmt, $c0, $c1, $c2);
mysqli_bind_result($stmt, $c0, $c1, $c2);
mysqli_execute($stmt);
mysqli_fetch($stmt);

27
ext/mysqli/tests/019.phpt
View File

@ -1,14 +1,14 @@
--TEST--
mysqli fetch (bind_param + bind_result)
mysqli fetch (bind_param + bind_result)
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@ -16,18 +16,18 @@ require_once('skipifconnectfailure.inc');
printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
$rc = mysqli_query($link,"CREATE TABLE insert_read(col1 tinyint, col2 smallint,
col3 int, col4 bigint,
col3 int, col4 bigint,
col5 float, col6 double,
col7 date, col8 time,
col9 varbinary(10),
col7 date, col8 time,
col9 varbinary(10),
col10 varchar(50),
col11 char(20)) ENGINE=" . $engine);
if (!$rc)
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!$stmt = mysqli_prepare($link, "INSERT INTO insert_read(col1,col10, col11, col6) VALUES(?,?,?,?)"))
if (!$stmt = mysqli_prepare($link, "INSERT INTO insert_read(col1,col10, col11, col6) VALUES (?,?,?,?)"))
printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
mysqli_bind_param($stmt, "issd", $c1, $c2, $c3, $c4);
$c1 = 1;
@ -38,10 +38,10 @@ require_once('skipifconnectfailure.inc');
mysqli_execute($stmt);
mysqli_stmt_close($stmt);
if (!$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 from insert_read"))
if (!$stmt = mysqli_prepare($link, "SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11 FROM insert_read"))
printf("[004] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
mysqli_execute($stmt);
mysqli_fetch($stmt);
@ -51,6 +51,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS insert_read");
mysqli_close($link);
print "done!";
?>

1
ext/mysqli/tests/020.phpt
View File

@ -66,6 +66,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_result");
mysqli_close($link);
print "done!";

5
ext/mysqli/tests/021.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param+bind_result char/text
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -34,6 +34,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/022.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_result char/text long
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -38,6 +38,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";

5
ext/mysqli/tests/023.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_prepare fetch long values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -47,6 +47,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";

5
ext/mysqli/tests/024.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_result short values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -48,6 +48,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
?>

5
ext/mysqli/tests/025.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_result tinyint values
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -52,6 +52,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";

6
ext/mysqli/tests/026.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_param/bind_result with send_long_data
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -40,7 +40,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!";
--EXPECTF--

11
ext/mysqli/tests/029.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_affected_rows
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -14,14 +14,15 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "drop table if exists general_test");
mysqli_query($link, "create table general_test (a int)");
mysqli_query($link, "insert into general_test values (1),(2),(3)");
mysqli_query($link, "DROP TABLE IF EXISTS exists general_test");
mysqli_query($link, "CREATE TABLE general_test (a INT)");
mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)");
$afc = mysqli_affected_rows($link);
var_dump($afc);
mysqli_query($link, "DROP TABLE IF EXISTS exists general_test");
mysqli_close($link);
print "done!";
?>

8
ext/mysqli/tests/030.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_errno
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -14,9 +14,9 @@ require_once('skipifconnectfailure.inc');
$errno = mysqli_errno($link);
var_dump($errno);
mysqli_select_db($link, "test");
mysqli_select_db($link, $db);
mysqli_query($link, "select * from non_exisiting_table");
mysqli_query($link, "SELECT * FROM non_exisiting_table");
$errno = mysqli_errno($link);
var_dump($errno);

6
ext/mysqli/tests/031.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_error
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "select * from non_exisiting_table");
mysqli_query($link, "SELECT * FROM non_exisiting_table");
$error = mysqli_error($link);
var_dump($error);

11
ext/mysqli/tests/032.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_info
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -14,14 +14,15 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "drop table if exists general_test");
mysqli_query($link, "create table general_test (a int)");
mysqli_query($link, "insert into general_test values (1),(2),(3)");
mysqli_query($link, "DROP TABLE IF EXISTS general_test");
mysqli_query($link, "CREATE TABLE general_test (a INT)");
mysqli_query($link, "INSERT INTO general_test VALUES (1),(2),(3)");
$afc = mysqli_info($link);
var_dump($afc);
mysqli_query($link, "DROP TABLE IF EXISTS general_test");
mysqli_close($link);
print "done!";
?>

6
ext/mysqli/tests/036.phpt
View File

@ -11,7 +11,6 @@ function test: mysqli_insert_id()
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
@ -20,9 +19,7 @@ function test: mysqli_insert_id()
mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS t036");
mysqli_query($link, "CREATE TABLE t036 (a bigint not null auto_increment primary key, b varchar(10))");
mysqli_query($link, "CREATE TABLE t036 (a bigint not null auto_increment primary key, b varchar(10)) ENGINE = " . $engine);
mysqli_query($link, "INSERT INTO t036 (b) VALUES ('foo1')");
$test[] = mysqli_insert_id($link);
@ -41,6 +38,7 @@ function test: mysqli_insert_id()
var_dump($test);
mysqli_query($link, "DROP TABLE IF EXISTS t036");
mysqli_close($link);
print "done!";
?>

7
ext/mysqli/tests/037.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_field_count()
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE = " . $engine);
mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
$ir[] = mysqli_field_count($link);
@ -28,6 +28,7 @@ require_once('skipifconnectfailure.inc');
var_dump($ir);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_close($link);
print "done!";
?>

9
ext/mysqli/tests/038.phpt
View File

@ -1,15 +1,15 @@
--TEST--
function test: mysqli_num_fields()
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@ -17,7 +17,7 @@ require_once('skipifconnectfailure.inc');
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE = " . $engine);
mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
@ -30,6 +30,7 @@ require_once('skipifconnectfailure.inc');
var_dump($num);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_close($link);
?>
--EXPECT--

4
ext/mysqli/tests/039.phpt
View File

@ -1,8 +1,8 @@
--TEST--
function test: mysqli_num_fields() 2
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--

10
ext/mysqli/tests/040.phpt
View File

@ -1,13 +1,12 @@
--TEST--
function test: mysqli_num_rows()
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
include "connect.inc";
/*** test mysqli_connect 127.0.0.1 ***/
@ -16,9 +15,7 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10))");
mysqli_query($link, "CREATE TABLE test_result (a int, b varchar(10)) ENGINE=" . $engine);
mysqli_query($link, "INSERT INTO test_result VALUES (1, 'foo')");
mysqli_real_query($link, "SELECT * FROM test_result");
@ -30,6 +27,7 @@ require_once('skipifconnectfailure.inc');
var_dump($num);
mysqli_query($link, "DROP TABLE IF EXISTS test_result");
mysqli_close($link);
print "done!";
?>

7
ext/mysqli/tests/042.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli_fetch_object
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -22,7 +22,7 @@ require_once('skipifconnectfailure.inc');
c4 smallint,
c5 smallint,
c6 smallint unsigned,
c7 smallint)");
c7 smallint) ENGINE=" . $engine);
$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?,?,?,?,?,?)");
mysqli_bind_param($stmt, "iiiiiii", $c1,$c2,$c3,$c4,$c5,$c6,$c7);
@ -44,6 +44,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_query($link, "DROP TABLE IF EXISTS test_bind_fetch");
mysqli_close($link);
print "done!"
?>

7
ext/mysqli/tests/043.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli_bind_param (UPDATE)
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -16,7 +16,7 @@ require_once('skipifconnectfailure.inc');
mysqli_query($link,"DROP TABLE IF EXISTS test_update");
mysqli_query($link,"CREATE TABLE test_update(a varchar(10),
b int)");
b int) ENGINE=" . $engine);
mysqli_query($link, "INSERT INTO test_update VALUES ('foo', 2)");
@ -36,6 +36,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
mysqli_query($link, "DROP TABLE IF EXISTS test_update");
mysqli_close($link);
print "done!";
?>

7
ext/mysqli/tests/046.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli_stmt_affected_rows (delete)
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
mysqli_query($link, "CREATE TABLE test_affected (foo int)");
mysqli_query($link, "CREATE TABLE test_affected (foo int) ENGINE=" . $engine);
mysqli_query($link, "INSERT INTO test_affected VALUES (1),(2),(3),(4),(5)");
@ -30,6 +30,7 @@ require_once('skipifconnectfailure.inc');
mysqli_stmt_close($stmt);
var_dump($x==1);
mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
mysqli_close($link);
print "done!";
?>

3
ext/mysqli/tests/047.phpt
View File

@ -15,7 +15,7 @@ require_once('skipifconnectfailure.inc');
mysqli_select_db($link, $db);
mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10) character set latin1)");
mysqli_query($link, "CREATE TABLE test_affected (foo int, bar varchar(10) character set latin1) ENGINE=" . $engine);
mysqli_query($link, "INSERT INTO test_affected VALUES (1, 'Zak'),(2, 'Greant')");
@ -41,6 +41,7 @@ require_once('skipifconnectfailure.inc');
mysqli_stmt_close($stmt);
mysqli_query($link, "DROP TABLE IF EXISTS test_affected");
mysqli_close($link);
print "done!";
?>

7
ext/mysqli/tests/048.phpt
View File

@ -1,8 +1,8 @@
--TEST--
mysqli bind_result (OO-Style)
--SKIPIF--
<?php
require_once('skipif.inc');
<?php
require_once('skipif.inc');
require_once('skipifconnectfailure.inc');
?>
--FILE--
@ -21,7 +21,7 @@ require_once('skipifconnectfailure.inc');
col7 date, col8 time,
col9 varbinary(10),
col10 varchar(50),
col11 char(20))");
col11 char(20)) ENGINE=" . $engine);
$mysql->query("INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1', 1000),(2,'foo2', 88),(3,'foo3', 389789)");
@ -36,6 +36,7 @@ require_once('skipifconnectfailure.inc');
var_dump($test);
$stmt->close();
$mysql->query("DROP TABLE IF EXISTS test_fetch_null");
$mysql->close();
print "done!";
?>

2
ext/mysqli/tests/061.phpt
View File

@ -20,7 +20,7 @@ if (!function_exists('mysqli_set_local_infile_handler'))
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
/* create temporary file */
$filename = dirname(__FILE__) . "/061.csv";
$filename = dirname(__FILE__) . "061.csv";
$fp = fopen($filename, "w");
fwrite($fp, b"foo;bar");
fclose($fp);

Write Preview
Loading…
Cancel
Save