e78bd7718ab7cc4bebd0c827d1f04cc56cdc1485 galt Sun Aug 17 11:24:41 2014 -0700 oops that would not work anyways diff --git src/hg/lib/sqlProg.c src/hg/lib/sqlProg.c index e974c37..0740353 100644 --- src/hg/lib/sqlProg.c +++ src/hg/lib/sqlProg.c @@ -205,32 +205,30 @@ pid_t child_id; char **nargv, defaultFileName[256], defaultFileArg[256], *homeDir; // install cleanup signal handlers sqlProgInitSigHandlers(); /* Assemble defaults file */ if ((homeDir = getenv("HOME")) == NULL) errAbort("sqlExecProgProfile: HOME is not defined in environment; cannot create temporary password file"); nukeOldCnfs(homeDir); safef(defaultFileName, sizeof(defaultFileName), "%s/.hgsql.cnf-XXXXXX", homeDir); defaultFileNo=sqlMakeDefaultsFile(defaultFileName, profile, "client"); -swapForOldCnf(homeDir, ); - safef(defaultFileArg, sizeof(defaultFileArg), "--defaults-file=%s", defaultFileName); AllocArray(nargv, nargc); nargv[j++] = prog; nargv[j++] = defaultFileArg; /* --defaults-file must come before other options */ if (progArgs != NULL) { for (i = 0; progArgs[i] != NULL; i++) nargv[j++] = progArgs[i]; } for (i = 0; i < userArgc; i++) nargv[j++] = userArgv[i]; nargv[j++] = NULL;