clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing test: it didn't do a select_db and gave a false-positive with libmysql

Browse Source
This commit is contained in:
Ulf Wendel 2009-11-05 11:51:21 +00:00
parent c4b9737695
commit ea3ef35f19
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/mysql/tests/connect.inc
View File

@ -21,7 +21,7 @@ if (!function_exists('sys_get_temp_dir')) {
if (!function_exists('my_mysql_connect')) {
/* wrapper to simplify test porting */
function my_mysql_connect($host, $user, $passwd, $db, $port, $socket, $flags = NULL) {
function my_mysql_connect($host, $user, $passwd, $db, $port, $socket, $flags = NULL, $persistent = false) {
global $connect_flags;
$flags = ($flags === NULL) ? $connect_flags : $flags;
@ -31,9 +31,15 @@ if (!function_exists('my_mysql_connect')) {
else if ($port)
$host = sprintf("%s:%s", $host, $port);
if (!$link = mysql_connect($host, $user, $passwd, true, $flags)) {
printf("[000-a] Cannot connect using host '%s', user '%s', password '****', [%d] %s\n",
$host, $user, $passwd,
if ($persistent) {
$link = mysql_pconnect($host, $user, $passwd, $flags);
} else {
$link = mysql_connect($host, $user, $passwd, true, $flags);
}
if (!$link) {
printf("[000-a] Cannot connect using host '%s', user '%s', password '****', persistent = %d, [%d] %s\n",
$host, $user, ($persistent) ? 1 : 0,
mysql_errno(), mysql_error());
return false;
}

16
ext/mysql/tests/mysql_pconn_disable.phpt
View File

@ -13,19 +13,11 @@ mysql.max_links=2
<?php
require_once("connect.inc");
require_once("table.inc");
// assert(ini_get('mysql.allow_persistent') == false);
if ($socket)
$myhost = sprintf("%s:%s", $host, $socket);
else if ($port)
$myhost = sprintf("%s:%s", $host, $port);
else
$myhost = $host;
if (($plink = mysql_pconnect($myhost, $user, $passwd)))
if (($plink = my_mysql_connect($host, $user, $passwd, $db, $port, $socket, NULL, true)))
printf("[001] Can connect to the server.\n");
if (($res = @mysql_query('SELECT id FROM test ORDER BY id ASC', $plink)) &&
if (($res = mysql_query('SELECT id FROM test ORDER BY id ASC', $plink)) &&
($row = mysql_fetch_assoc($res)) &&
(mysql_free_result($res))) {
printf("[002] Can fetch data using persistent connection! Data = '%s'\n",
@ -35,7 +27,7 @@ mysql.max_links=2
$thread_id = mysql_thread_id($plink);
mysql_close($plink);
if (!($plink = mysql_pconnect($myhost, $user, $passwd)))
if (!($plink = my_mysql_connect($host, $user, $passwd, $db, $port, $socket, NULL, true)))
printf("[003] Cannot connect, [%d] %s\n", mysql_errno(), mysql_error());
if (mysql_thread_id($plink) != $thread_id)
@ -44,7 +36,7 @@ mysql.max_links=2
$thread_id = mysql_thread_id($plink);
mysql_close($plink);
if (!($plink = mysql_connect($myhost, $user, $passwd, true)))
if (!($plink = my_mysql_connect($host, $user, $passwd, $db, $port, $socket)))
printf("[005] Cannot connect, [%d] %s\n", mysql_errno(), mysql_error());
if (mysql_thread_id($plink) == $thread_id)