diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:55:00 +0400 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:55:00 +0400 |
| commit | dc00b5dbb221cbe743169d8a952183e2d36c2cea (patch) | |
| tree | 6a4850667715d5bb0767857f11ff90a113e6f082 /sql/table.h | |
| parent | cc6dabba377bd05bb9a6a9ffaa985bbe5e38bcc1 (diff) | |
| parent | 981f3f5b11b190fe74f1043ecabba35f4b6185ca (diff) | |
| download | mariadb-git-dc00b5dbb221cbe743169d8a952183e2d36c2cea.tar.gz | |
Merge.
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/table.h b/sql/table.h index fb312dac132..08b9a6e0a01 100644 --- a/sql/table.h +++ b/sql/table.h @@ -573,9 +573,7 @@ struct TABLE_SHARE key_map keys_for_keyread; ha_rows min_rows, max_rows; /* create information */ ulong avg_row_length; /* create information */ - ulong raid_chunksize; ulong version, mysql_version; - ulong timestamp_offset; /* Set to offset+1 of record */ ulong reclength; /* Recordlength */ plugin_ref db_plugin; /* storage engine plugin */ @@ -586,8 +584,6 @@ struct TABLE_SHARE } enum row_type row_type; /* How rows are stored */ 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 blob_ptr_size; /* 4 or 8 */ @@ -605,7 +601,6 @@ struct TABLE_SHARE uint db_create_options; /* Create options from database */ uint db_options_in_use; /* Options in use */ uint db_record_offset; /* if HA_REC_IN_SEQ */ - uint raid_type, raid_chunks; uint rowid_field_offset; /* Field_nr +1 to rowid field */ /* Index of auto-updated TIMESTAMP field in field array */ uint primary_key; |