trx0roll.c Fix the primary key update + BLOB bug, improve InnoDB Monitor prints

trx0sys.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0mysql.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0purge.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0sel.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0uins.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0umod.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
row0upd.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0start.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
sync0arr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
fil0fil.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ibuf0ibuf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
lock0lock.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
os0file.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0btr.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0sea.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.c	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
srv0srv.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0sys.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
trx0trx.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
btr0cur.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
buf0buf.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
data0data.h	Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
ha_innobase.cc	Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints


sql/ha_innobase.cc:
  Fix the auto-inc+REPLACE+replication bug, improve InnoDB Monitor prints
innobase/include/btr0cur.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/buf0buf.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/data0data.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/srv0srv.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0sys.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/include/trx0trx.h:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0btr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0cur.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/btr/btr0sea.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/buf/buf0buf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/data/data0data.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/fil/fil0fil.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/ibuf/ibuf0ibuf.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/lock/lock0lock.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/os/os0file.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0mysql.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0purge.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0sel.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0uins.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0umod.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/row/row0upd.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0srv.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/srv/srv0start.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/sync/sync0arr.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0roll.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0sys.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints
innobase/trx/trx0trx.c:
  Fix the primary key update + BLOB bug, improve InnoDB Monitor prints

1 files changed, 21 insertions, 0 deletions

diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c
index 0ad6b7084e2..d041e34a558 100644
--- a/innobase/row/row0sel.c
+++ b/innobase/row/row0sel.c
@@ -2488,6 +2488,8 @@ row_search_for_mysql(
 	printf("N tables locked %lu\n", trx->mysql_n_tables_locked);
 */
 	if (direction == 0) {
+		trx->op_info = "starting index read";
+	
 		prebuilt->n_rows_fetched = 0;
 		prebuilt->n_fetch_cached = 0;
 		prebuilt->fetch_cache_first = 0;
@@ -2497,6 +2499,8 @@ row_search_for_mysql(
 			row_prebuild_sel_graph(prebuilt);
 		}
 	} else {
+		trx->op_info = "fetching rows";
+
 		if (prebuilt->n_rows_fetched == 0) {
 			prebuilt->fetch_direction = direction;
 		}
@@ -2519,6 +2523,9 @@ row_search_for_mysql(
 
 			prebuilt->n_rows_fetched++;
 
+			srv_n_rows_read++;
+			trx->op_info = "";
+
 			return(DB_SUCCESS);
 		}
 
@@ -2529,6 +2536,7 @@ row_search_for_mysql(
 		    	cache, but the cache was not full at the time of the
 		    	popping: no more rows can exist in the result set */
 		    
+			trx->op_info = "";
 		    	return(DB_RECORD_NOT_FOUND);
 		}
 		
@@ -2560,6 +2568,7 @@ row_search_for_mysql(
 
 			/* printf("%s record not found 1\n", index->name); */
 	
+			trx->op_info = "";
 			return(DB_RECORD_NOT_FOUND);
 		}
 
@@ -2599,6 +2608,9 @@ row_search_for_mysql(
 
  				/* printf("%s shortcut\n", index->name); */
 
+				srv_n_rows_read++;
+
+				trx->op_info = "";
 				return(DB_SUCCESS);
 			
 			} else if (shortcut == SEL_EXHAUSTED) {
@@ -2607,6 +2619,7 @@ row_search_for_mysql(
 
 				/* printf("%s record not found 2\n",
 							index->name); */
+				trx->op_info = "";
 				return(DB_RECORD_NOT_FOUND);
 			}
 
@@ -2980,6 +2993,8 @@ lock_wait_or_error:
 
 	/* printf("Using index %s cnt %lu ret value %lu err\n", index->name,
 							cnt, err); */
+	trx->op_info = "";
+
 	return(err);
 
 normal_return:
@@ -2995,5 +3010,11 @@ normal_return:
 
 	/* printf("Using index %s cnt %lu ret value %lu\n", index->name,
 							cnt, err); */
+	if (ret == DB_SUCCESS) {
+		srv_n_rows_read++;
+	}
+
+	trx->op_info = "";
+
 	return(ret);
 }