@@ -264,13 +264,13 @@ typedef struct
264264instr_time stmt_begin ;/* used for measuring statement latencies */
265265int use_file ;/* index in sql_scripts for this client */
266266bool prepared [MAX_SCRIPTS ];/* whether client prepared the script */
267-
268- /* per client collected stats */
269- int64 cnt ;/* transaction count */
270267bool serialization_failure ;/* if there was serialization failure
271268 * during script execution */
272269bool deadlock_failure ;/* if there was deadlock failure during
273270 * script execution */
271+
272+ /* per client collected stats */
273+ int64 cnt ;/* transaction count */
274274int ecnt ;/* error count */
275275}CState ;
276276
@@ -769,13 +769,6 @@ accumStats(StatsData *stats, bool skipped, bool serialization_failure,
769769
770770if (skipped )
771771{
772- /* no latency to record on such transactions */
773- if (skipped )
774- stats -> skipped ++ ;
775- if (serialization_failure )
776- stats -> serialization_failures ++ ;
777- if (deadlock_failure )
778- stats -> deadlock_failures ++ ;
779772/* no latency to record on skipped transactions */
780773stats -> skipped ++ ;
781774}
@@ -3497,26 +3490,24 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
34973490if (num_scripts > 1 )
34983491printf ("SQL script %d: %s\n"
34993492" - weight: %d (targets %.1f%% of total)\n"
3500- " - " INT64_FORMAT " transactions (%.1f%% of total, tps = %f)\n" ,
3493+ " - " INT64_FORMAT " transactions (%.1f%% of total, tps = %f)\n"
3494+ " - number of transactions with serialization failures: " INT64_FORMAT " (%.3f%%)\n"
3495+ " - number of transactions with deadlock failures: " INT64_FORMAT " (%.3f%%)\n" ,
35013496i + 1 ,sql_script [i ].desc ,
35023497sql_script [i ].weight ,
35033498100.0 * sql_script [i ].weight /total_weight ,
35043499sql_script [i ].stats .cnt ,
35053500100.0 * sql_script [i ].stats .cnt /total -> cnt ,
3506- sql_script [i ].stats .cnt /time_include );
3501+ sql_script [i ].stats .cnt /time_include ,
3502+ sql_script [i ].stats .serialization_failures ,
3503+ (100.0 * sql_script [i ].stats .serialization_failures /
3504+ sql_script [i ].stats .cnt ),
3505+ sql_script [i ].stats .deadlock_failures ,
3506+ (100.0 * sql_script [i ].stats .deadlock_failures /
3507+ sql_script [i ].stats .cnt ));
35073508else
35083509printf ("script statistics:\n" );
35093510
3510- printf (" - number of transactions with serialization failures: " INT64_FORMAT " (%.3f%%)\n" ,
3511- sql_script [i ].stats .serialization_failures ,
3512- (100.0 * sql_script [i ].stats .serialization_failures /
3513- sql_script [i ].stats .cnt ));
3514-
3515- printf (" - number of transactions with deadlock failures: " INT64_FORMAT " (%.3f%%)\n" ,
3516- sql_script [i ].stats .deadlock_failures ,
3517- (100.0 * sql_script [i ].stats .deadlock_failures /
3518- sql_script [i ].stats .cnt ));
3519-
35203511if (latency_limit )
35213512printf (" - number of transactions skipped: " INT64_FORMAT " (%.3f%%)\n" ,
35223513sql_script [i ].stats .skipped ,
