svn: /pecl/mysqlnd_ms/trunk/tests/ mysqlnd_ms_pick_rr_user_multi_no_master.phpt

uw Mon, 12 Dec 2011 17:30:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=320918 Log: Make sure mysqlnd_ms_pick_rr_user_multi_no_master.phpt and mysqlnd_ms_pick_ro_user_multi_no_master.phpt differ in nothing but LB strategy (rr = round robin, ro = random once). The different LB strategies almost given identical error messages for the very same issue. However, the ro message is slighly better. It says 0 master to choose from. Please, make rr say the same. Changed paths: U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt Modified: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt =================================================================== --- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt 2011-12-12 17:16:22 UTC (rev 320917) +++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt 2011-12-12 17:30:04 UTC (rev 320918) @@ -30,12 +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(NULL, array(0)); + return array(array(), array(0)); } if (!$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket))