diff options
author | monty@mysql.com <> | 2005-01-06 13:00:13 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2005-01-06 13:00:13 +0200 |
commit | d35140a851e0eccc013f18bee7dee45c4f32d774 (patch) | |
tree | ed8b3e5bd637f4d9661ed2ba57849e7e56d5178a /sql/unireg.h | |
parent | 7cf8285b3f7ce0f6d85c3d747bd266697a576dbe (diff) | |
download | mariadb-git-d35140a851e0eccc013f18bee7dee45c4f32d774.tar.gz |
First stage of table definition cache
Split TABLE to TABLE and TABLE_SHARE (TABLE_SHARE is still allocated as part of table, will be fixed soon)
Created Field::make_field() and made Field_num::make_field() to call this
Added 'TABLE_SHARE->db' that points to database name; Changed all usage of table_cache_key as database name to use this instead
Changed field->table_name to point to pointer to alias. This allows us to change alias for a table by just updating one pointer.
Renamed TABLE_SHARE->real_name to table_name
Renamed TABLE->table_name to alias
Renamed TABLE_LIST->real_name to table_name
Diffstat (limited to 'sql/unireg.h')
-rw-r--r-- | sql/unireg.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 053ca393ad0..eca540b61b9 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -121,12 +121,12 @@ #define SPECIAL_LOG_QUERIES_NOT_USING_INDEXES 4096 /* Log q not using indexes */ /* Extern defines */ -#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->reclength) -#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->reclength) -#define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->reclength) +#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->s->reclength) +#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->s->reclength) +#define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->s->reclength) #define empty_record(A) { \ - restore_record((A),default_values); \ - bfill((A)->null_flags,(A)->null_bytes,255);\ + restore_record((A),s->default_values); \ + bfill((A)->null_flags,(A)->s->null_bytes,255);\ } /* Defines for use with openfrm, openprt and openfrd */ |