diff options
Diffstat (limited to 'storage/csv')
| -rw-r--r-- | storage/csv/ha_tina.cc | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc index 1d3bb76e913..5277dc9bf40 100644 --- a/storage/csv/ha_tina.cc +++ b/storage/csv/ha_tina.cc @@ -41,10 +41,6 @@ TODO: -Brian */ -#ifdef USE_PRAGMA_IMPLEMENTATION -#pragma implementation // gcc: Class implementation -#endif - #include "my_global.h" #include "sql_priv.h" #include "sql_class.h" // SSV @@ -53,7 +49,6 @@ TODO: #include "ha_tina.h" #include "probes_mysql.h" - /* uchar + uchar + ulonglong + ulonglong + ulonglong + ulonglong + uchar */ @@ -133,14 +128,11 @@ static void init_tina_psi_keys(void) const char* category= "csv"; int count; - if (PSI_server == NULL) - return; - count= array_elements(all_tina_mutexes); - PSI_server->register_mutex(category, all_tina_mutexes, count); + mysql_mutex_register(category, all_tina_mutexes, count); count= array_elements(all_tina_files); - PSI_server->register_file(category, all_tina_files, count); + mysql_file_register(category, all_tina_files, count); } #endif /* HAVE_PSI_INTERFACE */ @@ -491,7 +483,7 @@ ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg) */ current_position(0), next_position(0), local_saved_data_file_length(0), file_buff(0), chain_alloced(0), chain_size(DEFAULT_CHAIN_LENGTH), - local_data_file_version(0), records_is_known(0), curr_lock_type(F_UNLCK) + local_data_file_version(0), records_is_known(0) { /* Set our original buffers from pre-allocated memory */ buffer.set((char*)byte_buffer, IO_SIZE, &my_charset_bin); @@ -1045,8 +1037,8 @@ int ha_tina::open_update_temp_file_if_needed() /* This is called for an update. - Make sure you put in code to increment the auto increment, also - update any timestamp data. Currently auto increment is not being + Make sure you put in code to increment the auto increment. + Currently auto increment is not being fixed since autoincrements have yet to be added to this table handler. This will be called in a table scan right before the previous ::rnd_next() call. @@ -1316,8 +1308,7 @@ bool ha_tina::get_write_pos(my_off_t *end_pos, tina_set *closest_hole) if (closest_hole == chain_ptr) /* no more chains */ *end_pos= file_buff->end(); else - *end_pos= min(file_buff->end(), - closest_hole->begin); + *end_pos= min(file_buff->end(), closest_hole->begin); return (closest_hole != chain_ptr) && (*end_pos == closest_hole->begin); } |