mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
31b9e6e03f
Fix bug in isamlog Add argument types to function declarations. Docs/manual.texi: Updated credits client/mysql.cc: Fixes for OS2 client/mysqladmin.c: Fixes for OS2 client/mysqldump.c: Fixes for OS2 client/mysqlimport.c: Fixes for OS2 client/mysqltest.c: Fixes for OS2 dbug/dbug.c: Fixes for OS2. Use new C calling convention. dbug/factorial.c: Fixes for OS2. Use new C calling convention. include/errmsg.h: Fix for OS2 include/global.h: Fixes for OS2. include/my_pthread.h: Fixes for OS2. include/my_sys.h: Fixes for OS2. include/mysql_com.h: Move defines to global.h include/thr_alarm.h: Fixes for OS2. isam/isamchk.c: Fixes for OS2. Add arguments to function declarations. isam/isamlog.c: Fixes for OS2. Fix bug in logfile handling. isam/test1.c: Add arguments to function decl isam/test2.c: Add arguments to function declarations. isam/test_all.res: Update result libmysql/get_password.c: Fixes for OS2. libmysql/libmysql.c: Fixes for OS2. libmysql/net.c: Fixes for OS2. libmysql/violite.c: Add arguments to function declarations. merge/_locking.c: Add argument types to function declarations. merge/close.c: Add argument types to function declarations. merge/create.c: Add argument types to function declarations. merge/extra.c: Add argument types to function declarations. merge/open.c: Add argument types to function declarations. merge/panic.c: Add argument types to function declarations. merge/rsame.c: Add argument types to function declarations. merge/update.c: Add argument types to function declarations. myisam/ft_eval.c: Portability fix myisam/ft_search.c: Portability fix myisam/ft_test1.c: Portability fix myisam/ftdefs.h: Portability fix myisam/mi_check.c: Portability fix myisam/mi_test1.c: Portability fix myisam/mi_test2.c: Portability fix myisam/mi_test_all.sh: Update to test for MACH variable myisam/myisamlog.c: Cleanup myisam/myisampack.c: Don't use variable 'new' myisam/sort.c: Portability fix myisammrg/myrg_delete.c: Add argument types to function declarations. myisammrg/myrg_locking.c: Add argument types to function declarations. myisammrg/myrg_open.c: Add argument types to function declarations. myisammrg/myrg_panic.c: Add argument types to function declarations. mysql-test/t/backup.test: Fix for OS2 mysql-test/t/show_check.test: Fix for OS2 mysys/charset.c: Dont use variable 'new' mysys/default.c: Fixes for OS2. mysys/getopt.c: Fixes for OS2. mysys/getopt1.c: Fixes for OS2. mysys/list.c: Don't use variable 'new' mysys/mf_dirname.c: Fixes for OS2. mysys/mf_format.c: Fixes for OS2. mysys/mf_path.c: Fixes for OS2. mysys/mf_qsort.c: Portability fix mysys/mf_tempfile.c: Fixes for OS2. mysys/my_clock.c: Fixes for OS2. mysys/my_copy.c: Fixes for OS2. mysys/my_create.c: Fixes for OS2. mysys/my_getwd.c: Fixes for OS2. mysys/my_init.c: Fixes for OS2. mysys/my_lib.c: Fixes for OS2. mysys/my_lock.c: Fixes for OS2. mysys/my_malloc.c: Portability fix mysys/my_mkdir.c: Fixes for OS2. mysys/my_open.c: Fixes for OS2. mysys/my_pthread.c: Fixes for OS2. mysys/my_realloc.c: Fixes for OS2. mysys/my_redel.c: Fixes for OS2. mysys/my_static.c: Fixes for OS2. mysys/my_tempnam.c: Fixes for OS2. mysys/my_thr_init.c: Fixes for OS2. mysys/my_write.c: Fixes for OS2. mysys/test_charset.c: Fixes for OS2. mysys/thr_alarm.c: Fixes for OS2. mysys/tree.c: Fixes for OS2. sql/field.cc: Fixes for OS2. sql/field.h: Fixes for OS2. sql/gen_lex_hash.cc: Fixes for OS2. sql/hostname.cc: Fixes for OS2. sql/item_func.cc: Fixes for OS2. sql/item_strfunc.cc: Fixes for OS2. sql/log_event.cc: Fixes for OS2. sql/md5.c: Fixes for OS2. sql/mini_client.cc: Fixes for OS2. sql/mysql_priv.h: Fixes for OS2. sql/mysqld.cc: Fixes for OS2. sql/net_serv.cc: Fixes for OS2. sql/slave.cc: Fixes for OS2. sql/sql_base.cc: Fixes for OS2. sql/sql_db.cc: Portability fix sql/sql_insert.cc: Fixes for OS2. sql/sql_load.cc: Fixes for OS2. sql/sql_parse.cc: Fixes for OS2. sql/sql_table.cc: Fixes for OS2. sql/sql_udf.cc: Fixes for OS2. sql/violite.c: Fixes for OS2. strings/ctype-big5.c: Fixes for OS2. strings/ctype-gbk.c: Fixes for OS2. strings/ctype-sjis.c: Fixes for OS2. strings/ctype-tis620.c: Fixes for OS2. strings/ctype.c: Fixes for OS2. strings/strnlen.c: Fixes for OS2.
144 lines
4 KiB
C
144 lines
4 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 */
|
|
|
|
/* open a MERGE-database */
|
|
|
|
#include "mrgdef.h"
|
|
#include <stddef.h>
|
|
#include <errno.h>
|
|
#ifdef VMS
|
|
#include "static.c"
|
|
#endif
|
|
|
|
/* open a MERGE-database.
|
|
|
|
if handle_locking is 0 then exit with error if some database is locked
|
|
if handle_locking is 1 then wait if database is locked
|
|
*/
|
|
|
|
|
|
MRG_INFO *mrg_open(
|
|
const char *name,
|
|
int mode,
|
|
int handle_locking)
|
|
{
|
|
int save_errno,i,errpos;
|
|
uint files,dir_length,length;
|
|
ulonglong file_offset;
|
|
char name_buff[FN_REFLEN*2],buff[FN_REFLEN],*end;
|
|
MRG_INFO info,*m_info;
|
|
File fd;
|
|
IO_CACHE file;
|
|
N_INFO *isam,*last_isam;
|
|
DBUG_ENTER("mrg_open");
|
|
|
|
LINT_INIT(last_isam);
|
|
isam=0;
|
|
errpos=files=0;
|
|
bzero((gptr) &info,sizeof(info));
|
|
bzero((char*) &file,sizeof(file));
|
|
if ((fd=my_open(fn_format(name_buff,name,"",MRG_NAME_EXT,4),
|
|
O_RDONLY | O_SHARE,MYF(0))) < 0 ||
|
|
init_io_cache(&file, fd, IO_SIZE, READ_CACHE, 0, 0,
|
|
MYF(MY_WME | MY_NABP)))
|
|
goto err;
|
|
errpos=1;
|
|
dir_length=dirname_part(name_buff,name);
|
|
info.reclength=0;
|
|
while ((length=my_b_gets(&file,buff,FN_REFLEN-1)))
|
|
{
|
|
if ((end=buff+length)[-1] == '\n')
|
|
end[-1]='\0';
|
|
if (buff[0] && buff[0] != '#') /* Skipp empty lines and comments */
|
|
{
|
|
last_isam=isam;
|
|
if (!test_if_hard_path(buff))
|
|
{
|
|
VOID(strmake(name_buff+dir_length,buff,
|
|
sizeof(name_buff)-1-dir_length));
|
|
VOID(cleanup_dirname(buff,name_buff));
|
|
}
|
|
if (!(isam=nisam_open(buff,mode,test(handle_locking))))
|
|
goto err;
|
|
files++;
|
|
}
|
|
last_isam=isam;
|
|
if (info.reclength && info.reclength != isam->s->base.reclength)
|
|
{
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
goto err;
|
|
}
|
|
info.reclength=isam->s->base.reclength;
|
|
}
|
|
if (!(m_info= (MRG_INFO*) my_malloc(sizeof(MRG_INFO)+files*sizeof(MRG_TABLE),
|
|
MYF(MY_WME))))
|
|
goto err;
|
|
*m_info=info;
|
|
m_info->open_tables=(MRG_TABLE *) (m_info+1);
|
|
m_info->tables=files;
|
|
|
|
for (i=files ; i-- > 0 ; )
|
|
{
|
|
m_info->open_tables[i].table=isam;
|
|
m_info->options|=isam->s->base.options;
|
|
m_info->records+=isam->s->state.records;
|
|
m_info->del+=isam->s->state.del;
|
|
m_info->data_file_length=isam->s->state.data_file_length;
|
|
if (i)
|
|
isam=(N_INFO*) (isam->open_list.next->data);
|
|
}
|
|
/* Fix fileinfo for easyer debugging (actually set by rrnd) */
|
|
file_offset=0;
|
|
for (i=0 ; (uint) i < files ; i++)
|
|
{
|
|
m_info->open_tables[i].file_offset=(my_off_t) file_offset;
|
|
file_offset+=m_info->open_tables[i].table->s->state.data_file_length;
|
|
}
|
|
if (sizeof(my_off_t) == 4 && file_offset > (ulonglong) (ulong) ~0L)
|
|
{
|
|
my_errno=HA_ERR_RECORD_FILE_FULL;
|
|
my_free((char*) m_info,MYF(0));
|
|
goto err;
|
|
}
|
|
|
|
m_info->end_table=m_info->open_tables+files;
|
|
m_info->last_used_table=m_info->open_tables;
|
|
|
|
VOID(my_close(fd,MYF(0)));
|
|
end_io_cache(&file);
|
|
m_info->open_list.data=(void*) m_info;
|
|
pthread_mutex_lock(&THR_LOCK_open);
|
|
mrg_open_list=list_add(mrg_open_list,&m_info->open_list);
|
|
pthread_mutex_unlock(&THR_LOCK_open);
|
|
DBUG_RETURN(m_info);
|
|
|
|
err:
|
|
save_errno=my_errno;
|
|
switch (errpos) {
|
|
case 1:
|
|
VOID(my_close(fd,MYF(0)));
|
|
end_io_cache(&file);
|
|
for (i=files ; i-- > 0 ; )
|
|
{
|
|
isam=last_isam;
|
|
if (i)
|
|
last_isam=(N_INFO*) (isam->open_list.next->data);
|
|
nisam_close(isam);
|
|
}
|
|
}
|
|
my_errno=save_errno;
|
|
DBUG_RETURN (NULL);
|
|
}
|