2006-12-31 01:02:27 +01:00
|
|
|
/* Copyright (C) 2000-2006 MySQL AB
|
2000-09-28 23:58:16 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2000-09-28 23:58:16 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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.
|
2000-09-28 23:58:16 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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 */
|
|
|
|
|
|
|
|
|
|
/* write whats in isam.log */
|
|
|
|
|
|
|
|
|
|
#ifndef USE_MY_FUNC
|
|
|
|
|
#define USE_MY_FUNC
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include "myisamdef.h"
|
2001-08-22 00:45:07 +02:00
|
|
|
#include <my_tree.h>
|
2000-07-31 21:29:14 +02:00
|
|
|
#include <stdarg.h>
|
|
|
|
|
#ifdef HAVE_GETRUSAGE
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define FILENAME(A) (A ? A->show_name : "Unknown")
|
|
|
|
|
|
|
|
|
|
struct file_info {
|
|
|
|
|
long process;
|
|
|
|
|
int filenr,id;
|
2000-09-28 23:58:16 +02:00
|
|
|
uint rnd;
|
2007-08-13 15:11:25 +02:00
|
|
|
char *name, *show_name;
|
|
|
|
|
uchar *record;
|
2000-07-31 21:29:14 +02:00
|
|
|
MI_INFO *isam;
|
2008-02-18 23:29:39 +01:00
|
|
|
my_bool closed, used;
|
2000-07-31 21:29:14 +02:00
|
|
|
ulong accessed;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct test_if_open_param {
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
char * name;
|
2000-07-31 21:29:14 +02:00
|
|
|
int max_id;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct st_access_param
|
|
|
|
|
{
|
|
|
|
|
ulong min_accessed;
|
|
|
|
|
struct file_info *found;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define NO_FILEPOS (ulong) ~0L
|
|
|
|
|
|
|
|
|
|
extern int main(int argc,char * *argv);
|
|
|
|
|
static void get_options(int *argc,char ***argv);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int examine_log(char * file_name,char **table_names);
|
|
|
|
|
static int read_string(IO_CACHE *file,uchar* *to,uint length);
|
2001-05-31 13:07:17 +02:00
|
|
|
static int file_info_compare(void *cmp_arg, void *a,void *b);
|
2000-07-31 21:29:14 +02:00
|
|
|
static int test_if_open(struct file_info *key,element_count count,
|
|
|
|
|
struct test_if_open_param *param);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static void fix_blob_pointers(MI_INFO *isam,uchar *record);
|
2000-07-31 21:29:14 +02:00
|
|
|
static int test_when_accessed(struct file_info *key,element_count count,
|
|
|
|
|
struct st_access_param *access_param);
|
|
|
|
|
static void file_info_free(struct file_info *info);
|
|
|
|
|
static int close_some_file(TREE *tree);
|
|
|
|
|
static int reopen_closed_file(TREE *tree,struct file_info *file_info);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int find_record_with_key(struct file_info *file_info,uchar *record);
|
2000-07-31 21:29:14 +02:00
|
|
|
static void printf_log(const char *str,...);
|
2008-02-18 23:29:39 +01:00
|
|
|
static my_bool cmp_filename(struct file_info *file_info,char * name);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
static uint verbose=0,update=0,test_info=0,max_files=0,re_open_count=0,
|
2003-11-20 21:06:25 +01:00
|
|
|
recover=0,prefix_remove=0,opt_processes=0;
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static char *log_filename=0, *filepath=0, *write_filename=0;
|
|
|
|
|
static char *record_pos_file= 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
static ulong com_count[10][3],number_of_commands=(ulong) ~0L,
|
|
|
|
|
isamlog_process;
|
|
|
|
|
static my_off_t isamlog_filepos,start_offset=0,record_pos= HA_OFFSET_ERROR;
|
|
|
|
|
static const char *command_name[]=
|
2000-09-28 23:58:16 +02:00
|
|
|
{"open","write","update","delete","close","extra","lock","re-open",
|
|
|
|
|
"delete-all", NullS};
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
int error,i,first;
|
|
|
|
|
ulong total_count,total_error,total_recover;
|
|
|
|
|
MY_INIT(argv[0]);
|
|
|
|
|
|
|
|
|
|
log_filename=myisam_log_filename;
|
|
|
|
|
get_options(&argc,&argv);
|
2004-02-19 18:33:09 +01:00
|
|
|
/* Number of MyISAM files we can have open at one time */
|
|
|
|
|
max_files= (my_set_max_open_files(min(max_files,8))-6)/2;
|
2000-07-31 21:29:14 +02:00
|
|
|
if (update)
|
2000-09-28 23:58:16 +02:00
|
|
|
printf("Trying to %s MyISAM files according to log '%s'\n",
|
2000-07-31 21:29:14 +02:00
|
|
|
(recover ? "recover" : "update"),log_filename);
|
|
|
|
|
error= examine_log(log_filename,argv);
|
|
|
|
|
if (update && ! error)
|
2000-09-28 23:58:16 +02:00
|
|
|
puts("Tables updated successfully");
|
2000-07-31 21:29:14 +02:00
|
|
|
total_count=total_error=total_recover=0;
|
|
|
|
|
for (i=first=0 ; command_name[i] ; i++)
|
|
|
|
|
{
|
|
|
|
|
if (com_count[i][0])
|
|
|
|
|
{
|
|
|
|
|
if (!first++)
|
|
|
|
|
{
|
|
|
|
|
if (verbose || update)
|
|
|
|
|
puts("");
|
|
|
|
|
puts("Commands Used count Errors Recover errors");
|
|
|
|
|
}
|
|
|
|
|
printf("%-12s%9ld%10ld%17ld\n",command_name[i],com_count[i][0],
|
|
|
|
|
com_count[i][1],com_count[i][2]);
|
|
|
|
|
total_count+=com_count[i][0];
|
|
|
|
|
total_error+=com_count[i][1];
|
|
|
|
|
total_recover+=com_count[i][2];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (total_count)
|
|
|
|
|
printf("%-12s%9ld%10ld%17ld\n","Total",total_count,total_error,
|
|
|
|
|
total_recover);
|
|
|
|
|
if (re_open_count)
|
|
|
|
|
printf("Had to do %d re-open because of too few possibly open files\n",
|
|
|
|
|
re_open_count);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) mi_panic(HA_PANIC_CLOSE);
|
2004-02-19 18:33:09 +01:00
|
|
|
my_free_open_file_info();
|
2000-07-31 21:29:14 +02:00
|
|
|
my_end(test_info ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
|
|
|
|
|
exit(error);
|
|
|
|
|
return 0; /* No compiler warning */
|
|
|
|
|
} /* main */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void get_options(register int *argc, register char ***argv)
|
|
|
|
|
{
|
|
|
|
|
int help,version;
|
|
|
|
|
const char *pos,*usage;
|
|
|
|
|
char option;
|
|
|
|
|
|
|
|
|
|
help=0;
|
2000-09-28 23:58:16 +02:00
|
|
|
usage="Usage: %s [-?iruvDIV] [-c #] [-f #] [-F filepath/] [-o #] [-R file recordpos] [-w write_file] [log-filename [table ...]] \n";
|
2000-07-31 21:29:14 +02:00
|
|
|
pos="";
|
|
|
|
|
|
|
|
|
|
while (--*argc > 0 && *(pos = *(++*argv)) == '-' ) {
|
|
|
|
|
while (*++pos)
|
|
|
|
|
{
|
|
|
|
|
version=0;
|
|
|
|
|
switch((option=*pos)) {
|
|
|
|
|
case '#':
|
|
|
|
|
DBUG_PUSH (++pos);
|
2004-06-03 18:52:54 +02:00
|
|
|
pos=" "; /* Skip rest of arg */
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
number_of_commands=(ulong) atol(pos);
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'u':
|
|
|
|
|
update=1;
|
|
|
|
|
break;
|
|
|
|
|
case 'f':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
max_files=(uint) atoi(pos);
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'i':
|
|
|
|
|
test_info=1;
|
|
|
|
|
break;
|
|
|
|
|
case 'o':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
start_offset=(my_off_t) strtoll(pos,NULL,10);
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'p':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
prefix_remove=atoi(pos);
|
|
|
|
|
break;
|
|
|
|
|
case 'r':
|
|
|
|
|
update=1;
|
|
|
|
|
recover++;
|
|
|
|
|
break;
|
2000-09-14 01:39:07 +02:00
|
|
|
case 'P':
|
|
|
|
|
opt_processes=1;
|
|
|
|
|
break;
|
2000-07-31 21:29:14 +02:00
|
|
|
case 'R':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
record_pos_file=(char*) pos;
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
record_pos=(my_off_t) strtoll(*(++*argv),NULL,10);
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'v':
|
|
|
|
|
verbose++;
|
|
|
|
|
break;
|
|
|
|
|
case 'w':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
write_filename=(char*) pos;
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
if (! *++pos)
|
|
|
|
|
{
|
|
|
|
|
if (!--*argc)
|
|
|
|
|
goto err;
|
|
|
|
|
else
|
|
|
|
|
pos= *(++*argv);
|
|
|
|
|
}
|
|
|
|
|
filepath= (char*) pos;
|
|
|
|
|
pos=" ";
|
|
|
|
|
break;
|
|
|
|
|
case 'V':
|
|
|
|
|
version=1;
|
|
|
|
|
/* Fall through */
|
|
|
|
|
case 'I':
|
|
|
|
|
case '?':
|
2005-01-13 18:24:54 +01:00
|
|
|
#include <help_start.h>
|
2001-08-22 00:45:07 +02:00
|
|
|
printf("%s Ver 1.4 for %s at %s\n",my_progname,SYSTEM_TYPE,
|
2000-07-31 21:29:14 +02:00
|
|
|
MACHINE_TYPE);
|
|
|
|
|
puts("By Monty, for your professional use\n");
|
|
|
|
|
if (version)
|
|
|
|
|
break;
|
2001-08-22 00:45:07 +02:00
|
|
|
puts("Write info about whats in a MyISAM log file.");
|
2000-07-31 21:29:14 +02:00
|
|
|
printf("If no file name is given %s is used\n",log_filename);
|
|
|
|
|
puts("");
|
|
|
|
|
printf(usage,my_progname);
|
|
|
|
|
puts("");
|
|
|
|
|
puts("Options: -? or -I \"Info\" -V \"version\" -c \"do only # commands\"");
|
|
|
|
|
puts(" -f \"max open files\" -F \"filepath\" -i \"extra info\"");
|
|
|
|
|
puts(" -o \"offset\" -p # \"remove # components from path\"");
|
|
|
|
|
puts(" -r \"recover\" -R \"file recordposition\"");
|
|
|
|
|
puts(" -u \"update\" -v \"verbose\" -w \"write file\"");
|
2001-08-22 00:45:07 +02:00
|
|
|
puts(" -D \"myisam compiled with DBUG\" -P \"processes\"");
|
2000-07-31 21:29:14 +02:00
|
|
|
puts("\nOne can give a second and a third '-v' for more verbose.");
|
|
|
|
|
puts("Normaly one does a update (-u).");
|
|
|
|
|
puts("If a recover is done all writes and all possibly updates and deletes is done\nand errors are only counted.");
|
|
|
|
|
puts("If one gives table names as arguments only these tables will be updated\n");
|
|
|
|
|
help=1;
|
2005-01-13 18:24:54 +01:00
|
|
|
#include <help_end.h>
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
printf("illegal option: \"-%c\"\n",*pos);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (! *argc)
|
|
|
|
|
{
|
|
|
|
|
if (help)
|
|
|
|
|
exit(0);
|
|
|
|
|
(*argv)++;
|
|
|
|
|
}
|
|
|
|
|
if (*argc >= 1)
|
|
|
|
|
{
|
|
|
|
|
log_filename=(char*) pos;
|
|
|
|
|
(*argc)--;
|
|
|
|
|
(*argv)++;
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
err:
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) fprintf(stderr,"option \"%c\" used without or with wrong argument\n",
|
|
|
|
|
option);
|
2000-07-31 21:29:14 +02:00
|
|
|
exit(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int examine_log(char * file_name, char **table_names)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
uint command,result,files_open;
|
|
|
|
|
ulong access_time,length;
|
|
|
|
|
my_off_t filepos;
|
|
|
|
|
int lock_command,mi_result;
|
|
|
|
|
char isam_file_name[FN_REFLEN],llbuff[21],llbuff2[21];
|
|
|
|
|
uchar head[20];
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar* buff;
|
2000-07-31 21:29:14 +02:00
|
|
|
struct test_if_open_param open_param;
|
|
|
|
|
IO_CACHE cache;
|
|
|
|
|
File file;
|
|
|
|
|
FILE *write_file;
|
|
|
|
|
enum ha_extra_function extra_command;
|
|
|
|
|
TREE tree;
|
|
|
|
|
struct file_info file_info,*curr_file_info;
|
|
|
|
|
DBUG_ENTER("examine_log");
|
|
|
|
|
|
|
|
|
|
if ((file=my_open(file_name,O_RDONLY,MYF(MY_WME))) < 0)
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
write_file=0;
|
|
|
|
|
if (write_filename)
|
|
|
|
|
{
|
|
|
|
|
if (!(write_file=my_fopen(write_filename,O_WRONLY,MYF(MY_WME))))
|
|
|
|
|
{
|
|
|
|
|
my_close(file,MYF(0));
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
init_io_cache(&cache,file,0,READ_CACHE,start_offset,0,MYF(0));
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
bzero((uchar*) com_count,sizeof(com_count));
|
2001-07-02 21:18:57 +02:00
|
|
|
init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1,
|
|
|
|
|
(tree_element_free) file_info_free, NULL);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) init_key_cache(dflt_key_cache,KEY_CACHE_BLOCK_SIZE,KEY_CACHE_SIZE,
|
|
|
|
|
0, 0);
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
files_open=0; access_time=0;
|
|
|
|
|
while (access_time++ != number_of_commands &&
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
!my_b_read(&cache,(uchar*) head,9))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
isamlog_filepos=my_b_tell(&cache)-9L;
|
|
|
|
|
file_info.filenr= mi_uint2korr(head+1);
|
|
|
|
|
isamlog_process=file_info.process=(long) mi_uint4korr(head+3);
|
2000-09-14 01:39:07 +02:00
|
|
|
if (!opt_processes)
|
|
|
|
|
file_info.process=0;
|
2000-07-31 21:29:14 +02:00
|
|
|
result= mi_uint2korr(head+7);
|
2002-04-25 10:36:55 +02:00
|
|
|
if ((curr_file_info=(struct file_info*) tree_search(&tree, &file_info,
|
|
|
|
|
tree.custom_arg)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
curr_file_info->accessed=access_time;
|
|
|
|
|
if (update && curr_file_info->used && curr_file_info->closed)
|
|
|
|
|
{
|
|
|
|
|
if (reopen_closed_file(&tree,curr_file_info))
|
|
|
|
|
{
|
|
|
|
|
command=sizeof(com_count)/sizeof(com_count[0][0])/3;
|
|
|
|
|
result=0;
|
|
|
|
|
goto com_err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
command=(uint) head[0];
|
|
|
|
|
if (command < sizeof(com_count)/sizeof(com_count[0][0])/3 &&
|
2000-09-26 21:39:45 +02:00
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
com_count[command][0]++;
|
|
|
|
|
if (result)
|
|
|
|
|
com_count[command][1]++;
|
|
|
|
|
}
|
|
|
|
|
switch ((enum myisam_log_commands) command) {
|
|
|
|
|
case MI_LOG_OPEN:
|
2000-09-26 21:39:45 +02:00
|
|
|
if (!table_names[0])
|
|
|
|
|
{
|
2000-09-28 23:58:16 +02:00
|
|
|
com_count[command][0]--; /* Must be counted explicite */
|
2000-09-26 21:39:45 +02:00
|
|
|
if (result)
|
|
|
|
|
com_count[command][1]--;
|
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
|
if (curr_file_info)
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
printf("\nWarning: %s is opened with same process and filenumber\n"
|
|
|
|
|
"Maybe you should use the -P option ?\n",
|
2000-07-31 21:29:14 +02:00
|
|
|
curr_file_info->show_name);
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(&cache,(uchar*) head,2))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
2010-06-10 22:16:43 +02:00
|
|
|
buff= 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
file_info.name=0;
|
|
|
|
|
file_info.show_name=0;
|
|
|
|
|
file_info.record=0;
|
2010-06-10 22:16:43 +02:00
|
|
|
if (read_string(&cache, &buff, (uint) mi_uint2korr(head)))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
|
|
|
|
{
|
|
|
|
|
uint i;
|
2000-09-14 01:39:07 +02:00
|
|
|
char *pos,*to;
|
|
|
|
|
|
|
|
|
|
/* Fix if old DOS files to new format */
|
2010-06-10 22:16:43 +02:00
|
|
|
for (pos=file_info.name=(char*)buff; (pos=strchr(pos,'\\')) ; pos++)
|
2000-09-14 01:39:07 +02:00
|
|
|
*pos= '/';
|
|
|
|
|
|
2000-09-28 23:58:16 +02:00
|
|
|
pos=file_info.name;
|
2000-07-31 21:29:14 +02:00
|
|
|
for (i=0 ; i < prefix_remove ; i++)
|
|
|
|
|
{
|
|
|
|
|
char *next;
|
2000-09-14 01:39:07 +02:00
|
|
|
if (!(next=strchr(pos,'/')))
|
2000-07-31 21:29:14 +02:00
|
|
|
break;
|
|
|
|
|
pos=next+1;
|
|
|
|
|
}
|
|
|
|
|
to=isam_file_name;
|
|
|
|
|
if (filepath)
|
2001-10-08 03:58:07 +02:00
|
|
|
to=convert_dirname(isam_file_name,filepath,NullS);
|
2000-07-31 21:29:14 +02:00
|
|
|
strmov(to,pos);
|
|
|
|
|
fn_ext(isam_file_name)[0]=0; /* Remove extension */
|
|
|
|
|
}
|
|
|
|
|
open_param.name=file_info.name;
|
|
|
|
|
open_param.max_id=0;
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) tree_walk(&tree,(tree_walk_action) test_if_open,(void*) &open_param,
|
|
|
|
|
left_root_right);
|
2000-07-31 21:29:14 +02:00
|
|
|
file_info.id=open_param.max_id+1;
|
2003-08-26 21:02:58 +02:00
|
|
|
/*
|
|
|
|
|
* In the line below +10 is added to accomodate '<' and '>' chars
|
|
|
|
|
* plus '\0' at the end, so that there is place for 7 digits.
|
|
|
|
|
* It is improbable that same table can have that many entries in
|
|
|
|
|
* the table cache.
|
|
|
|
|
* The additional space is needed for the sprintf commands two lines
|
|
|
|
|
* below.
|
|
|
|
|
*/
|
2000-07-31 21:29:14 +02:00
|
|
|
file_info.show_name=my_memdup(isam_file_name,
|
2003-08-26 21:02:58 +02:00
|
|
|
(uint) strlen(isam_file_name)+10,
|
2000-07-31 21:29:14 +02:00
|
|
|
MYF(MY_WME));
|
|
|
|
|
if (file_info.id > 1)
|
|
|
|
|
sprintf(strend(file_info.show_name),"<%d>",file_info.id);
|
|
|
|
|
file_info.closed=1;
|
|
|
|
|
file_info.accessed=access_time;
|
|
|
|
|
file_info.used=1;
|
|
|
|
|
if (table_names[0])
|
|
|
|
|
{
|
|
|
|
|
char **name;
|
|
|
|
|
file_info.used=0;
|
|
|
|
|
for (name=table_names ; *name ; name++)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp(*name,isam_file_name))
|
|
|
|
|
file_info.used=1; /* Update/log only this */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (update && file_info.used)
|
|
|
|
|
{
|
|
|
|
|
if (files_open >= max_files)
|
|
|
|
|
{
|
|
|
|
|
if (close_some_file(&tree))
|
|
|
|
|
goto com_err;
|
|
|
|
|
files_open--;
|
|
|
|
|
}
|
|
|
|
|
if (!(file_info.isam= mi_open(isam_file_name,O_RDWR,
|
|
|
|
|
HA_OPEN_WAIT_IF_LOCKED)))
|
|
|
|
|
goto com_err;
|
|
|
|
|
if (!(file_info.record=my_malloc(file_info.isam->s->base.reclength,
|
|
|
|
|
MYF(MY_WME))))
|
|
|
|
|
goto end;
|
|
|
|
|
files_open++;
|
|
|
|
|
file_info.closed=0;
|
|
|
|
|
}
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) tree_insert(&tree, (uchar*) &file_info, 0, tree.custom_arg);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (file_info.used)
|
|
|
|
|
{
|
|
|
|
|
if (verbose && !record_pos_file)
|
2000-09-14 01:39:07 +02:00
|
|
|
printf_log("%s: open -> %d",file_info.show_name, file_info.filenr);
|
2000-07-31 21:29:14 +02:00
|
|
|
com_count[command][0]++;
|
|
|
|
|
if (result)
|
|
|
|
|
com_count[command][1]++;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_CLOSE:
|
|
|
|
|
if (verbose && !record_pos_file &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
printf_log("%s: %s -> %d",FILENAME(curr_file_info),
|
|
|
|
|
command_name[command],result);
|
|
|
|
|
if (curr_file_info)
|
|
|
|
|
{
|
|
|
|
|
if (!curr_file_info->closed)
|
|
|
|
|
files_open--;
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) tree_delete(&tree, (uchar*) curr_file_info, 0, tree.custom_arg);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_EXTRA:
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(&cache,(uchar*) head,1))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
|
|
|
|
extra_command=(enum ha_extra_function) head[0];
|
|
|
|
|
if (verbose && !record_pos_file &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
printf_log("%s: %s(%d) -> %d",FILENAME(curr_file_info),
|
|
|
|
|
command_name[command], (int) extra_command,result);
|
|
|
|
|
if (update && curr_file_info && !curr_file_info->closed)
|
|
|
|
|
{
|
2002-07-23 17:31:22 +02:00
|
|
|
if (mi_extra(curr_file_info->isam, extra_command, 0) != (int) result)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stdout);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) fprintf(stderr,
|
2000-07-31 21:29:14 +02:00
|
|
|
"Warning: error %d, expected %d on command %s at %s\n",
|
|
|
|
|
my_errno,result,command_name[command],
|
2009-11-24 14:54:59 +01:00
|
|
|
llstr(isamlog_filepos,llbuff));
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stderr);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_DELETE:
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(&cache,(uchar*) head,8))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
|
|
|
|
filepos=mi_sizekorr(head);
|
|
|
|
|
if (verbose && (!record_pos_file ||
|
|
|
|
|
((record_pos == filepos || record_pos == NO_FILEPOS) &&
|
|
|
|
|
!cmp_filename(curr_file_info,record_pos_file))) &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
printf_log("%s: %s at %ld -> %d",FILENAME(curr_file_info),
|
|
|
|
|
command_name[command],(long) filepos,result);
|
|
|
|
|
if (update && curr_file_info && !curr_file_info->closed)
|
|
|
|
|
{
|
|
|
|
|
if (mi_rrnd(curr_file_info->isam,curr_file_info->record,filepos))
|
|
|
|
|
{
|
|
|
|
|
if (!recover)
|
|
|
|
|
goto com_err;
|
2000-09-26 21:39:45 +02:00
|
|
|
if (verbose)
|
|
|
|
|
printf_log("error: Didn't find row to delete with mi_rrnd");
|
2000-07-31 21:29:14 +02:00
|
|
|
com_count[command][2]++; /* Mark error */
|
|
|
|
|
}
|
|
|
|
|
mi_result=mi_delete(curr_file_info->isam,curr_file_info->record);
|
|
|
|
|
if ((mi_result == 0 && result) ||
|
|
|
|
|
(mi_result && (uint) my_errno != result))
|
|
|
|
|
{
|
|
|
|
|
if (!recover)
|
|
|
|
|
goto com_err;
|
|
|
|
|
if (mi_result)
|
|
|
|
|
com_count[command][2]++; /* Mark error */
|
2000-09-26 21:39:45 +02:00
|
|
|
if (verbose)
|
|
|
|
|
printf_log("error: Got result %d from mi_delete instead of %d",
|
|
|
|
|
mi_result, result);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_WRITE:
|
|
|
|
|
case MI_LOG_UPDATE:
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(&cache,(uchar*) head,12))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
|
|
|
|
filepos=mi_sizekorr(head);
|
|
|
|
|
length=mi_uint4korr(head+8);
|
|
|
|
|
buff=0;
|
|
|
|
|
if (read_string(&cache,&buff,(uint) length))
|
|
|
|
|
goto err;
|
|
|
|
|
if ((!record_pos_file ||
|
|
|
|
|
((record_pos == filepos || record_pos == NO_FILEPOS) &&
|
|
|
|
|
!cmp_filename(curr_file_info,record_pos_file))) &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
{
|
|
|
|
|
if (write_file &&
|
|
|
|
|
(my_fwrite(write_file,buff,length,MYF(MY_WAIT_IF_FULL | MY_NABP))))
|
|
|
|
|
goto end;
|
|
|
|
|
if (verbose)
|
|
|
|
|
printf_log("%s: %s at %ld, length=%ld -> %d",
|
|
|
|
|
FILENAME(curr_file_info),
|
|
|
|
|
command_name[command], filepos,length,result);
|
|
|
|
|
}
|
|
|
|
|
if (update && curr_file_info && !curr_file_info->closed)
|
|
|
|
|
{
|
|
|
|
|
if (curr_file_info->isam->s->base.blobs)
|
|
|
|
|
fix_blob_pointers(curr_file_info->isam,buff);
|
|
|
|
|
if ((enum myisam_log_commands) command == MI_LOG_UPDATE)
|
|
|
|
|
{
|
|
|
|
|
if (mi_rrnd(curr_file_info->isam,curr_file_info->record,filepos))
|
|
|
|
|
{
|
|
|
|
|
if (!recover)
|
|
|
|
|
{
|
|
|
|
|
result=0;
|
|
|
|
|
goto com_err;
|
|
|
|
|
}
|
2000-09-26 21:39:45 +02:00
|
|
|
if (verbose)
|
|
|
|
|
printf_log("error: Didn't find row to update with mi_rrnd");
|
2000-07-31 21:29:14 +02:00
|
|
|
if (recover == 1 || result ||
|
|
|
|
|
find_record_with_key(curr_file_info,buff))
|
|
|
|
|
{
|
|
|
|
|
com_count[command][2]++; /* Mark error */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
mi_result=mi_update(curr_file_info->isam,curr_file_info->record,
|
|
|
|
|
buff);
|
|
|
|
|
if ((mi_result == 0 && result) ||
|
|
|
|
|
(mi_result && (uint) my_errno != result))
|
|
|
|
|
{
|
|
|
|
|
if (!recover)
|
|
|
|
|
goto com_err;
|
2000-09-26 21:39:45 +02:00
|
|
|
if (verbose)
|
|
|
|
|
printf_log("error: Got result %d from mi_update instead of %d",
|
|
|
|
|
mi_result, result);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (mi_result)
|
|
|
|
|
com_count[command][2]++; /* Mark error */
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
mi_result=mi_write(curr_file_info->isam,buff);
|
|
|
|
|
if ((mi_result == 0 && result) ||
|
|
|
|
|
(mi_result && (uint) my_errno != result))
|
|
|
|
|
{
|
|
|
|
|
if (!recover)
|
|
|
|
|
goto com_err;
|
2000-09-26 21:39:45 +02:00
|
|
|
if (verbose)
|
|
|
|
|
printf_log("error: Got result %d from mi_write instead of %d",
|
|
|
|
|
mi_result, result);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (mi_result)
|
|
|
|
|
com_count[command][2]++; /* Mark error */
|
|
|
|
|
}
|
2000-09-26 21:39:45 +02:00
|
|
|
if (!recover && filepos != curr_file_info->isam->lastpos)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2000-09-26 21:39:45 +02:00
|
|
|
printf("error: Wrote at position: %s, should have been %s",
|
2000-07-31 21:29:14 +02:00
|
|
|
llstr(curr_file_info->isam->lastpos,llbuff),
|
|
|
|
|
llstr(filepos,llbuff2));
|
2000-09-26 21:39:45 +02:00
|
|
|
goto end;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
my_free(buff,MYF(0));
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_LOCK:
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
if (my_b_read(&cache,(uchar*) head,sizeof(lock_command)))
|
2000-07-31 21:29:14 +02:00
|
|
|
goto err;
|
|
|
|
|
memcpy_fixed(&lock_command,head,sizeof(lock_command));
|
|
|
|
|
if (verbose && !record_pos_file &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
printf_log("%s: %s(%d) -> %d\n",FILENAME(curr_file_info),
|
|
|
|
|
command_name[command],lock_command,result);
|
|
|
|
|
if (update && curr_file_info && !curr_file_info->closed)
|
|
|
|
|
{
|
|
|
|
|
if (mi_lock_database(curr_file_info->isam,lock_command) !=
|
|
|
|
|
(int) result)
|
|
|
|
|
goto com_err;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case MI_LOG_DELETE_ALL:
|
|
|
|
|
if (verbose && !record_pos_file &&
|
|
|
|
|
(!table_names[0] || (curr_file_info && curr_file_info->used)))
|
|
|
|
|
printf_log("%s: %s -> %d\n",FILENAME(curr_file_info),
|
|
|
|
|
command_name[command],result);
|
|
|
|
|
break;
|
|
|
|
|
default:
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stdout);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) fprintf(stderr,
|
2000-07-31 21:29:14 +02:00
|
|
|
"Error: found unknown command %d in logfile, aborted\n",
|
2009-11-24 14:54:59 +01:00
|
|
|
command);
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stderr);
|
2000-07-31 21:29:14 +02:00
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-11-20 21:06:25 +01:00
|
|
|
end_key_cache(dflt_key_cache,1);
|
2000-07-31 21:29:14 +02:00
|
|
|
delete_tree(&tree);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) end_io_cache(&cache);
|
|
|
|
|
(void) my_close(file,MYF(0));
|
2000-07-31 21:29:14 +02:00
|
|
|
if (write_file && my_fclose(write_file,MYF(MY_WME)))
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
|
|
err:
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stdout);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) fprintf(stderr,"Got error %d when reading from logfile\n",my_errno);
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stderr);
|
2000-07-31 21:29:14 +02:00
|
|
|
goto end;
|
|
|
|
|
com_err:
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stdout);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) fprintf(stderr,"Got error %d, expected %d on command %s at %s\n",
|
2000-07-31 21:29:14 +02:00
|
|
|
my_errno,result,command_name[command],
|
2009-11-24 14:54:59 +01:00
|
|
|
llstr(isamlog_filepos,llbuff));
|
2000-09-28 23:58:16 +02:00
|
|
|
fflush(stderr);
|
2000-07-31 21:29:14 +02:00
|
|
|
end:
|
2003-11-20 21:06:25 +01:00
|
|
|
end_key_cache(dflt_key_cache, 1);
|
2000-07-31 21:29:14 +02:00
|
|
|
delete_tree(&tree);
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) end_io_cache(&cache);
|
|
|
|
|
(void) my_close(file,MYF(0));
|
2000-07-31 21:29:14 +02:00
|
|
|
if (write_file)
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) my_fclose(write_file,MYF(MY_WME));
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int read_string(IO_CACHE *file, register uchar* *to, register uint length)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
DBUG_ENTER("read_string");
|
|
|
|
|
|
|
|
|
|
if (*to)
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
my_free((uchar*) *to,MYF(0));
|
|
|
|
|
if (!(*to= (uchar*) my_malloc(length+1,MYF(MY_WME))) ||
|
|
|
|
|
my_b_read(file,(uchar*) *to,length))
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
if (*to)
|
|
|
|
|
my_free(*to,MYF(0));
|
|
|
|
|
*to= 0;
|
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
}
|
2010-06-10 22:16:43 +02:00
|
|
|
*((uchar*) *to+length)= '\0';
|
2000-07-31 21:29:14 +02:00
|
|
|
DBUG_RETURN (0);
|
|
|
|
|
} /* read_string */
|
|
|
|
|
|
|
|
|
|
|
2001-05-31 13:07:17 +02:00
|
|
|
static int file_info_compare(void* cmp_arg __attribute__((unused)),
|
|
|
|
|
void *a, void *b)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
long lint;
|
|
|
|
|
|
|
|
|
|
if ((lint=((struct file_info*) a)->process -
|
|
|
|
|
((struct file_info*) b)->process))
|
|
|
|
|
return lint < 0L ? -1 : 1;
|
|
|
|
|
return ((struct file_info*) a)->filenr - ((struct file_info*) b)->filenr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
|
|
|
|
|
static int test_if_open (struct file_info *key,
|
|
|
|
|
element_count count __attribute__((unused)),
|
|
|
|
|
struct test_if_open_param *param)
|
|
|
|
|
{
|
|
|
|
|
if (!strcmp(key->name,param->name) && key->id > param->max_id)
|
|
|
|
|
param->max_id=key->id;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static void fix_blob_pointers(MI_INFO *info, uchar *record)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
uchar *pos;
|
2000-07-31 21:29:14 +02:00
|
|
|
MI_BLOB *blob,*end;
|
|
|
|
|
|
|
|
|
|
pos=record+info->s->base.reclength;
|
|
|
|
|
for (end=info->blobs+info->s->base.blobs, blob= info->blobs;
|
|
|
|
|
blob != end ;
|
|
|
|
|
blob++)
|
|
|
|
|
{
|
|
|
|
|
memcpy_fixed(record+blob->offset+blob->pack_length,&pos,sizeof(char*));
|
|
|
|
|
pos+=_mi_calc_blob_length(blob->pack_length,record+blob->offset);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* close the file with hasn't been accessed for the longest time */
|
|
|
|
|
/* ARGSUSED */
|
|
|
|
|
|
|
|
|
|
static int test_when_accessed (struct file_info *key,
|
|
|
|
|
element_count count __attribute__((unused)),
|
|
|
|
|
struct st_access_param *access_param)
|
|
|
|
|
{
|
|
|
|
|
if (key->accessed < access_param->min_accessed && ! key->closed)
|
|
|
|
|
{
|
|
|
|
|
access_param->min_accessed=key->accessed;
|
|
|
|
|
access_param->found=key;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void file_info_free(struct file_info *fileinfo)
|
|
|
|
|
{
|
|
|
|
|
DBUG_ENTER("file_info_free");
|
|
|
|
|
if (update)
|
|
|
|
|
{
|
|
|
|
|
if (!fileinfo->closed)
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) mi_close(fileinfo->isam);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (fileinfo->record)
|
|
|
|
|
my_free(fileinfo->record,MYF(0));
|
|
|
|
|
}
|
|
|
|
|
my_free(fileinfo->name,MYF(0));
|
|
|
|
|
my_free(fileinfo->show_name,MYF(0));
|
|
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int close_some_file(TREE *tree)
|
|
|
|
|
{
|
|
|
|
|
struct st_access_param access_param;
|
|
|
|
|
|
|
|
|
|
access_param.min_accessed=LONG_MAX;
|
|
|
|
|
access_param.found=0;
|
|
|
|
|
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) tree_walk(tree,(tree_walk_action) test_when_accessed,
|
|
|
|
|
(void*) &access_param,left_root_right);
|
2000-07-31 21:29:14 +02:00
|
|
|
if (!access_param.found)
|
|
|
|
|
return 1; /* No open file that is possibly to close */
|
|
|
|
|
if (mi_close(access_param.found->isam))
|
|
|
|
|
return 1;
|
|
|
|
|
access_param.found->closed=1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int reopen_closed_file(TREE *tree, struct file_info *fileinfo)
|
|
|
|
|
{
|
|
|
|
|
char name[FN_REFLEN];
|
|
|
|
|
if (close_some_file(tree))
|
|
|
|
|
return 1; /* No file to close */
|
|
|
|
|
strmov(name,fileinfo->show_name);
|
|
|
|
|
if (fileinfo->id > 1)
|
|
|
|
|
*strrchr(name,'<')='\0'; /* Remove "<id>" */
|
|
|
|
|
|
|
|
|
|
if (!(fileinfo->isam= mi_open(name,O_RDWR,HA_OPEN_WAIT_IF_LOCKED)))
|
|
|
|
|
return 1;
|
|
|
|
|
fileinfo->closed=0;
|
|
|
|
|
re_open_count++;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try to find record with uniq key */
|
|
|
|
|
|
WL#3817: Simplify string / memory area types and make things more consistent (first part)
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
2007-05-10 11:59:39 +02:00
|
|
|
static int find_record_with_key(struct file_info *file_info, uchar *record)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
uint key;
|
|
|
|
|
MI_INFO *info=file_info->isam;
|
|
|
|
|
uchar tmp_key[MI_MAX_KEY_BUFF];
|
|
|
|
|
|
|
|
|
|
for (key=0 ; key < info->s->base.keys ; key++)
|
|
|
|
|
{
|
2005-07-19 14:13:56 +02:00
|
|
|
if (mi_is_key_active(info->s->state.key_map, key) &&
|
2000-07-31 21:29:14 +02:00
|
|
|
info->s->keyinfo[key].flag & HA_NOSAME)
|
|
|
|
|
{
|
2009-11-24 14:54:59 +01:00
|
|
|
(void) _mi_make_key(info,key,tmp_key,record,0L);
|
2007-08-13 15:11:25 +02:00
|
|
|
return mi_rkey(info,file_info->record,(int) key,tmp_key,0,
|
2000-07-31 21:29:14 +02:00
|
|
|
HA_READ_KEY_EXACT);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void printf_log(const char *format,...)
|
|
|
|
|
{
|
|
|
|
|
char llbuff[21];
|
|
|
|
|
va_list args;
|
|
|
|
|
va_start(args,format);
|
|
|
|
|
if (verbose > 2)
|
|
|
|
|
printf("%9s:",llstr(isamlog_filepos,llbuff));
|
|
|
|
|
if (verbose > 1)
|
|
|
|
|
printf("%5ld ",isamlog_process); /* Write process number */
|
|
|
|
|
(void) vprintf((char*) format,args);
|
|
|
|
|
putchar('\n');
|
|
|
|
|
va_end(args);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-02-18 23:29:39 +01:00
|
|
|
static my_bool cmp_filename(struct file_info *file_info, char * name)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
|
|
|
|
if (!file_info)
|
|
|
|
|
return 1;
|
|
|
|
|
return strcmp(file_info->name,name) ? 1 : 0;
|
|
|
|
|
}
|
2009-11-25 13:25:01 +01:00
|
|
|
|
|
|
|
|
#include "mi_extrafunc.h"
|