diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innobase.cc | 7 | ||||
| -rw-r--r-- | sql/log.cc | 2 | ||||
| -rw-r--r-- | sql/sql_table.cc | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 372b4df09b7..b1008737ca4 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -499,6 +499,7 @@ innobase_end(void) DBUG_ENTER("innobase_end"); err = innobase_shutdown_for_mysql(); + hash_free(&innobase_open_tables); if (err != DB_SUCCESS) { @@ -1214,7 +1215,7 @@ ha_innobase::write_row( row_prebuilt_t* prebuilt = (row_prebuilt_t*)innobase_prebuilt; int error; - DBUG_ENTER("write_row"); + DBUG_ENTER("ha_innobase::write_row"); statistic_increment(ha_write_count, &LOCK_status); @@ -1432,7 +1433,7 @@ ha_innobase::update_row( upd_t* uvect; int error = 0; - DBUG_ENTER("update_row"); + DBUG_ENTER("ha_innobase::update_row"); if (prebuilt->upd_node) { uvect = prebuilt->upd_node->update; @@ -1476,7 +1477,7 @@ ha_innobase::delete_row( row_prebuilt_t* prebuilt = (row_prebuilt_t*) innobase_prebuilt; int error = 0; - DBUG_ENTER("update_row"); + DBUG_ENTER("ha_innobase::delete_row"); if (!prebuilt->upd_node) { row_get_prebuilt_update_vector(prebuilt); diff --git a/sql/log.cc b/sql/log.cc index 1ff86ed4b67..2d3a8bd062b 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -583,7 +583,7 @@ bool MYSQL_LOG::write(THD *thd,enum enum_server_command command, } else if (my_b_write(&log_file, (byte*) "\t\t",2) < 0) error=errno; - sprintf(buff,"%7ld %-10.10s", id,command_name[(uint) command]); + sprintf(buff,"%7ld %-11.11s", id,command_name[(uint) command]); if (my_b_write(&log_file, (byte*) buff,strlen(buff))) error=errno; if (format) diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ce054353cc5..4d6a2e79fc3 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -747,6 +747,7 @@ bool close_cached_table(THD *thd,TABLE *table) DBUG_ENTER("close_cached_table"); if (table) { + DBUG_PRINT("enter",("table: %s", table->table_name)); VOID(table->file->extra(HA_EXTRA_FORCE_REOPEN)); // Close all data files /* Mark all tables that are in use as 'old' */ mysql_lock_abort(thd,table); // end threads waiting on lock @@ -1139,9 +1140,9 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, old_db_type=table->db_type; if (create_info->db_type == DB_TYPE_DEFAULT) create_info->db_type=old_db_type; + new_db_type=create_info->db_type= ha_checktype(create_info->db_type); if (create_info->row_type == ROW_TYPE_DEFAULT) create_info->row_type=table->row_type; - new_db_type=create_info->db_type; /* Check if the user only wants to do a simple RENAME */ @@ -1518,6 +1519,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, goto err; } table=0; // Marker for win32 version +#else + table->file->extra(HA_EXTRA_FORCE_REOPEN); // Don't use this file anymore #endif error=0; |