DTrace fixes plus fixing a too long file name

sql/Makefile.am

@@ -29,7 +29,7 @@ libexec_PROGRAMS =	mysqld
 EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 DTRACEFILES =           filesort.o \
-			ha_ndbcluster.o \
+			libndb_la-ha_ndbcluster.o \
                         handler.o \
                         mysqld.o \
                         net_serv.o \
@@ -207,6 +207,8 @@ install-exec-hook:
 	test ! -f mysqld.sym.gz         || $(INSTALL_DATA)    mysqld.sym.gz         $(DESTDIR)$(pkglibdir)
 
 if HAVE_DTRACE_DASH_G
+libndb_la_LIBADD = probes_all.o
+libndb_la_DEPENDENCIES = probes_all.o dtrace_files dtrace_providers
 mysqld_LDADD += probes_all.o
 mysqld_DEPENDENCIES += probes_all.o dtrace_files dtrace_providers
 CLEANFILES += dtrace_files dtrace_providers probes_all.o

sql/filesort.cc

@@ -122,7 +122,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
   TABLE_LIST *tab= table->pos_in_table_list;
   Item_subselect *subselect= tab ? tab->containing_subselect() : 0;
 
-  MYSQL_FILESORT_START(table->s->db.str, table->s->tablename.str);
+  MYSQL_FILESORT_START(table->s->db.str, table->s->table_name.str);
 
   /*
    Release InnoDB's adaptive hash index latch (if holding) before

sql/sp_head.cc

@@ -2901,7 +2901,7 @@ sp_instr_stmt::exec_core(THD *thd, uint *nextp)
                          thd->thread_id,
                          (char *) (thd->db ? thd->db : ""),
                          thd->security_ctx->priv_user,
-                         thd->security_ctx->host_or_ip,
+                         (char *)thd->security_ctx->host_or_ip,
                          3);
   int res= mysql_execute_command(thd);
   MYSQL_QUERY_EXEC_DONE(res);

sql/sql_update.cc

@@ -1231,7 +1231,7 @@ bool mysql_multi_update(THD *thd,
     result->send_error(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR));
     result->abort();
   }
-  MYSQL_MULTI_UPDATE_DONE(res, result->found(), result->updated());
+  MYSQL_MULTI_UPDATE_DONE(res, result->num_found(), result->num_updated());
   delete result;
   thd->abort_on_warning= 0;
   DBUG_RETURN(FALSE);

storage/federated/ha_federated.cc

@@ -2334,7 +2334,7 @@ int ha_federated::index_read(uchar *buf, const uchar *key,
   rc= index_read_idx_with_result_set(buf, active_index, key,
                                      key_len, find_flag,
                                      &stored_result);
-  MYSQL_INDEX_READ_ROW_DONE(retval);
+  MYSQL_INDEX_READ_ROW_DONE(rc);
   DBUG_RETURN(rc);
 }