Correct windows build

Author: silvakid

driver/mysql_ps_resultset.cpp

@@ -22,8 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-//Prevent windows min() macro
-#define NOMINMAX
 
 
 #include <stdio.h>
@@ -49,6 +47,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mysql_debug.h"
 
+//Prevent windows min() macro
+#undef min
+
 namespace sql
 {
 namespace mysql

driver/mysql_resultset.cpp

@@ -22,8 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-//Prevent windows min() macro
-#define NOMINMAX
 
 
 #include <string.h>
@@ -46,6 +44,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "mysql_debug.h"
 
+//Prevent windows min() macro
+#undef min
+
 namespace sql
 {
 namespace mysql

test/unit/bugs/bugs.cpp

@@ -22,14 +22,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-//Prevent windows min() macro
-#define NOMINMAX
 
 #include "bugs.h"
 #include <sstream>
 #include <limits>
 #include "driver/mysql_error.h"
 
+//Prevent windows min() macro
+#undef min
+
 namespace testsuite
 {
 namespace regression

test/unit/main.cpp

@@ -40,9 +40,9 @@ int main(int argc, char** argv)
 
   Properties defaultStringValues;
 
-  defaultStringValues.insert(Properties::value_type("dbUrl", "tcp://127.0.0.1:3306"));
+  defaultStringValues.insert(Properties::value_type("dbUrl", "tcp://127.0.0.1:13000"));
   defaultStringValues.insert(Properties::value_type("dbUser", "root"));
-  defaultStringValues.insert(Properties::value_type("dbPasswd", "root"));
+  defaultStringValues.insert(Properties::value_type("dbPasswd", ""));
   defaultStringValues.insert(Properties::value_type("dbSchema", "test"));
 
   std::map<String, bool> defaultBoolValues;