mirror of
https://github.com/MariaDB/server.git
synced 2025-11-09 11:41:36 +03:00
Speed up column-completion in 'mysql' Don't use ISAM if HAVE_ISAM is not defined A lot of fixes for the embedded version. All libraries are now included in libmysqld.a Changed arguments to convert_dirname() to make it more general. Renamed files in the 'merge' directory to all use a common prefix. Don't compile both assembler and C functions on x86 BitKeeper/deleted/.del-mf_pack2.c~f07795bbcf57be7: Delete: mysys/mf_pack2.c Docs/manual.texi: Updated chapter about embedded version acinclude.m4: Fix for using BDB and InnoDB with embedded client/completion_hash.cc: Speed up memory allocation client/completion_hash.h: Speed up memory allocation client/mysql.cc: Speed up memory allocation client/mysqldump.c: Fix to use now convert_dirname client/mysqltest.c: Fixed memory allocation bugs. Added --basedir=#, --compress=#, --server-arg, --server-file. Fixes for embedded version Changed silent mode to -s instead of -q include/my_global.h: Update to use HAVE_ISAM include/my_sys.h: Cleanup of fn_format() include/mysql.h: Prepare FIELD struct for 4.1 include/mysql_embed.h: Don't use ISAM in embedded version innobase/include/srv0srv.h: Make InnoDB startup/shutdown silent in embedded version innobase/log/log0log.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0srv.c: Make InnoDB startup/shutdown silent in embedded version innobase/srv/srv0start.c: Make InnoDB startup/shutdown silent in embedded version isam/isamlog.c: new convert_dirname libmysql/libmysql.c: Prepare for 4.1 libmysqld/Makefile.am: Changed to create one libmysqld.a file that includes all other libraries. libmysqld/examples/Makefile.am: Changed to use new libmysqld.a libmysqld/examples/test-run: Lot's of fixes to get new mysqltest with embedded MySQL to work. libmysqld/lib_sql.cc: Changed type of arguments for mysql_server_init() to make code more portable. libmysqld/libmysqld.c: Cleanup merge/Makefile.am: Rename to use common prefix. merge/mrg_close.c: Rename to use common prefix. merge/mrg_create.c: Rename to use common prefix. merge/mrg_def.h: Rename to use common prefix. merge/mrg_delete.c: Rename to use common prefix. merge/mrg_extra.c: Rename to use common prefix. merge/mrg_info.c: Rename to use common prefix. merge/mrg_locking.c: Rename to use common prefix. merge/mrg_open.c: Rename to use common prefix. merge/mrg_panic.c: Rename to use common prefix. merge/mrg_rrnd.c: Rename to use common prefix. merge/mrg_rsame.c: Rename to use common prefix. merge/mrg_static.c: Rename to use common prefix. merge/mrg_update.c: Rename to use common prefix. myisam/myisamlog.c: Use new convert_dirname myisammrg/Makefile.am: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_close.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_create.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_def.h: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_delete.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_extra.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_info.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_locking.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_open.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_panic.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_queue.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rfirst.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rkey.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rlast.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rnext.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rprev.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rrnd.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_rsame.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_static.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_update.c: Renamed mymrgdef.h -> myrg_def.h myisammrg/myrg_write.c: Renamed mymrgdef.h -> myrg_def.h mysql-test/include/master-slave.inc: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/mysql-test-run.sh: cleanup mysql-test/r/auto_increment.result: Cleanup of tests for embedded version mysql-test/r/func_system.result: Cleanup of tests for embedded version mysql-test/r/isam.result: Cleanup of tests for embedded version mysql-test/r/lock.result: Cleanup of tests for embedded version mysql-test/r/show_check.result: Cleanup of tests for embedded version mysql-test/t/auto_increment.test: Cleanup of tests for embedded version mysql-test/t/backup.test: Cleanup of tests for embedded version mysql-test/t/count_distinct2-master.opt: Cleanup of tests for embedded version mysql-test/t/count_distinct2.test: Cleanup of tests for embedded version mysql-test/t/create.test: Cleanup of tests for embedded version mysql-test/t/flush.test: Cleanup of tests for embedded version mysql-test/t/func_system.test: Cleanup of tests for embedded version mysql-test/t/isam.test: Cleanup of tests for embedded version mysql-test/t/kill.test: Cleanup of tests for embedded version mysql-test/t/lock.test: Cleanup of tests for embedded version mysql-test/t/order_fill_sortbuf-master.opt: Cleanup of tests for embedded version mysql-test/t/rpl000015.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000016.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000017.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/rpl000018.test: Use short filenames for sockets (portability problem on Mac OS X) mysql-test/t/show_check.test: Move ISAM specific tests to isam.test mysql-test/t/status.test: Cleanup of tests for embedded version mysql-test/t/tablelock.test: Cleanup mysys/Makefile.am: Removed not used mf_pack2.c mysys/charset.c: new convert_dirname mysys/default.c: new convert_dirname mysys/mf_dirname.c: Changed convert_dirname() to be more general mysys/mf_format.c: Changed bit flags to fn_format() to defines. Added handling of relative filenames BitKeeper/etc/ignore: Added libmysqld/examples/test-gdbinit scripts/mysql_explain_log to the ignore list mysys/mf_pack.c: new convert_dirname mysys/mf_tempfile.c: new convert_dirname scripts/Makefile.am: Adde mysql_explain_log scripts/mysql_config.sh: Added support of --libmysqld-libs sql/Makefile.am: Fix to use 'innodb_system_libs' sql/ha_innobase.cc: Make InnoDB startup/shutdown silent in embedded version sql/ha_isam.cc: Added handling of HAVE_ISAM sql/ha_isammrg.cc: Added handling of HAVE_ISAM sql/ha_myisam.cc: Handle relative paths; Needed to support BACKUP TABLE in embedded version sql/ha_myisammrg.cc: Rename of filenames sql/handler.cc: Added handling of HAVE_ISAM sql/item_func.cc: Fix for ecc (Intel Compiler) sql/mysql_priv.h: Added global variable 'mysql_embedded' sql/mysqld.cc: Use HAVE_ISAM sql/sql_parse.cc: Use new convert_dirname sql/sql_select.cc: Fix for ecc (Intel Compiler) sql/sql_table.cc: Added handling of relative filenames strings/Makefile.am: Don't compile both assembler and C functions on x86 strings/bchange.c: cleanup
393 lines
12 KiB
C++
393 lines
12 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
#ifdef __GNUC__
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#include "mysql_priv.h"
|
|
#ifdef HAVE_ISAM
|
|
#include <m_ctype.h>
|
|
#include <myisampack.h>
|
|
#include "ha_isam.h"
|
|
#ifndef MASTER
|
|
#include "../srclib/isam/isamdef.h"
|
|
#else
|
|
#include "../isam/isamdef.h"
|
|
#endif
|
|
|
|
/*****************************************************************************
|
|
** isam tables
|
|
*****************************************************************************/
|
|
|
|
const char **ha_isam::bas_ext() const
|
|
{ static const char *ext[]= { ".ISD",".ISM", NullS }; return ext; }
|
|
|
|
|
|
int ha_isam::open(const char *name, int mode, uint test_if_locked)
|
|
{
|
|
char name_buff[FN_REFLEN];
|
|
if (!(file=nisam_open(fn_format(name_buff,name,"","",2 | 4), mode,
|
|
test_if_locked)))
|
|
return (my_errno ? my_errno : -1);
|
|
|
|
if (!(test_if_locked == HA_OPEN_WAIT_IF_LOCKED ||
|
|
test_if_locked == HA_OPEN_ABORT_IF_LOCKED))
|
|
(void) nisam_extra(file,HA_EXTRA_NO_WAIT_LOCK);
|
|
info(HA_STATUS_NO_LOCK | HA_STATUS_VARIABLE | HA_STATUS_CONST);
|
|
if (!(test_if_locked & HA_OPEN_WAIT_IF_LOCKED))
|
|
(void) nisam_extra(file,HA_EXTRA_WAIT_LOCK);
|
|
if (!table->db_record_offset)
|
|
int_option_flag|=HA_REC_NOT_IN_SEQ;
|
|
return (0);
|
|
}
|
|
|
|
int ha_isam::close(void)
|
|
{
|
|
return !nisam_close(file) ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
uint ha_isam::min_record_length(uint options) const
|
|
{
|
|
return (options & HA_OPTION_PACK_RECORD) ? 1 : 5;
|
|
}
|
|
|
|
|
|
int ha_isam::write_row(byte * buf)
|
|
{
|
|
statistic_increment(ha_write_count,&LOCK_status);
|
|
if (table->time_stamp)
|
|
update_timestamp(buf+table->time_stamp-1);
|
|
if (table->next_number_field && buf == table->record[0])
|
|
update_auto_increment();
|
|
return !nisam_write(file,buf) ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::update_row(const byte * old_data, byte * new_data)
|
|
{
|
|
statistic_increment(ha_update_count,&LOCK_status);
|
|
if (table->time_stamp)
|
|
update_timestamp(new_data+table->time_stamp-1);
|
|
return !nisam_update(file,old_data,new_data) ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::delete_row(const byte * buf)
|
|
{
|
|
statistic_increment(ha_delete_count,&LOCK_status);
|
|
return !nisam_delete(file,buf) ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::index_read(byte * buf, const byte * key,
|
|
uint key_len, enum ha_rkey_function find_flag)
|
|
{
|
|
statistic_increment(ha_read_key_count,&LOCK_status);
|
|
int error=nisam_rkey(file, buf, active_index, key, key_len, find_flag);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::index_read_idx(byte * buf, uint index, const byte * key,
|
|
uint key_len, enum ha_rkey_function find_flag)
|
|
{
|
|
statistic_increment(ha_read_key_count,&LOCK_status);
|
|
int error=nisam_rkey(file, buf, index, key, key_len, find_flag);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::index_next(byte * buf)
|
|
{
|
|
statistic_increment(ha_read_next_count,&LOCK_status);
|
|
int error=nisam_rnext(file,buf,active_index);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
|
|
}
|
|
|
|
int ha_isam::index_prev(byte * buf)
|
|
{
|
|
statistic_increment(ha_read_prev_count,&LOCK_status);
|
|
int error=nisam_rprev(file,buf, active_index);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
|
|
}
|
|
|
|
int ha_isam::index_first(byte * buf)
|
|
{
|
|
statistic_increment(ha_read_first_count,&LOCK_status);
|
|
int error=nisam_rfirst(file, buf, active_index);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
|
|
}
|
|
|
|
int ha_isam::index_last(byte * buf)
|
|
{
|
|
statistic_increment(ha_read_last_count,&LOCK_status);
|
|
int error=nisam_rlast(file, buf, active_index);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : HA_ERR_END_OF_FILE;
|
|
}
|
|
|
|
int ha_isam::rnd_init(bool scan)
|
|
{
|
|
return nisam_extra(file,HA_EXTRA_RESET) ? 0 : my_errno ? my_errno : -1;;
|
|
}
|
|
|
|
int ha_isam::rnd_next(byte *buf)
|
|
{
|
|
statistic_increment(ha_read_rnd_next_count,&LOCK_status);
|
|
int error=nisam_rrnd(file, buf, NI_POS_ERROR);
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
int ha_isam::rnd_pos(byte * buf, byte *pos)
|
|
{
|
|
statistic_increment(ha_read_rnd_count,&LOCK_status);
|
|
int error=nisam_rrnd(file, buf, (ulong) ha_get_ptr(pos,ref_length));
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
return !error ? 0 : my_errno ? my_errno : -1;
|
|
}
|
|
|
|
void ha_isam::position(const byte *record)
|
|
{
|
|
my_off_t position=nisam_position(file);
|
|
if (position == (my_off_t) ~ (ulong) 0)
|
|
position=HA_OFFSET_ERROR;
|
|
ha_store_ptr(ref, ref_length, position);
|
|
}
|
|
|
|
void ha_isam::info(uint flag)
|
|
{
|
|
N_ISAMINFO info;
|
|
(void) nisam_info(file,&info,flag);
|
|
if (flag & HA_STATUS_VARIABLE)
|
|
{
|
|
records = info.records;
|
|
deleted = info.deleted;
|
|
data_file_length=info.data_file_length;
|
|
index_file_length=info.index_file_length;
|
|
delete_length = info.delete_length;
|
|
check_time = info.isamchk_time;
|
|
mean_rec_length=info.mean_reclength;
|
|
}
|
|
if (flag & HA_STATUS_CONST)
|
|
{
|
|
max_data_file_length=info.max_data_file_length;
|
|
max_index_file_length=info.max_index_file_length;
|
|
create_time = info.create_time;
|
|
sortkey = info.sortkey;
|
|
block_size=nisam_block_size;
|
|
table->keys = min(table->keys,info.keys);
|
|
table->keys_in_use= (((key_map) 1) << table->keys)- (key_map) 1;
|
|
table->db_options_in_use= info.options;
|
|
table->db_record_offset=
|
|
(table->db_options_in_use &
|
|
(HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD)) ? 0 :
|
|
table->reclength;
|
|
if (!table->tmp_table)
|
|
{
|
|
ulong *rec_per_key=info.rec_per_key;
|
|
for (uint i=0 ; i < table->keys ; i++)
|
|
{
|
|
table->key_info[i].rec_per_key[table->key_info[i].key_parts-1]=
|
|
*(rec_per_key++);
|
|
}
|
|
}
|
|
ref_length=4;
|
|
}
|
|
if (flag & HA_STATUS_ERRKEY)
|
|
{
|
|
errkey = info.errkey;
|
|
ha_store_ptr(dupp_ref, ref_length, info.dupp_key_pos);
|
|
}
|
|
if (flag & HA_STATUS_TIME)
|
|
update_time = info.update_time;
|
|
}
|
|
|
|
|
|
int ha_isam::extra(enum ha_extra_function operation)
|
|
{
|
|
if ((specialflag & SPECIAL_SAFE_MODE || test_flags & TEST_NO_EXTRA) &&
|
|
(operation == HA_EXTRA_WRITE_CACHE ||
|
|
operation == HA_EXTRA_KEYREAD))
|
|
return 0;
|
|
return nisam_extra(file,operation);
|
|
}
|
|
|
|
int ha_isam::reset(void)
|
|
{
|
|
return nisam_extra(file,HA_EXTRA_RESET);
|
|
}
|
|
|
|
int ha_isam::external_lock(THD *thd, int lock_type)
|
|
{
|
|
return nisam_lock_database(file,lock_type);
|
|
}
|
|
|
|
|
|
THR_LOCK_DATA **ha_isam::store_lock(THD *thd,
|
|
THR_LOCK_DATA **to,
|
|
enum thr_lock_type lock_type)
|
|
{
|
|
if (lock_type != TL_IGNORE && file->lock.type == TL_UNLOCK)
|
|
file->lock.type=lock_type;
|
|
*to++= &file->lock;
|
|
return to;
|
|
}
|
|
|
|
|
|
int ha_isam::create(const char *name, register TABLE *form,
|
|
HA_CREATE_INFO *create_info)
|
|
|
|
{
|
|
uint options=form->db_options_in_use;
|
|
int error;
|
|
uint i,j,recpos,minpos,fieldpos,temp_length,length;
|
|
enum ha_base_keytype type;
|
|
char buff[FN_REFLEN];
|
|
KEY *pos;
|
|
N_KEYDEF keydef[MAX_KEY];
|
|
N_RECINFO *recinfo,*recinfo_pos;
|
|
DBUG_ENTER("ha_isam::create");
|
|
|
|
type=HA_KEYTYPE_BINARY; // Keep compiler happy
|
|
if (!(recinfo= (N_RECINFO*) my_malloc((form->fields*2+2)*sizeof(N_RECINFO),
|
|
MYF(MY_WME))))
|
|
DBUG_RETURN(1);
|
|
|
|
pos=form->key_info;
|
|
for (i=0; i < form->keys ; i++, pos++)
|
|
{
|
|
keydef[i].base.flag= (pos->flags & HA_NOSAME);
|
|
for (j=0 ; (int7) j < pos->key_parts ; j++)
|
|
{
|
|
keydef[i].seg[j].base.flag=pos->key_part[j].key_part_flag;
|
|
Field *field=pos->key_part[j].field;
|
|
type=field->key_type();
|
|
|
|
if ((options & HA_OPTION_PACK_KEYS ||
|
|
(pos->flags & (HA_PACK_KEY | HA_BINARY_PACK_KEY |
|
|
HA_SPACE_PACK_USED))) &&
|
|
pos->key_part[j].length > 8 &&
|
|
(type == HA_KEYTYPE_TEXT ||
|
|
type == HA_KEYTYPE_NUM ||
|
|
(type == HA_KEYTYPE_BINARY && !field->zero_pack())))
|
|
{
|
|
if (j == 0)
|
|
keydef[i].base.flag|=HA_PACK_KEY;
|
|
if (!(field->flags & ZEROFILL_FLAG) &&
|
|
(field->type() == FIELD_TYPE_STRING ||
|
|
field->type() == FIELD_TYPE_VAR_STRING ||
|
|
((int) (pos->key_part[j].length - field->decimals()))
|
|
>= 4))
|
|
keydef[i].seg[j].base.flag|=HA_SPACE_PACK;
|
|
}
|
|
keydef[i].seg[j].base.type=(int) type;
|
|
keydef[i].seg[j].base.start= pos->key_part[j].offset;
|
|
keydef[i].seg[j].base.length= pos->key_part[j].length;
|
|
}
|
|
keydef[i].seg[j].base.type=(int) HA_KEYTYPE_END; /* End of key-parts */
|
|
}
|
|
|
|
recpos=0; recinfo_pos=recinfo;
|
|
while (recpos < (uint) form->reclength)
|
|
{
|
|
Field **field,*found=0;
|
|
minpos=form->reclength; length=0;
|
|
|
|
for (field=form->field ; *field ; field++)
|
|
{
|
|
if ((fieldpos=(*field)->offset()) >= recpos &&
|
|
fieldpos <= minpos)
|
|
{
|
|
/* skip null fields */
|
|
if (!(temp_length= (*field)->pack_length()))
|
|
continue; /* Skipp null-fields */
|
|
if (! found || fieldpos < minpos ||
|
|
(fieldpos == minpos && temp_length < length))
|
|
{
|
|
minpos=fieldpos; found= *field; length=temp_length;
|
|
}
|
|
}
|
|
}
|
|
DBUG_PRINT("loop",("found: %lx recpos: %d minpos: %d length: %d",
|
|
found,recpos,minpos,length));
|
|
if (recpos != minpos)
|
|
{ // Reserved space (Null bits?)
|
|
recinfo_pos->base.type=(int) FIELD_NORMAL;
|
|
recinfo_pos++->base.length= (uint16) (minpos-recpos);
|
|
}
|
|
if (! found)
|
|
break;
|
|
|
|
if (found->flags & BLOB_FLAG)
|
|
{
|
|
/* ISAM can only handle blob pointers of sizeof(char(*)) */
|
|
recinfo_pos->base.type= (int) FIELD_BLOB;
|
|
if (options & HA_OPTION_LONG_BLOB_PTR)
|
|
length= length-portable_sizeof_char_ptr+sizeof(char*);
|
|
}
|
|
else if (!(options & HA_OPTION_PACK_RECORD))
|
|
recinfo_pos->base.type= (int) FIELD_NORMAL;
|
|
else if (found->zero_pack())
|
|
recinfo_pos->base.type= (int) FIELD_SKIPP_ZERO;
|
|
else
|
|
recinfo_pos->base.type= (int) ((length <= 3 ||
|
|
(found->flags & ZEROFILL_FLAG)) ?
|
|
FIELD_NORMAL :
|
|
found->type() == FIELD_TYPE_STRING ||
|
|
found->type() == FIELD_TYPE_VAR_STRING ?
|
|
FIELD_SKIPP_ENDSPACE :
|
|
FIELD_SKIPP_PRESPACE);
|
|
recinfo_pos++ ->base.length=(uint16) length;
|
|
recpos=minpos+length;
|
|
DBUG_PRINT("loop",("length: %d type: %d",
|
|
recinfo_pos[-1].base.length,recinfo_pos[-1].base.type));
|
|
|
|
if ((found->flags & BLOB_FLAG) && (options & HA_OPTION_LONG_BLOB_PTR) &&
|
|
sizeof(char*) != portable_sizeof_char_ptr)
|
|
{ // Not used space
|
|
recinfo_pos->base.type=(int) FIELD_ZERO;
|
|
recinfo_pos++->base.length=
|
|
(uint16) (portable_sizeof_char_ptr-sizeof(char*));
|
|
recpos+= (portable_sizeof_char_ptr-sizeof(char*));
|
|
}
|
|
}
|
|
recinfo_pos->base.type= (int) FIELD_LAST; /* End of fieldinfo */
|
|
error=nisam_create(fn_format(buff,name,"","",2+4+16),form->keys,keydef,
|
|
recinfo,form->max_rows,form->min_rows,0,0,0L);
|
|
my_free((gptr) recinfo,MYF(0));
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
|
|
ha_rows ha_isam::records_in_range(int inx,
|
|
const byte *start_key,uint start_key_len,
|
|
enum ha_rkey_function start_search_flag,
|
|
const byte *end_key,uint end_key_len,
|
|
enum ha_rkey_function end_search_flag)
|
|
{
|
|
return (ha_rows) nisam_records_in_range(file,
|
|
inx,
|
|
start_key,start_key_len,
|
|
start_search_flag,
|
|
end_key,end_key_len,
|
|
end_search_flag);
|
|
}
|
|
#endif /* HAVE_ISAM */
|