firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 03:23:03 +01:00
Code Issues

Another fix for the -b (Bail On Error) option when SQL commands are issued and no db connection exists yet.

Browse Source 
Apply Miroslav Penchev's patch for bug with -Q always returning 1 to the operating system, discovered by Ivan Prenosil.
This commit is contained in:
robocop 2005-04-28 06:26:24 +00:00
parent 14ce62fef6
commit 3f68b85b89
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/isql/isql.epp
View File

@ -676,6 +676,10 @@ bool ISQL_dbcheck()
* Check to see if we are connected to a database.
* Return true if connected, false otherwise
*
* Change from miroslavp on 25.04.2005
* Value assigned here on Exit_value is not used anywhere in the source
* and cause isql.exe to return 1 in Quiet mode even there is no error.
* If there is error Exit_value is set by callers - so it is removed from here.
**************************************/
TEXT errbuf[MSG_LENGTH];
@ -684,8 +688,6 @@ bool ISQL_dbcheck()
ISQL_msg_get(NO_DB, errbuf, NULL);
STDERROUT(errbuf);
}
else
Exit_value = FINI_ERROR;
return false;
}
else
@ -3033,7 +3035,10 @@ static void do_isql()
ISQL_msg_get(NO_DB, errbuf, NULL);
STDERROUT(errbuf);
}
ret = SKIP;
if (!Interactive && BailOnError)
ret = FAIL;
else
ret = SKIP;
}
switch (ret) {