diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fdd2b2c3d4e..865fb151a46 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-24  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* tracepoint.c (tvariables_info_1): Actually compute
+	the number of rows in the result.
+
 2010-03-24  Pedro Alves  <pedro@codesourcery.com>
 
 	* remote.c (crc32): Constify `buf' parameter.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index aab57d7c383..d11f086a6a7 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -422,7 +422,7 @@ tvariables_info_1 (void)
     }
 
   /* Try to acquire values from the target.  */
-  for (ix = 0; VEC_iterate (tsv_s, tvariables, ix, tsv); ++ix)
+  for (ix = 0; VEC_iterate (tsv_s, tvariables, ix, tsv); ++ix, ++count)
     tsv->value_known = target_get_trace_state_variable_value (tsv->number,
 							      &(tsv->value));