svn: /pecl/mysqlnd_ms/trunk/ mysqlnd_ms.c
| From: | Andrey Hristov | Date: | Mon, 12 Dec 2011 17:32:58 +0000 |
| Subject: | svn: /pecl/mysqlnd_ms/trunk/ mysqlnd_ms.c | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-17377@lists.php.net to get a copy of this message | ||
andrey Mon, 12 Dec 2011 17:32:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=320919
Log:
force is not good
Changed paths:
U pecl/mysqlnd_ms/trunk/mysqlnd_ms.c
Modified: pecl/mysqlnd_ms/trunk/mysqlnd_ms.c
===================================================================
--- pecl/mysqlnd_ms/trunk/mysqlnd_ms.c 2011-12-12 17:30:04 UTC (rev 320918)
+++ pecl/mysqlnd_ms/trunk/mysqlnd_ms.c 2011-12-12 17:32:58 UTC (rev 320919)
@@ -764,14 +764,6 @@
break;
}
mysqlnd_ms_lb_strategy_setup(&(*conn_data)->stgy, the_section,
&MYSQLND_MS_ERROR_INFO(conn) TSRMLS_CC);
-#ifdef FORCE_FAILOVER_MASTER_WHEN_MULTI_MASTER_AND_NO_SLAVES
- if (MYSQLND_MS_G(multi_master) &&
- zend_llist_count(&(*conn_data)->master_connections) > 1 &&
- 0 == zend_llist_count(&(*conn_data)->slave_connections))
- {
- (*conn_data)->stgy.failover_strategy = SERVER_FAILOVER_MASTER;
- }
-#endif
} while (0);
mysqlnd_ms_config_json_reset_section(the_section, TRUE TSRMLS_CC);