summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--innobase/fil/fil0fil.c2
-rw-r--r--innobase/row/row0ins.c2
-rw-r--r--sql/ha_innodb.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index 89648b3feca..d1a083fcd66 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -2885,7 +2885,7 @@ fil_load_single_table_tablespace(
}
/* We do not use the size information we have about the file, because
- the rounding formulat for extents and pages is somewhat complex; we
+ the rounding formula for extents and pages is somewhat complex; we
let fil_node_open() do that task. */
fil_node_create(filepath, 0, space_id, FALSE);
diff --git a/innobase/row/row0ins.c b/innobase/row/row0ins.c
index f596bd3d473..c82231ef5f6 100644
--- a/innobase/row/row0ins.c
+++ b/innobase/row/row0ins.c
@@ -1192,7 +1192,7 @@ run_again:
dtuple_print(ef, entry);
fputs("\nBut the parent table ", ef);
ut_print_name(ef, trx, foreign->referenced_table_name);
- fputs("\nor its .ind file does not currently exist!\n", ef);
+ fputs("\nor its .ibd file does not currently exist!\n", ef);
mutex_exit(&dict_foreign_err_mutex);
return(DB_NO_REFERENCED_ROW);
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index b8ac40cee92..7b6fb31acc6 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4977,7 +4977,7 @@ the SQL statement in case of an error. */
int
ha_innobase::external_lock(
/*=======================*/
- /* out: 0 or HA_ERR_CRASHED */
+ /* out: 0 */
THD* thd, /* in: handle to the user thread */
int lock_type) /* in: lock type */
{