1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Konstantin Osipov 2010-06-17 17:55:00 +04:00
commit 95c86d14b5
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/table.h
View File

@ -573,9 +573,7 @@ struct TABLE_SHARE
key_map keys_for_keyread; key_map keys_for_keyread;
ha_rows min_rows, max_rows; /* create information */ ha_rows min_rows, max_rows; /* create information */
ulong avg_row_length; /* create information */ ulong avg_row_length; /* create information */
ulong raid_chunksize;
ulong version, mysql_version; ulong version, mysql_version;
ulong timestamp_offset; /* Set to offset+1 of record */
ulong reclength; /* Recordlength */ ulong reclength; /* Recordlength */
plugin_ref db_plugin; /* storage engine plugin */ plugin_ref db_plugin; /* storage engine plugin */
@ -586,8 +584,6 @@ struct TABLE_SHARE
} }
enum row_type row_type; /* How rows are stored */ enum row_type row_type; /* How rows are stored */
enum tmp_table_type tmp_table; enum tmp_table_type tmp_table;
enum enum_ha_unused unused1;
enum enum_ha_unused unused2;
uint ref_count; /* How many TABLE objects uses this */ uint ref_count; /* How many TABLE objects uses this */
uint blob_ptr_size; /* 4 or 8 */ uint blob_ptr_size; /* 4 or 8 */
@ -605,7 +601,6 @@ struct TABLE_SHARE
uint db_create_options; /* Create options from database */ uint db_create_options; /* Create options from database */
uint db_options_in_use; /* Options in use */ uint db_options_in_use; /* Options in use */
uint db_record_offset; /* if HA_REC_IN_SEQ */ uint db_record_offset; /* if HA_REC_IN_SEQ */
uint raid_type, raid_chunks;
uint rowid_field_offset; /* Field_nr +1 to rowid field */ uint rowid_field_offset; /* Field_nr +1 to rowid field */
/* Index of auto-updated TIMESTAMP field in field array */ /* Index of auto-updated TIMESTAMP field in field array */
uint primary_key; uint primary_key;