diff options
Diffstat (limited to 'ext/mysql/tests')
30 files changed, 32 insertions, 29 deletions
diff --git a/ext/mysql/tests/bug55473.phpt b/ext/mysql/tests/bug55473.phpt index 98fd0091dc..7d149dc6fd 100644 --- a/ext/mysql/tests/bug55473.phpt +++ b/ext/mysql/tests/bug55473.phpt @@ -8,6 +8,9 @@ if (defined('PHP_WINDOWS_VERSION_MAJOR')) { die("skip Test doesn't work on Windows"); } +if (!$IS_MYSQLND) + die("skip mysqlnd only, libmysql does not warning about server gone away"); + if (!($output = @exec("lsof -np " . getmypid()))) die("skip Test can't find command line tool lsof"); ?> diff --git a/ext/mysql/tests/mysql_data_seek.phpt b/ext/mysql/tests/mysql_data_seek.phpt index 72d3e63274..268e145842 100644 --- a/ext/mysql/tests/mysql_data_seek.phpt +++ b/ext/mysql/tests/mysql_data_seek.phpt @@ -75,5 +75,5 @@ Warning: mysql_data_seek(): Offset -1 is invalid for MySQL result index %d (or t Warning: mysql_data_seek(): Offset 3 is invalid for MySQL result index %d (or the query data is unbuffered) in %s on line %d -Warning: mysql_data_seek(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_data_seek(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_db_name.phpt b/ext/mysql/tests/mysql_db_name.phpt index 92878e994d..9321701337 100644 --- a/ext/mysql/tests/mysql_db_name.phpt +++ b/ext/mysql/tests/mysql_db_name.phpt @@ -64,5 +64,5 @@ Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in % Warning: mysql_db_name(): Unable to jump to row %d on MySQL result index %d in %s on line %d -Warning: mysql_db_name(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_db_name(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_errno.phpt b/ext/mysql/tests/mysql_errno.phpt index c9c2956290..83aa7327bd 100644 --- a/ext/mysql/tests/mysql_errno.phpt +++ b/ext/mysql/tests/mysql_errno.phpt @@ -59,6 +59,6 @@ Deprecated: mysql_connect(): The mysql extension is deprecated and will be remov int(0) int(%d) -Warning: mysql_errno(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_errno(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_error.phpt b/ext/mysql/tests/mysql_error.phpt index a2cf7e0034..82a43fb7b4 100644 --- a/ext/mysql/tests/mysql_error.phpt +++ b/ext/mysql/tests/mysql_error.phpt @@ -64,6 +64,6 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_error(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_error(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_fetch_array.phpt b/ext/mysql/tests/mysql_fetch_array.phpt index 8ccefd0242..1b1852d932 100644 --- a/ext/mysql/tests/mysql_fetch_array.phpt +++ b/ext/mysql/tests/mysql_fetch_array.phpt @@ -357,5 +357,5 @@ array(11) { Warning: mysql_fetch_array(): The result type should be either MYSQL_NUM, MYSQL_ASSOC or MYSQL_BOTH in %s on line %d -Warning: mysql_fetch_array(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_array(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_fetch_assoc.phpt b/ext/mysql/tests/mysql_fetch_assoc.phpt index 048613a6be..936c7c6f23 100644 --- a/ext/mysql/tests/mysql_fetch_assoc.phpt +++ b/ext/mysql/tests/mysql_fetch_assoc.phpt @@ -87,7 +87,7 @@ array(5) { %unicode|string%(1) "1" } -Warning: mysql_fetch_assoc(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_assoc(): supplied resource is not a valid MySQL result resource in %s on line %d Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d [010] diff --git a/ext/mysql/tests/mysql_fetch_field.phpt b/ext/mysql/tests/mysql_fetch_field.phpt index 85c1fd6f7e..6855fc52dc 100644 --- a/ext/mysql/tests/mysql_fetch_field.phpt +++ b/ext/mysql/tests/mysql_fetch_field.phpt @@ -217,7 +217,7 @@ bool(false) Warning: mysql_fetch_field(): Bad field offset in %s on line %d -Warning: mysql_fetch_field(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_field(): supplied resource is not a valid MySQL result resource in %s on line %d object(stdClass)#%d (13) { [%u|b%"name"]=> %unicode|string%(2) "id" diff --git a/ext/mysql/tests/mysql_fetch_lengths.phpt b/ext/mysql/tests/mysql_fetch_lengths.phpt index f0fbbb7bb8..f59833e918 100644 --- a/ext/mysql/tests/mysql_fetch_lengths.phpt +++ b/ext/mysql/tests/mysql_fetch_lengths.phpt @@ -48,6 +48,6 @@ array(2) { } bool(false) -Warning: mysql_fetch_lengths(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_lengths(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_fetch_object.phpt b/ext/mysql/tests/mysql_fetch_object.phpt index 666d0ee821..5038863458 100644 --- a/ext/mysql/tests/mysql_fetch_object.phpt +++ b/ext/mysql/tests/mysql_fetch_object.phpt @@ -147,7 +147,7 @@ bool(false) bool(false) bool(false) -Warning: mysql_fetch_object(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_object(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) Fatal error: Class 'this_class_does_not_exist' not found in %s on line %d diff --git a/ext/mysql/tests/mysql_fetch_row.phpt b/ext/mysql/tests/mysql_fetch_row.phpt index 0ed932e2c0..d26f7a4d82 100644 --- a/ext/mysql/tests/mysql_fetch_row.phpt +++ b/ext/mysql/tests/mysql_fetch_row.phpt @@ -52,6 +52,6 @@ array(2) { [005] bool(false) -Warning: mysql_fetch_row(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_fetch_row(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_flags.phpt b/ext/mysql/tests/mysql_field_flags.phpt index 5f8eb0995f..cd9e4b5671 100644 --- a/ext/mysql/tests/mysql_field_flags.phpt +++ b/ext/mysql/tests/mysql_field_flags.phpt @@ -152,6 +152,6 @@ Warning: mysql_field_flags(): Field -1 is invalid for MySQL result index %d in % Warning: mysql_field_flags(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_flags(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_flags(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_len.phpt b/ext/mysql/tests/mysql_field_len.phpt index 119d352164..a7b4cabee3 100644 --- a/ext/mysql/tests/mysql_field_len.phpt +++ b/ext/mysql/tests/mysql_field_len.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_len(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_len(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_len(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_len(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_name.phpt b/ext/mysql/tests/mysql_field_name.phpt index 85f6c42d93..1ef613babe 100644 --- a/ext/mysql/tests/mysql_field_name.phpt +++ b/ext/mysql/tests/mysql_field_name.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_name(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_name(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_name(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_name(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_seek.phpt b/ext/mysql/tests/mysql_field_seek.phpt index 8487493a88..a9eab70bca 100644 --- a/ext/mysql/tests/mysql_field_seek.phpt +++ b/ext/mysql/tests/mysql_field_seek.phpt @@ -139,6 +139,6 @@ Warning: mysql_field_seek(): Field %d is invalid for MySQL result index %d in %s bool(false) bool(false) -Warning: mysql_field_seek(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_seek(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_table.phpt b/ext/mysql/tests/mysql_field_table.phpt index 826651a855..d95be96ee5 100644 --- a/ext/mysql/tests/mysql_field_table.phpt +++ b/ext/mysql/tests/mysql_field_table.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_table(): Field -1 is invalid for MySQL result index %d in % Warning: mysql_field_table(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_table(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_table(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_field_type.phpt b/ext/mysql/tests/mysql_field_type.phpt index c767cab6f1..e4b774a691 100644 --- a/ext/mysql/tests/mysql_field_type.phpt +++ b/ext/mysql/tests/mysql_field_type.phpt @@ -55,6 +55,6 @@ Warning: mysql_field_type(): Field -1 is invalid for MySQL result index %d in %s Warning: mysql_field_type(): Field 2 is invalid for MySQL result index %d in %s on line %d -Warning: mysql_field_type(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_field_type(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_free_result.phpt b/ext/mysql/tests/mysql_free_result.phpt index 90498bd59a..582297c80f 100644 --- a/ext/mysql/tests/mysql_free_result.phpt +++ b/ext/mysql/tests/mysql_free_result.phpt @@ -47,6 +47,6 @@ require_once("clean_table.inc"); Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d bool(true) -Warning: mysql_free_result(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_free_result(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_insert_id.phpt b/ext/mysql/tests/mysql_insert_id.phpt index b69a96ae9b..93319dad23 100644 --- a/ext/mysql/tests/mysql_insert_id.phpt +++ b/ext/mysql/tests/mysql_insert_id.phpt @@ -68,6 +68,6 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_insert_id(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_insert_id(): supplied resource is not a valid MySQL-Link resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_num_fields.phpt b/ext/mysql/tests/mysql_num_fields.phpt index 4621dc91f8..f65f8ec165 100644 --- a/ext/mysql/tests/mysql_num_fields.phpt +++ b/ext/mysql/tests/mysql_num_fields.phpt @@ -54,5 +54,5 @@ require_once("clean_table.inc"); --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_num_fields(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_num_fields(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_num_rows.phpt b/ext/mysql/tests/mysql_num_rows.phpt index 5a803d41f9..2b69e939be 100644 --- a/ext/mysql/tests/mysql_num_rows.phpt +++ b/ext/mysql/tests/mysql_num_rows.phpt @@ -85,5 +85,5 @@ Warning: mysql_num_rows() expects parameter 1 to be resource, boolean given in % Warning: mysql_free_result() expects parameter 1 to be resource, boolean given in %s on line %d -Warning: mysql_num_rows(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_num_rows(): supplied resource is not a valid MySQL result resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_ping.phpt b/ext/mysql/tests/mysql_ping.phpt index 0308df3396..2f2c38cd90 100644 --- a/ext/mysql/tests/mysql_ping.phpt +++ b/ext/mysql/tests/mysql_ping.phpt @@ -47,5 +47,5 @@ bool(true) bool(true) bool(true) -Warning: mysql_ping(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_ping(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_query.phpt b/ext/mysql/tests/mysql_query.phpt index 01b14ee284..80b985e099 100644 --- a/ext/mysql/tests/mysql_query.phpt +++ b/ext/mysql/tests/mysql_query.phpt @@ -124,5 +124,5 @@ array(1) { } %unicode|string%(1) "a" -Warning: mysql_query(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_query(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_result.phpt b/ext/mysql/tests/mysql_result.phpt index 0a58b9b883..ae1983fe04 100644 --- a/ext/mysql/tests/mysql_result.phpt +++ b/ext/mysql/tests/mysql_result.phpt @@ -111,6 +111,6 @@ bool(false) Warning: mysql_result(): test.label not found in MySQL result index %d in %s on line %d bool(false) -Warning: mysql_result(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_result(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_select_db.phpt b/ext/mysql/tests/mysql_select_db.phpt index e9bc99aa73..6e0bf9e505 100644 --- a/ext/mysql/tests/mysql_select_db.phpt +++ b/ext/mysql/tests/mysql_select_db.phpt @@ -70,5 +70,5 @@ Deprecated: mysql_connect(): The mysql extension is deprecated and will be remov %unicode|string%(%d) "%s" bool(false) -Warning: mysql_select_db(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_select_db(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_stat.phpt b/ext/mysql/tests/mysql_stat.phpt index d6a34df581..ef5bb45105 100644 --- a/ext/mysql/tests/mysql_stat.phpt +++ b/ext/mysql/tests/mysql_stat.phpt @@ -46,5 +46,5 @@ print "done!"; --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_stat(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_tablename.phpt b/ext/mysql/tests/mysql_tablename.phpt index 4bbe54d443..76007fde46 100644 --- a/ext/mysql/tests/mysql_tablename.phpt +++ b/ext/mysql/tests/mysql_tablename.phpt @@ -51,6 +51,6 @@ Warning: mysql_tablename(): Unable to jump to row -1 on MySQL result index %d in Warning: mysql_tablename(): Unable to jump to row 2 on MySQL result index %d in %s on line %d -Warning: mysql_tablename(): %d is not a valid MySQL result resource in %s on line %d +Warning: mysql_tablename(): supplied resource is not a valid MySQL result resource in %s on line %d bool(false) done! diff --git a/ext/mysql/tests/mysql_thread_id.phpt b/ext/mysql/tests/mysql_thread_id.phpt index aa95d31944..a2e0f934c2 100644 --- a/ext/mysql/tests/mysql_thread_id.phpt +++ b/ext/mysql/tests/mysql_thread_id.phpt @@ -37,5 +37,5 @@ print "done!"; --EXPECTF-- Deprecated: mysql_connect(): The mysql extension is deprecated and will be removed in the future: use mysqli or PDO instead in %s on line %d -Warning: mysql_thread_id(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_thread_id(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/mysql_unbuffered_query.phpt b/ext/mysql/tests/mysql_unbuffered_query.phpt index 8754b58b59..5b10cc41d9 100644 --- a/ext/mysql/tests/mysql_unbuffered_query.phpt +++ b/ext/mysql/tests/mysql_unbuffered_query.phpt @@ -118,5 +118,5 @@ int(0) Notice: mysql_close(): Function called without first fetching all rows from a previous unbuffered query in %s on line %d -Warning: mysql_unbuffered_query(): %d is not a valid MySQL-Link resource in %s on line %d +Warning: mysql_unbuffered_query(): supplied resource is not a valid MySQL-Link resource in %s on line %d done! diff --git a/ext/mysql/tests/setupdefault.inc b/ext/mysql/tests/setupdefault.inc index 6d25c20840..b13402ec14 100644 --- a/ext/mysql/tests/setupdefault.inc +++ b/ext/mysql/tests/setupdefault.inc @@ -3,7 +3,7 @@ // copy variables from connect.inc into mysql default connection ini settings, so that implicit mysql_connect() behaviour can be tested where needed // must be loaded AFTER connect.inc -ini_set('mysql.default_host', $host); +ini_set('mysql.default_host', $host . ":" . $port); ini_set('mysql.default_user', $user); ini_set('mysql.default_password', $passwd); |