diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-06-20 15:25:02 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-06-20 15:25:02 +0300 |
| commit | 950df73713d6eca34de8be1f9771d40a8abeadc4 (patch) | |
| tree | 7eee86ca5c680d305ade1203f3945cee038dbd46 /sql/ha_isam.h | |
| parent | ccf18acc242f33fffca016c1e28c99e6e4e443b7 (diff) | |
| download | mariadb-git-950df73713d6eca34de8be1f9771d40a8abeadc4.tar.gz | |
Fixed some bugs after last merge
Added semaphore support to MIT-pthreads.
Docs/manual.texi:
Updated benchmark data
configure.in:
Portability fix for compiling MIT-pthreads with gcc 3.0.x
(Still not perfect)
include/my_semaphore.h:
Cleanup
mit-pthreads/Changes-mysql:
Added semaphore support
mit-pthreads/include/Makefile.inc:
Added semaphore support
mit-pthreads/include/pthread/ac-types.h:
Added semaphore support
mit-pthreads/pthreads/GNUmakefile.inc:
Added semaphore support
mit-pthreads/pthreads/Makefile.inc:
Added semaphore support
mit-pthreads/stdio/xprintf.c:
Added semaphore support
mysql-test/r/rpl_alter.result:
Fixed test results after merge with 3.23
sql/ha_isam.cc:
Fixed core dump after merge
sql/ha_isam.h:
Fixed core dump after merge
sql/mini_client.cc:
P
Diffstat (limited to 'sql/ha_isam.h')
| -rw-r--r-- | sql/ha_isam.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sql/ha_isam.h b/sql/ha_isam.h index 135424892f5..82a243ef5c0 100644 --- a/sql/ha_isam.h +++ b/sql/ha_isam.h @@ -26,20 +26,21 @@ class ha_isam: public handler { N_INFO *file; + /* We need this as table_flags() may change after open() */ + ulong int_table_flags; public: - ha_isam(TABLE *table): handler(table), file(0) + ha_isam(TABLE *table) + :handler(table), file(0), + int_table_flags(HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER | + HA_KEY_READ_WRONG_STR | HA_DUPP_POS | + HA_NOT_DELETE_WITH_CACHE) {} ~ha_isam() {} const char *table_type() const { return "ISAM"; } const char *index_type(uint key_number) { return "BTREE"; } const char **bas_ext() const; - ulong table_flags() const - { - return (HA_READ_RND_SAME | HA_KEYPOS_TO_RNDPOS | HA_LASTKEY_ORDER | - HA_KEY_READ_WRONG_STR | HA_DUPP_POS | HA_NOT_DELETE_WITH_CACHE | - ((table->db_record_offset) ? 0 : HA_REC_NOT_IN_SEQ)); - } + ulong table_flags() const { return int_table_flags; } uint max_record_length() const { return HA_MAX_REC_LENGTH; } uint max_keys() const { return N_MAXKEY; } uint max_key_parts() const { return N_MAXKEY_SEG; } |