diff options
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index f0b0c0b324a..eedf9458485 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -8018,7 +8018,8 @@ void ha_partition::print_error(int error, myf errflag) table->s->table_name.str, str.c_ptr_safe()); - max_length= (MYSQL_ERRMSG_SIZE - (uint) strlen(ER(ER_ROW_IN_WRONG_PARTITION))); + max_length= (MYSQL_ERRMSG_SIZE - + (uint) strlen(ER_THD(thd, ER_ROW_IN_WRONG_PARTITION))); if (str.length() >= max_length) { str.length(max_length-4); @@ -8822,7 +8823,7 @@ int ha_partition::indexes_are_disabled(void) @retval != 0 Error */ -int ha_partition::check_misplaced_rows(uint read_part_id, bool repair) +int ha_partition::check_misplaced_rows(uint read_part_id, bool do_repair) { int result= 0; uint32 correct_part_id; @@ -8833,7 +8834,7 @@ int ha_partition::check_misplaced_rows(uint read_part_id, bool repair) DBUG_ASSERT(m_file); - if (repair) + if (do_repair) { /* We must read the full row, if we need to move it! */ bitmap_set_all(table->read_set); @@ -8878,7 +8879,7 @@ int ha_partition::check_misplaced_rows(uint read_part_id, bool repair) if (correct_part_id != read_part_id) { num_misplaced_rows++; - if (!repair) + if (!do_repair) { /* Check. */ print_admin_msg(ha_thd(), MYSQL_ERRMSG_SIZE, "error", |