Added: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict1.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict1.phpt	                        (rev 0)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict1.phpt	2011-12-07 14:13:56 UTC (rev 320575)
@@ -0,0 +1,62 @@
+--TEST--
+Filter QOS, conflicting config
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once("connect.inc");
+
+_skipif_check_extensions(array("mysqli"));
+
+$settings = array(
+	"myapp" => array(
+		'master' => array(
+			"master1" => array(
+				'host' 		=> $emulated_master_host_only,
+				  'port' 		=> (int)$emulated_master_port,
+				'socket' 	=> $emulated_master_socket,
+			),
+		),
+		'slave' => array(
+			"slave1" => array(
+				'host' 	=> $emulated_slave_host_only,
+				'port' 	=> (int)$emulated_slave_port,
+				'socket' => $emulated_slave_socket,
+			),
+		 ),
+
+		'lazy_connections' => 0,
+
+		'filters' => array(
+			"quality_of_service" => array(
+				"session_consistency" => 1,
+				"eventual_consistency" => 1,
+			),
+			"random" => array("sticky" => 1),
+		),
+	),
+
+);
+if ($error = mst_create_config("test_mysqlnd_ms_filter_qos_config_conflict1.ini", $settings))
+	die(sprintf("SKIP %s\n", $error));
+?>
+--INI--
+mysqlnd_ms.enable=1
+mysqlnd_ms.ini_file=test_mysqlnd_ms_filter_qos_config_conflict1.ini
+--FILE--
+<?php
+	require_once("connect.inc");
+	require_once("util.inc");
+
+	$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket);
+	if (mysqli_connect_errno()) {
+		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
+	print "done!";
+?>
+--CLEAN--
+<?php
+	if (!unlink("test_mysqlnd_ms_filter_qos_config_conflict1.ini"))
+	  printf("[clean] Cannot unlink ini file 'test_mysqlnd_ms_filter_qos_config_conflict1.ini'.\n");
+?>
+--EXPECTF--
+Fatal error: mysqli_real_connect(): (mysqlnd_ms) Error by creating filter 'quality_of_service', 'eventual_consistency' clashes with previous setting. Stopping. in %s on line %d
\ No newline at end of file

Added: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict2.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict2.phpt	                        (rev 0)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict2.phpt	2011-12-07 14:13:56 UTC (rev 320575)
@@ -0,0 +1,62 @@
+--TEST--
+Filter QOS, conflicting config
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once("connect.inc");
+
+_skipif_check_extensions(array("mysqli"));
+
+$settings = array(
+	"myapp" => array(
+		'master' => array(
+			"master1" => array(
+				'host' 		=> $emulated_master_host_only,
+				  'port' 		=> (int)$emulated_master_port,
+				'socket' 	=> $emulated_master_socket,
+			),
+		),
+		'slave' => array(
+			"slave1" => array(
+				'host' 	=> $emulated_slave_host_only,
+				'port' 	=> (int)$emulated_slave_port,
+				'socket' => $emulated_slave_socket,
+			),
+		 ),
+
+		'lazy_connections' => 0,
+
+		'filters' => array(
+			"quality_of_service" => array(
+				"session_consistency" => 1,
+				"strong_consistency" => 1,
+			),
+			"random" => array("sticky" => 1),
+		),
+	),
+
+);
+if ($error = mst_create_config("test_mysqlnd_ms_filter_qos_config_conflict2.ini", $settings))
+	die(sprintf("SKIP %s\n", $error));
+?>
+--INI--
+mysqlnd_ms.enable=1
+mysqlnd_ms.ini_file=test_mysqlnd_ms_filter_qos_config_conflict2.ini
+--FILE--
+<?php
+	require_once("connect.inc");
+	require_once("util.inc");
+
+	$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket);
+	if (mysqli_connect_errno()) {
+		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
+	print "done!";
+?>
+--CLEAN--
+<?php
+	if (!unlink("test_mysqlnd_ms_filter_qos_config_conflict2.ini"))
+	  printf("[clean] Cannot unlink ini file 'test_mysqlnd_ms_filter_qos_config_conflict2.ini'.\n");
+?>
+--EXPECTF--
+Fatal error: mysqli_real_connect(): (mysqlnd_ms) Error by creating filter 'quality_of_service', 'session_consistency' clashes with previous setting. Stopping. in %s on line %d
\ No newline at end of file

Added: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict3.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict3.phpt	                        (rev 0)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict3.phpt	2011-12-07 14:13:56 UTC (rev 320575)
@@ -0,0 +1,62 @@
+--TEST--
+Filter QOS, conflicting config
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once("connect.inc");
+
+_skipif_check_extensions(array("mysqli"));
+
+$settings = array(
+	"myapp" => array(
+		'master' => array(
+			"master1" => array(
+				'host' 		=> $emulated_master_host_only,
+				  'port' 		=> (int)$emulated_master_port,
+				'socket' 	=> $emulated_master_socket,
+			),
+		),
+		'slave' => array(
+			"slave1" => array(
+				'host' 	=> $emulated_slave_host_only,
+				'port' 	=> (int)$emulated_slave_port,
+				'socket' => $emulated_slave_socket,
+			),
+		 ),
+
+		'lazy_connections' => 0,
+
+		'filters' => array(
+			"quality_of_service" => array(
+				"strong_consistency" => 1,
+				"session_consistency" => 1,
+			),
+			"random" => array("sticky" => 1),
+		),
+	),
+
+);
+if ($error = mst_create_config("test_mysqlnd_ms_filter_qos_config_conflict3.ini", $settings))
+	die(sprintf("SKIP %s\n", $error));
+?>
+--INI--
+mysqlnd_ms.enable=1
+mysqlnd_ms.ini_file=test_mysqlnd_ms_filter_qos_config_conflict3.ini
+--FILE--
+<?php
+	require_once("connect.inc");
+	require_once("util.inc");
+
+	$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket);
+	if (mysqli_connect_errno()) {
+		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
+	print "done!";
+?>
+--CLEAN--
+<?php
+	if (!unlink("test_mysqlnd_ms_filter_qos_config_conflict3.ini"))
+	  printf("[clean] Cannot unlink ini file 'test_mysqlnd_ms_filter_qos_config_conflict3.ini'.\n");
+?>
+--EXPECTF--
+Fatal error: mysqli_real_connect(): (mysqlnd_ms) Error by creating filter 'quality_of_service', 'session_consistency' clashes with previous setting. Stopping. in %s on line %d
\ No newline at end of file

Added: pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict4.phpt
===================================================================
--- pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict4.phpt	                        (rev 0)
+++ pecl/mysqlnd_ms/trunk/tests/mysqlnd_ms_filter_qos_config_conflict4.phpt	2011-12-07 14:13:56 UTC (rev 320575)
@@ -0,0 +1,62 @@
+--TEST--
+Filter QOS, conflicting config
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+require_once("connect.inc");
+
+_skipif_check_extensions(array("mysqli"));
+
+$settings = array(
+	"myapp" => array(
+		'master' => array(
+			"master1" => array(
+				'host' 		=> $emulated_master_host_only,
+				  'port' 		=> (int)$emulated_master_port,
+				'socket' 	=> $emulated_master_socket,
+			),
+		),
+		'slave' => array(
+			"slave1" => array(
+				'host' 	=> $emulated_slave_host_only,
+				'port' 	=> (int)$emulated_slave_port,
+				'socket' => $emulated_slave_socket,
+			),
+		 ),
+
+		'lazy_connections' => 0,
+
+		'filters' => array(
+			"quality_of_service" => array(
+				"eventual_consistency" => 1,
+				"strong_consistency" => 1,
+			),
+			"random" => array("sticky" => 1),
+		),
+	),
+
+);
+if ($error = mst_create_config("test_mysqlnd_ms_filter_qos_config_conflict4.ini", $settings))
+	die(sprintf("SKIP %s\n", $error));
+?>
+--INI--
+mysqlnd_ms.enable=1
+mysqlnd_ms.ini_file=test_mysqlnd_ms_filter_qos_config_conflict4.ini
+--FILE--
+<?php
+	require_once("connect.inc");
+	require_once("util.inc");
+
+	$link = mst_mysqli_connect("myapp", $user, $passwd, $db, $port, $socket);
+	if (mysqli_connect_errno()) {
+		printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
+	}
+	print "done!";
+?>
+--CLEAN--
+<?php
+	if (!unlink("test_mysqlnd_ms_filter_qos_config_conflict4.ini"))
+	  printf("[clean] Cannot unlink ini file 'test_mysqlnd_ms_filter_qos_config_conflict4.ini'.\n");
+?>
+--EXPECTF--
+Fatal error: mysqli_real_connect(): (mysqlnd_ms) Error by creating filter 'quality_of_service', 'eventual_consistency' clashes with previous setting. Stopping. in %s on line %d
\ No newline at end of file