9348f62b4a87774f8f0f511ff6568fbb545eddd7 max Wed Sep 11 17:57:35 2013 -0700 adding flag to hg.conf to disable LOCAL in mysql commands entirely diff --git src/hg/lib/jksql.c src/hg/lib/jksql.c index 4882946..bf86ae5 100644 --- src/hg/lib/jksql.c +++ src/hg/lib/jksql.c @@ -1342,31 +1342,32 @@ /* Doing an "alter table disable keys" command implicitly commits the current transaction. Don't want to use that optimization if we need to be transaction safe. */ /* FIXME: markd 2003/01/05: mysql 4.0.17 - the alter table enable keys hangs, * disable this optimization for now. Verify performance on small loads * before re-enabling*/ # if 0 boolean doDisableKeys = !(options & SQL_TAB_TRANSACTION_SAFE); #else boolean doDisableKeys = FALSE; #endif /* determine if tab file can be accessed directly by the database, or send * over the network */ -if ((options & SQL_TAB_FILE_ON_SERVER) && !sqlIsRemote(conn)) +bool sqlNeverLocal = cfgOptionBooleanDefault("sqlNeverLocal", 0); +if (((options & SQL_TAB_FILE_ON_SERVER) && !sqlIsRemote(conn)) | sqlNeverLocal) { /* tab file on server requiries full path */ strcpy(tabPath, ""); if (path[0] != '/') { if (getcwd(tabPath, sizeof(tabPath)) == NULL) errAbort("sqlLoadTableFile: getcwd failed"); strcat(tabPath, "/"); } strcat(tabPath, path); localOpt = ""; } else { strcpy(tabPath, path);