[Dbconfig-common-changes] [dbconfig-common] r432 - in trunk: internal test

[Sean Finney]

Author: seanius
Date: 2008-03-29 17:38:28 +0000 (Sat, 29 Mar 2008)
New Revision: 432

Added:
   trunk/test/scripts/
Modified:
   trunk/internal/mysql
Log:
allow interal/common to be sourced from within source package, remove unused $1 in _dbc_mysql_check_connect

Modified: trunk/internal/mysql
===================================================================
--- trunk/internal/mysql	2008-03-29 15:00:23 UTC (rev 431)
+++ trunk/internal/mysql	2008-03-29 17:38:28 UTC (rev 432)
@@ -6,7 +6,7 @@
 ###
 
 # get some common functions
-. /usr/share/dbconfig-common/internal/common
+. ${_dbc_root:-/usr/share/dbconfig-common}/internal/common
 
 ##
 ## pass configuration options securely to the mysql client
@@ -47,10 +47,11 @@
 _dbc_mysql_check_connect(){
 	local constat mycnf
 	constat="bad"
-	mycnf=`_dbc_generate_mycnf $1`
+	mycnf=`_dbc_generate_mycnf`
 	dbc_error=`mysql --defaults-extra-file="$mycnf" </dev/null 2>&1` && constat=good
 	rm -f $mycnf
 	if [ "$constat" = "bad" ]; then
+		dbc_logline "$dbc_error"
 		dbc_logline "unable to connect to mysql server"
 		return 1
 	fi