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

uw Mon, 12 Dec 2011 17:42:15 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=320920 Log: Bye, bye test failure. Now round robin and random give exactly the same error message for exactly the same issue Changed paths: U pecl/mysqlnd_ms/trunk/mysqlnd_ms_filter_round_robin.c U pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt Modified: pecl/mysqlnd_ms/trunk/mysqlnd_ms_filter_round_robin.c =================================================================== --- pecl/mysqlnd_ms/trunk/mysqlnd_ms_filter_round_robin.c 2011-12-12 17:32:58 UTC (rev 320919) +++ pecl/mysqlnd_ms/trunk/mysqlnd_ms_filter_round_robin.c 2011-12-12 17:42:15 UTC (rev 320920) @@ -230,7 +230,7 @@ if (!element) { char error_buf[256]; - snprintf(error_buf, sizeof(error_buf), MYSQLND_MS_ERROR_PREFIX " Couldn't find the appropriate master connection. Something is wrong"); + snprintf(error_buf, sizeof(error_buf), MYSQLND_MS_ERROR_PREFIX " Couldn't find the appropriate master connection. %d masters to choose from. Something is wrong", zend_llist_count(l)); error_buf[sizeof(error_buf) - 1] = '\0'; SET_CLIENT_ERROR((*error_info), CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, error_buf); DBG_ERR_FMT("%s", error_buf); 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:32:58 UTC (rev 320919) +++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_pick_rr_user_multi_no_master.phpt 2011-12-12 17:42:15 UTC (rev 320920) @@ -60,4 +60,4 @@ 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