diff options
| -rw-r--r-- | mysql-test/suite/funcs_1/r/is_coll_charset_applic.result (renamed from mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result) | 0 | ||||
| -rw-r--r-- | mysql-test/suite/funcs_1/t/is_coll_charset_applic.test (renamed from mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test) | 0 | ||||
| -rw-r--r-- | sql/Makefile.am | 4 | ||||
| -rw-r--r-- | sql/filesort.cc | 2 | ||||
| -rw-r--r-- | sql/sp_head.cc | 2 | ||||
| -rw-r--r-- | sql/sql_update.cc | 2 | ||||
| -rw-r--r-- | storage/federated/ha_federated.cc | 2 |
7 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result b/mysql-test/suite/funcs_1/r/is_coll_charset_applic.result index 7eba964bdf6..7eba964bdf6 100644 --- a/mysql-test/suite/funcs_1/r/is_collation_character_set_applicability.result +++ b/mysql-test/suite/funcs_1/r/is_coll_charset_applic.result diff --git a/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test b/mysql-test/suite/funcs_1/t/is_coll_charset_applic.test index cda7b578aae..cda7b578aae 100644 --- a/mysql-test/suite/funcs_1/t/is_collation_character_set_applicability.test +++ b/mysql-test/suite/funcs_1/t/is_coll_charset_applic.test diff --git a/sql/Makefile.am b/sql/Makefile.am index dcba2407837..95cfa649012 100644 --- a/sql/Makefile.am +++ b/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 diff --git a/sql/filesort.cc b/sql/filesort.cc index e95d1741b06..d23715a0149 100644 --- a/sql/filesort.cc +++ b/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 diff --git a/sql/sp_head.cc b/sql/sp_head.cc index ee73a463991..95cea22ecd9 100644 --- a/sql/sp_head.cc +++ b/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); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 9400665cbdc..a0fcb2020a4 100644 --- a/sql/sql_update.cc +++ b/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); diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 69cb2599740..4b81edc1111 100644 --- a/storage/federated/ha_federated.cc +++ b/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); } |