bzr commit into libmysql branch (jimw:2792)

[Jim Winstead]

#At file:///Users/jimw/my/libmysql-1.0/ based on
revid:jimw@stripped

 2792 Jim Winstead	2008-12-16
      Add handling of connection parameters via environment variables for
      testing
modified:
  unittest/libmysql/basic-t.c

=== modified file 'unittest/libmysql/basic-t.c'
--- a/unittest/libmysql/basic-t.c	2008-12-04 20:06:17 +0000
+++ b/unittest/libmysql/basic-t.c	2008-12-16 18:25:17 +0000
@@ -20,6 +20,11 @@
 #include <tap.h>
 #include <mysql.h>
 
+static const char *test_host= NULL, *test_user= NULL,
+                  *test_passwd= NULL, *test_db= "test",
+                  *test_socket= NULL;
+static int test_port= 0;
+
 const char *basic_connect(void)
 {
   MYSQL_ROW row;
@@ -30,7 +35,8 @@ const char *basic_connect(void)
     return "mysql_init() failed";
 
   /* XXX just connects to "test" on default port/socket */
-  if (mysql_real_connect(my, NULL, NULL, NULL, "test", 0, NULL, 0) == NULL)
+  if (mysql_real_connect(my, test_host, test_user, test_passwd, test_db,
+                         test_port, test_socket, 0) == NULL)
     return mysql_error(my);
 
   if (mysql_query(my, "SELECT @@version") != 0)
@@ -60,6 +66,19 @@ main(void)
 {
   const char *result;
 
+  if ((result= getenv("MYSQL_TEST_HOST")))
+    test_host= result;
+  if ((result= getenv("MYSQL_TEST_USER")))
+    test_user= result;
+  if ((result= getenv("MYSQL_TEST_PASSWD")))
+    test_passwd= result;
+  if ((result= getenv("MYSQL_TEST_DB")))
+    test_db= result;
+  if ((result= getenv("MYSQL_TEST_PORT")))
+    test_port= atoi(result);
+  if ((result= getenv("MYSQL_TEST_SOCKET")))
+    test_socket= result;
+
   plan(1);
 
   result= basic_connect();