pass port to mysql_connect

Daniel Kinzler · Daniel Kinzler · commit a7b2469fb00e · 2012-01-04T14:52:34.000Z
git-svn-id: https://svn.toolserver.org/svnroot/daniel/duesenstuff/trunk/gpClient@577 9f2c43bc-b3c0-43f4-b155-41619b16f219
diff --git a/python/gp/client.py b/python/gp/client.py
@@ -1301,6 +1301,22 @@ def getProtocolVersion(self):
         
         return self._protocol_version
           
+    def supportsProtocolVersion(self, min_version, max_version = None): #TODO: port to PHP
+        """returns True if the peer's protocol version is at least
+           min_version and, if given, no grater than max_version.
+        """
+        
+        version = self.getProtocolVersion()
+        version = float(version)
+        
+        if min_version and version < min_version:
+            return False
+          
+        if max_version and version > max_version:
+            return False
+            
+        return True
+        
     
     def checkProtocolVersion(self):
         """Can raise a gpProtocolException.
@@ -1309,6 +1325,7 @@ def checkProtocolVersion(self):
         peer is not compatible with MIN_PROTOCOL_VERSION and MAX_PROTOCOL_VERSION.
     
         """
+        
         version = self.getProtocolVersion()
         version = float(version)
         
diff --git a/python/gp/mysql.py b/python/gp/mysql.py
@@ -315,11 +315,11 @@ def set_unbuffered(self, unbuffered ):
 		self.unbuffered = unbuffered
 	
 	
-	def mysql_connect( self, server, username, password, db ):
+	def mysql_connect( self, server, username, password, db, port = 3306 ): 
 		#FIXME: connection charset, etc!
 		
 		#try:
-		self.connection = MySQLdb.connect(host=server, user=username, passwd=password, db = db) 
+		self.connection = MySQLdb.connect(host=server, user=username, passwd=password, db = db, port = port) 
 		
 		#XXX: would be nice to wrap the exception and provide additional info. 
 		#	 but without exception chaining, we lose the traceback. wich is bad.
