database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge of bug#51851.

Browse Source 
Also moved HA_DATA_PARTITION from ha_partition.cc to table.h.
This commit is contained in:
Mattias Jonsson
2010-05-24 14:51:59 +02:00
parent 923da1e889 47906997c7
commit 7af0bbc3bc
18 changed files with 151 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sql/table.h
View File

@ -488,6 +488,19 @@ typedef struct st_table_field_def
} TABLE_FIELD_DEF;
#ifdef WITH_PARTITION_STORAGE_ENGINE
/**
Partition specific ha_data struct.
*/
typedef struct st_ha_data_partition
{
bool auto_inc_initialized;
mysql_mutex_t LOCK_auto_inc; /**< protecting auto_inc val */
ulonglong next_auto_inc_val; /**< first non reserved value */
} HA_DATA_PARTITION;
#endif
class Table_check_intact
{
protected:
@ -628,13 +641,11 @@ struct TABLE_SHARE
int cached_row_logging_check;
#ifdef WITH_PARTITION_STORAGE_ENGINE
/** @todo: Move into *ha_data for partitioning */
/* filled in when reading from frm */
bool auto_partitioned;
const char *partition_info;
uint partition_info_len;
const char *partition_info_str;
uint partition_info_str_len;
uint partition_info_buffer_size;
const char *part_state;
uint part_state_len;
handlerton *default_part_db_type;
#endif
@ -654,6 +665,14 @@ struct TABLE_SHARE
void *ha_data;
void (*ha_data_destroy)(void *); /* An optional destructor for ha_data */
#ifdef WITH_PARTITION_STORAGE_ENGINE
/** place to store partition specific data, LOCK_ha_data hold while init. */
HA_DATA_PARTITION *ha_part_data;
/* Destructor for ha_part_data */
void (*ha_part_data_destroy)(HA_DATA_PARTITION *);
#endif
/** Instrumentation for this table share. */
PSI_table_share *m_psi;