[gnue] r8144 - trunk/gnue-common/src/datasources/drivers/sql/mysql

[johannes]

Author: johannes
Date: 2006-01-27 04:29:39 -0600 (Fri, 27 Jan 2006)
New Revision: 8144

Modified:
   trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
Log:
Use a set of credentials for grant-commands too


Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py     
2006-01-27 09:45:09 UTC (rev 8143)
+++ trunk/gnue-common/src/datasources/drivers/sql/mysql/Behavior.py     
2006-01-27 10:29:39 UTC (rev 8144)
@@ -108,10 +108,12 @@
            'user': username,
            'pass': password and "IDENTIFIED BY '%s'" % password or ""}
 
-    grant = 'mysql %(host)s%(port)s -e "%(sql)s" -s %(db)s' \
+    grant = 'mysql %(host)s%(port)s%(user)s%(pass)s -e "%(sql)s" -s %(db)s' \
         % {'sql' : sql,
            'host': host and "--host=%s " % host or '',
            'port': port and "--port=%s " % port or '',
+           'user': username and "--user=%s " % username or '',
+           'pass': password and "--password=%s " % password or '',
            'db'  : dbname}
     os.system (grant)
 
@@ -121,10 +123,12 @@
            'user': username,
            'pass': password and "IDENTIFIED BY '%s'" % password or ""}
 
-    grant = 'mysql %(host)s%(port)s -e "%(sql)s" -s %(db)s' \
+    grant = 'mysql %(host)s%(port)s%(user)s%(pass)s -e "%(sql)s" -s %(db)s' \
         % {'sql' : sql,
            'host': host and "--host=%s " % host or '',
            'port': port and "--port=%s " % port or '',
+           'user': username and "--user=%s " % username or '',
+           'pass': password and "--password=%s " % password or '',
            'db'  : dbname}
 
     os.system (grant)