svn: /pecl/mysqlnd_ms/trunk/tests/ mysqlnd_ms_pick_ro_user_multi_no_master_non_lazy.phpt mysqlnd_ms_pick_rr_user_multi_no_master_non_lazy.phpt

uw Mon, 12 Dec 2011 17:16:22 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=320917 Log: Make sure tests don't differ but for LB setting and - jippie - PASS Changed paths: U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_ro_user_multi_no_master_non_lazy.phpt U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master_non_lazy.phpt Modified: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_ro_user_multi_no_master_non_lazy.phpt =================================================================== --- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_ro_user_multi_no_master_non_lazy.phpt 2011-12-12 16:57:38 UTC (rev 320916) +++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_ro_user_multi_no_master_non_lazy.phpt 2011-12-12 17:16:22 UTC (rev 320917) @@ -30,11 +30,12 @@ <?php require_once("connect.inc"); require_once("util.inc"); + set_error_handler('mst_error_handler'); function pick_servers($connected_host, $query, $masters, $slaves, $last_used_connection, $in_transaction) { printf("pick_server('%s', '%s, '%s')\n", $connected_host, $query, $last_used_connection); /* array(master_array(master_idx, master_idx), slave_array(slave_idx, slave_idx)) */ - return array(array(), array(0)); + return array(NULL, array(0)); } if (!$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket)) @@ -53,10 +54,8 @@ ?> --EXPECTF-- pick_server('myapp', '/*ms=master*//*2*/SELECT 1 FROM DUAL, '') +[E_RECOVERABLE_ERROR] mysqli::query(): (mysqlnd_ms) User multi filter callback has returned an invalid list of servers to use. The callback must return an array in %s on line %d +[E_WARNING] mysqli::query(): (mysqlnd_ms) Couldn't find the appropriate master connection. Something is wrong in %s on line %d +[002] [2000] (mysqlnd_ms) Couldn't find the appropriate master connection. Something is wrong -Warning: mysqli::query(): (mysqlnd_ms) Couldn't find the appropriate master connection. 0 masters to choose from. Something is wrong in %s on line %d - -Warning: mysqli::query(): (mysqlnd_ms) No connection selected by the last filter in %s on line %d -[002] [2000] (mysqlnd_ms) No connection selected by the last filter - -Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line 16 \ No newline at end of file +Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d \ No newline at end of file Modified: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master_non_lazy.phpt =================================================================== --- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master_non_lazy.phpt 2011-12-12 16:57:38 UTC (rev 320916) +++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master_non_lazy.phpt 2011-12-12 17:16:22 UTC (rev 320917) @@ -54,10 +54,8 @@ ?> --EXPECTF-- pick_server('myapp', '/*ms=master*//*2*/SELECT 1 FROM DUAL, '') +[E_RECOVERABLE_ERROR] mysqli::query(): (mysqlnd_ms) User multi filter callback has returned an invalid list of servers to use. The callback must return an array in %s on line %d +[E_WARNING] mysqli::query(): (mysqlnd_ms) Couldn't find the appropriate master connection. Something is wrong in %s on line %d +[002] [2000] (mysqlnd_ms) Couldn't find the appropriate master connection. Something is wrong -Warning: mysqli::query(): (mysqlnd_ms) Couldn't find the appropriate master connection. 0 masters to choose from. Something is wrong in %s on line %d - -Warning: mysqli::query(): (mysqlnd_ms) No connection selected by the last filter in %s on line %d -[002] [2000] (mysqlnd_ms) No connection selected by the last filter - -Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line 16 \ No newline at end of file +Fatal error: Call to a member function fetch_assoc() on a non-object in %s on line %d \ No newline at end of file