mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
43abc597b8
Fixed bug in optimizer where it didn't choose right table order in some cases myisam/mi_delete.c: Remove not needed include errno.h myisam/mi_delete_table.c: Remove not needed include errno.h myisam/mi_extra.c: Remove not needed include errno.h myisam/mi_locking.c: Remove not needed include errno.h myisam/mi_log.c: Remove not needed include errno.h myisam/mi_page.c: Remove not needed include errno.h myisam/mi_rename.c: Remove not needed include errno.h myisam/mi_update.c: Remove not needed include errno.h myisam/mi_write.c: Remove not needed include errno.h mysql-test/r/subselect.result: Update of test after optimzier fix mysys/charset.c: Code cleanup sql/item_cmpfunc.cc: Removed not needed comment Indentation cleanup sql/item_cmpfunc.h: Indentation cleanup sql/mysqld.cc: Updated comment for expire_logs_days sql/set_var.cc: Remved duplicate code sql/sql_select.cc: Fixed bug in optimizer where it didn't choose right table order in some cases (Bug found and fixed by Igor)
164 lines
4.7 KiB
C
164 lines
4.7 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Logging of MyISAM commands and records on logfile for debugging
|
|
The log can be examined with help of the myisamlog command.
|
|
*/
|
|
|
|
#include "myisamdef.h"
|
|
#if defined(MSDOS) || defined(__WIN__)
|
|
#include <fcntl.h>
|
|
#ifndef __WIN__
|
|
#include <process.h>
|
|
#endif
|
|
#endif
|
|
#ifdef VMS
|
|
#include <processes.h>
|
|
#endif
|
|
|
|
#undef GETPID /* For HPUX */
|
|
#ifdef THREAD
|
|
#define GETPID() (log_type == 1 ? (long) myisam_pid : (long) my_thread_id());
|
|
#else
|
|
#define GETPID() myisam_pid
|
|
#endif
|
|
|
|
/* Activate logging if flag is 1 and reset logging if flag is 0 */
|
|
|
|
static int log_type=0;
|
|
ulong myisam_pid=0;
|
|
|
|
int mi_log(int activate_log)
|
|
{
|
|
int error=0;
|
|
char buff[FN_REFLEN];
|
|
DBUG_ENTER("mi_log");
|
|
|
|
log_type=activate_log;
|
|
if (activate_log)
|
|
{
|
|
if (!myisam_pid)
|
|
myisam_pid=(ulong) getpid();
|
|
if (myisam_log_file < 0)
|
|
{
|
|
if ((myisam_log_file = my_create(fn_format(buff,myisam_log_filename,
|
|
"",".log",4),
|
|
0,(O_RDWR | O_BINARY | O_APPEND),MYF(0)))
|
|
< 0)
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
}
|
|
else if (myisam_log_file >= 0)
|
|
{
|
|
error=my_close(myisam_log_file,MYF(0)) ? my_errno : 0 ;
|
|
myisam_log_file= -1;
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
|
|
/* Logging of records and commands on logfile */
|
|
/* All logs starts with command(1) dfile(2) process(4) result(2) */
|
|
|
|
void _myisam_log(enum myisam_log_commands command, MI_INFO *info,
|
|
const byte *buffert, uint length)
|
|
{
|
|
char buff[11];
|
|
int error,old_errno;
|
|
ulong pid=(ulong) GETPID();
|
|
old_errno=my_errno;
|
|
bzero(buff,sizeof(buff));
|
|
buff[0]=(char) command;
|
|
mi_int2store(buff+1,info->dfile);
|
|
mi_int4store(buff+3,pid);
|
|
mi_int2store(buff+9,length);
|
|
|
|
pthread_mutex_lock(&THR_LOCK_myisam);
|
|
error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
VOID(my_write(myisam_log_file,buff,sizeof(buff),MYF(0)));
|
|
VOID(my_write(myisam_log_file,buffert,length,MYF(0)));
|
|
if (!error)
|
|
error=my_lock(myisam_log_file,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
pthread_mutex_unlock(&THR_LOCK_myisam);
|
|
my_errno=old_errno;
|
|
}
|
|
|
|
|
|
void _myisam_log_command(enum myisam_log_commands command, MI_INFO *info,
|
|
const byte *buffert, uint length, int result)
|
|
{
|
|
char buff[9];
|
|
int error,old_errno;
|
|
ulong pid=(ulong) GETPID();
|
|
|
|
old_errno=my_errno;
|
|
buff[0]=(char) command;
|
|
mi_int2store(buff+1,info->dfile);
|
|
mi_int4store(buff+3,pid);
|
|
mi_int2store(buff+7,result);
|
|
pthread_mutex_lock(&THR_LOCK_myisam);
|
|
error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
VOID(my_write(myisam_log_file,buff,sizeof(buff),MYF(0)));
|
|
if (buffert)
|
|
VOID(my_write(myisam_log_file,buffert,length,MYF(0)));
|
|
if (!error)
|
|
error=my_lock(myisam_log_file,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
pthread_mutex_unlock(&THR_LOCK_myisam);
|
|
my_errno=old_errno;
|
|
}
|
|
|
|
|
|
void _myisam_log_record(enum myisam_log_commands command, MI_INFO *info,
|
|
const byte *record, my_off_t filepos, int result)
|
|
{
|
|
char buff[21],*pos;
|
|
int error,old_errno;
|
|
uint length;
|
|
ulong pid=(ulong) GETPID();
|
|
|
|
old_errno=my_errno;
|
|
if (!info->s->base.blobs)
|
|
length=info->s->base.reclength;
|
|
else
|
|
length=info->s->base.reclength+ _my_calc_total_blob_length(info,record);
|
|
buff[0]=(char) command;
|
|
mi_int2store(buff+1,info->dfile);
|
|
mi_int4store(buff+3,pid);
|
|
mi_int2store(buff+7,result);
|
|
mi_sizestore(buff+9,filepos);
|
|
mi_int4store(buff+17,length);
|
|
pthread_mutex_lock(&THR_LOCK_myisam);
|
|
error=my_lock(myisam_log_file,F_WRLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
VOID(my_write(myisam_log_file,buff,sizeof(buff),MYF(0)));
|
|
VOID(my_write(myisam_log_file,(byte*) record,info->s->base.reclength,MYF(0)));
|
|
if (info->s->base.blobs)
|
|
{
|
|
MI_BLOB *blob,*end;
|
|
|
|
for (end=info->blobs+info->s->base.blobs, blob= info->blobs;
|
|
blob != end ;
|
|
blob++)
|
|
{
|
|
memcpy_fixed(&pos,record+blob->offset+blob->pack_length,sizeof(char*));
|
|
VOID(my_write(myisam_log_file,pos,blob->length,MYF(0)));
|
|
}
|
|
}
|
|
if (!error)
|
|
error=my_lock(myisam_log_file,F_UNLCK,0L,F_TO_EOF,MYF(MY_SEEK_NOT_DONE));
|
|
pthread_mutex_unlock(&THR_LOCK_myisam);
|
|
my_errno=old_errno;
|
|
}
|