diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
| commit | 0fece375f2ae4bb173357609b46924a997113593 (patch) | |
| tree | 288f7cc7d0ca91ae340b7a568971bb02d8eb798d /sql/table.h | |
| parent | 2321260ff07b0a90e3f84c756370a328ac17f990 (diff) | |
| download | mariadb-git-0fece375f2ae4bb173357609b46924a997113593.tar.gz | |
Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB
Docs/manual.texi:
Changelog + update of table types
bdb/include/log.h:
Patch from Sleepycat
bdb/log/log.c:
Patch from Sleepycat
bdb/log/log_rec.c:
Patch from Sleepycat
client/mysqladmin.c:
Cleanup
innobase/include/univ.i:
Fix for compilation on Windows
innobase/os/os0file.c:
cleanup
innobase/pars/pars0grm.y:
Fix for compilation on Windows
mysql-test/r/innodb.result:
New test case
mysql-test/t/innodb.test:
New test case
sql/ha_innobase.cc:
cleanup
sql/ha_innobase.h:
Fix for prefix keys
sql/handler.h:
Fix for temporary Innodb tables
sql/item_strfunc.cc:
Fixed bug in REPLACE()
sql/lock.cc:
Fix for temporary Innodb tables
sql/mysqld.cc:
Added --skip-stack-trace
sql/share/english/errmsg.txt:
Better error messages
sql/sql_base.cc:
Fix for temporary Innodb tables
sql/sql_select.cc:
Fix for temporary Innodb tables
sql/sql_table.cc:
Fixed sub char keys for InnoDB
sql/table.h:
Fix for temporary Innodb tables
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/table.h b/sql/table.h index a3b361742c5..b627a158556 100644 --- a/sql/table.h +++ b/sql/table.h @@ -41,6 +41,8 @@ typedef struct st_grant_info uint want_privilege; } GRANT_INFO; +enum tmp_table_type {NO_TMP_TABLE=0, TMP_TABLE=1, TRANSACTIONAL_TMP_TABLE=2}; + /* Table cache entry struct */ class Field_timestamp; @@ -83,10 +85,11 @@ struct st_table { uint blob_ptr_size; /* 4 or 8 */ uint next_number_key_offset; int current_lock; /* Type of lock on table */ + enum tmp_table_type tmp_table; my_bool copy_blobs; /* copy_blobs when storing */ my_bool null_row; /* All columns are null */ my_bool maybe_null,outer_join; /* Used with OUTER JOIN */ - my_bool distinct,tmp_table,const_table; + my_bool distinct,const_table; my_bool key_read; my_bool crypted; my_bool db_low_byte_first; /* Portable row format */ |