CORE-5586 (#98)

cincuranet · dyemanov · commit 02e4e83cb143 · 2017-07-19T11:30:39.000+03:00
diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -7704,7 +7704,7 @@ static processing_state print_performance(const SINT64* perf_before)
 	{
 		TEXT report_1[MSG_LENGTH];
 		IUTILS_msg_get(REPORT_NEW1, report_1);
-		// Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time= ~ sec\n
+		// Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time = ~ sec\n
 		diag->assign(report_1);
 
 #ifndef WIN_NT
diff --git a/src/isql/isql.h b/src/isql/isql.h
@@ -140,7 +140,7 @@ const int HLP_QUIT					= 40;		// QUIT -- Exit program and rollback changes\n\n
 const int HLP_ALL					= 41;		// All commands may be abbreviated to letters in CAPs\n
 const int HLP_SETSCHEMA				= 42;		// \tSET SCHema/DB <db name> -- changes current database\n
 const int YES_ANS					= 43;		// Yes
-const int REPORT1					= 44;		// Current memory = !c\nDelta memory = !d\nMax memory = !x\nElapsed time= !e sec\n
+const int REPORT1					= 44;		// Current memory = !c\nDelta memory = !d\nMax memory = !x\nElapsed time = !e sec\n
 #if (defined WIN_NT)
 const int REPORT2					= 93;		// Buffers = !b\nReads = !r\nWrites = !w\nFetches = !f\n
 #else
@@ -255,7 +255,7 @@ const int NO_GRANT_ON_CS			= 177;		// There is no privilege granted on character
 const int NO_GRANT_ON_COLL			= 178;		// There is no privilege granted on collation @1 in this database
 const int NO_GRANT_ON_PKG			= 179;		// There is no privilege granted on package @1 in this database
 const int NO_GRANT_ON_FUN			= 180;		// There is no privilege granted on function @1 in this database
-const int REPORT_NEW1				= 181;		// Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time= ~ sec\n
+const int REPORT_NEW1				= 181;		// Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time = ~ sec\n
 const int REPORT_NEW2				= 182;		// Cpu = ~ sec\n (skipped on windows)
 const int REPORT_NEW3				= 183;		// Buffers = !\nReads = !\nWrites = !\nFetches = !\n
 const int NO_MAP					= 184;		// There is no mapping from @1 in this database
diff --git a/src/msgs/messages2.sql b/src/msgs/messages2.sql
@@ -2934,7 +2934,7 @@ This message begins with a TAB (''\t'') and ends with a newline (''\n'').', 17,
 ('REPORT1', 'process_statement', 'isql.e', 'Each of these 4 items is followed by a newline (''\n'').', 17, 44, NULL, 'Current memory = !c
 Delta memory = !d
 Max memory = !x
-Elapsed time= !e sec
+Elapsed time = !e sec
 ', NULL, NULL);
 ('REPORT2', 'process_statement', 'isql.e', 'Each of these 5 items is followed by a newline (''\n'').', 17, 45, NULL, 'Cpu = !u sec
 Buffers = !b
@@ -3082,7 +3082,7 @@ Fetches = !f', NULL, NULL);
 ('REPORT_NEW1', 'print_performance', 'isql.epp', 'Each of these 4 items is followed by a newline (''\n'').', 17, 181, NULL, 'Current memory = !
 Delta memory = !
 Max memory = !
-Elapsed time= ~ sec
+Elapsed time = ~ sec
 ', NULL, NULL);
 ('REPORT_NEW2', 'print_performance', 'isql.epp', 'Each of these 5 items is followed by a newline (''\n'').', 17, 182, NULL, 'Cpu = ~ sec
 ', NULL, NULL);
diff --git a/src/msgs/transmsgs.de_DE2.sql b/src/msgs/transmsgs.de_DE2.sql
@@ -2395,7 +2395,7 @@ ERROR: Backup incomplete', NULL, NULL, 12, 229, '#', NULL, NULL, 'truser', '1000
 ('Current memory = !c
 Delta memory = !d
 Max memory = !x
-Elapsed time= !e sec
+Elapsed time = !e sec
 ', NULL, NULL, 17, 44, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00')
 ('Cpu = !u sec
 Buffers = !b
diff --git a/src/msgs/transmsgs.fr_FR2.sql b/src/msgs/transmsgs.fr_FR2.sql
@@ -2395,7 +2395,7 @@ ERROR: Backup incomplete', NULL, NULL, 12, 229, '#', NULL, NULL, 'truser', '1000
 ('Current memory = !c
 Delta memory = !d
 Max memory = !x
-Elapsed time= !e sec
+Elapsed time = !e sec
 ', NULL, NULL, 17, 44, '#', NULL, NULL, 'truser', '1000-01-01 00:00:00')
 ('Cpu = !u sec
 Buffers = !b

Original file line number	Diff line number	Diff line change
`@@ -7704,7 +7704,7 @@ static processing_state print_performance(const SINT64* perf_before)`
`7704`	`7704`	`{`
`7705`	`7705`	`TEXT report_1[MSG_LENGTH];`
`7706`	`7706`	`IUTILS_msg_get(REPORT_NEW1, report_1);`
`7707`		`- // Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time= ~ sec\n`
	`7707`	`+ // Current memory = !\nDelta memory = !\nMax memory = !\nElapsed time = ~ sec\n`
`7708`	`7708`	`diag->assign(report_1);`
`7709`	`7709`
`7710`	`7710`	`#ifndef WIN_NT`