ha_innodb.cc:

  Remove the question of Monty about user_thd / NULL after a merge from 4.0 to 4.1, user_thd is the right value in 4.1

sql/ha_innodb.cc

@@ -2511,11 +2511,6 @@ ha_innobase::change_active_index(
   the flag ROW_MYSQL_WHOLE_ROW below, but that caused unnecessary
   copying. Starting from MySQL-4.1 we use a more efficient flag here. */
 
-  /* 
-     TODO: In 4.0 the below user_thd was changed to NULL.
-     Heikki, please delete this comment after you have read this and may
-     acted upon it.
-  */
   build_template(prebuilt, user_thd, table, ROW_MYSQL_REC_FIELDS);
 
   DBUG_RETURN(0);