2000-11-16 02:58:58 +01:00
|
|
|
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This library 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
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with this library; if not, write to the Free
|
|
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
|
|
MA 02111-1307, USA */
|
|
|
|
|
|
|
|
/*
|
|
|
|
More functions to be used with IO_CACHE files
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define MAP_TO_USE_RAID
|
|
|
|
#include "mysys_priv.h"
|
|
|
|
#include <m_string.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <m_ctype.h>
|
|
|
|
|
|
|
|
/*
|
2001-11-28 01:55:52 +01:00
|
|
|
Fix that next read will be made at certain position
|
|
|
|
For write cache, make next write happen at a certain position
|
2000-11-16 02:58:58 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
void my_b_seek(IO_CACHE *info,my_off_t pos)
|
|
|
|
{
|
2001-11-28 02:47:15 +01:00
|
|
|
my_off_t offset = (pos - info->pos_in_file);
|
2001-11-28 01:55:52 +01:00
|
|
|
DBUG_ENTER("my_b_seek");
|
|
|
|
DBUG_PRINT("enter",("pos: %lu", (ulong) pos));
|
|
|
|
|
Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file
Docs/manual.texi:
Updated TODO and Changelog
include/Makefile.am:
Portability fix
mysql-test/misc/select.res:
***MISSING WEAVE***
mysys/mf_iocache2.c:
cleanup
scripts/mysqlhotcopy.sh:
Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/limits/pg.cfg:
Updated to new crash-me
sql-bench/server-cfg.sh:
Fixes for pg 7.0.2
sql/ha_berkeley.cc:
Lots of BDB table fixes
sql/ha_berkeley.h:
Lots of BDB table fixes
sql/handler.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
Fixes for empty hostnames
sql/log.cc:
Fixed transaction logging
sql/share/swedish/errmsg.OLD:
cleanup
sql/sql_delete.cc:
Fixes for logging
sql/sql_insert.cc:
Fixes for logging
sql/sql_select.cc:
Fixes for BDB tables
sql/sql_table.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
Fixes for logging
BitKeeper/etc/ignore:
Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2000-12-08 16:04:57 +01:00
|
|
|
if (info->type == READ_CACHE)
|
|
|
|
{
|
2001-11-28 02:47:15 +01:00
|
|
|
if ((ulonglong) offset < (ulonglong) (info->read_end - info->buffer))
|
2001-11-28 01:55:52 +01:00
|
|
|
{
|
2001-11-28 02:47:15 +01:00
|
|
|
/* The read is in the current buffer; Reuse it */
|
|
|
|
info->read_pos = info->buffer + offset;
|
2001-11-28 01:55:52 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Force a new read on next my_b_read */
|
|
|
|
info->read_pos=info->read_end=info->buffer;
|
|
|
|
}
|
Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file
Docs/manual.texi:
Updated TODO and Changelog
include/Makefile.am:
Portability fix
mysql-test/misc/select.res:
***MISSING WEAVE***
mysys/mf_iocache2.c:
cleanup
scripts/mysqlhotcopy.sh:
Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/limits/pg.cfg:
Updated to new crash-me
sql-bench/server-cfg.sh:
Fixes for pg 7.0.2
sql/ha_berkeley.cc:
Lots of BDB table fixes
sql/ha_berkeley.h:
Lots of BDB table fixes
sql/handler.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
Fixes for empty hostnames
sql/log.cc:
Fixed transaction logging
sql/share/swedish/errmsg.OLD:
cleanup
sql/sql_delete.cc:
Fixes for logging
sql/sql_insert.cc:
Fixes for logging
sql/sql_select.cc:
Fixes for BDB tables
sql/sql_table.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
Fixes for logging
BitKeeper/etc/ignore:
Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2000-12-08 16:04:57 +01:00
|
|
|
}
|
|
|
|
else if (info->type == WRITE_CACHE)
|
|
|
|
{
|
2001-11-28 01:55:52 +01:00
|
|
|
/* If write is in current buffer, reuse it */
|
2001-11-28 02:47:15 +01:00
|
|
|
if ((ulonglong) offset <
|
|
|
|
(ulonglong) (info->write_end - info->write_buffer))
|
2001-11-28 01:55:52 +01:00
|
|
|
{
|
2001-11-28 02:47:15 +01:00
|
|
|
info->write_pos = info->write_buffer + offset;
|
2001-11-28 01:55:52 +01:00
|
|
|
DBUG_VOID_RETURN;
|
|
|
|
}
|
2001-11-28 02:47:15 +01:00
|
|
|
flush_io_cache(info);
|
Lots of fixes for BDB tables
Change DROP TABLE to first drop the data, then the .frm file
Docs/manual.texi:
Updated TODO and Changelog
include/Makefile.am:
Portability fix
mysql-test/misc/select.res:
***MISSING WEAVE***
mysys/mf_iocache2.c:
cleanup
scripts/mysqlhotcopy.sh:
Fixed --noindices
sql-bench/Results/ATIS-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/RUN-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/alter-table-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/big-tables-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/connect-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/create-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/insert-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/select-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/Results/wisconsin-pg-Linux_2.2.14_my_SMP_i686-cmp-mysql,pg:
Updated benchmarks
sql-bench/limits/pg.cfg:
Updated to new crash-me
sql-bench/server-cfg.sh:
Fixes for pg 7.0.2
sql/ha_berkeley.cc:
Lots of BDB table fixes
sql/ha_berkeley.h:
Lots of BDB table fixes
sql/handler.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/hostname.cc:
Fixes for empty hostnames
sql/log.cc:
Fixed transaction logging
sql/share/swedish/errmsg.OLD:
cleanup
sql/sql_delete.cc:
Fixes for logging
sql/sql_insert.cc:
Fixes for logging
sql/sql_select.cc:
Fixes for BDB tables
sql/sql_table.cc:
Change DROP TABLE to first drop the data, then the .frm file
sql/sql_update.cc:
Fixes for logging
BitKeeper/etc/ignore:
Added scripts/mysqld_multi to the ignore list
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
2000-12-08 16:04:57 +01:00
|
|
|
}
|
2000-11-16 02:58:58 +01:00
|
|
|
info->pos_in_file=pos;
|
2000-11-25 03:49:13 +01:00
|
|
|
info->seek_not_done=1;
|
2000-11-16 02:58:58 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2000-12-12 03:34:56 +01:00
|
|
|
** Fill buffer. Note that this assumes that you have already used
|
2001-11-28 01:55:52 +01:00
|
|
|
** all characters in the CACHE, independent of the read_pos value!
|
2000-11-16 02:58:58 +01:00
|
|
|
** return: 0 on error or EOF (info->error = -1 on error)
|
|
|
|
** number of characters
|
|
|
|
*/
|
|
|
|
|
|
|
|
uint my_b_fill(IO_CACHE *info)
|
|
|
|
{
|
2001-11-28 01:55:52 +01:00
|
|
|
my_off_t pos_in_file=(info->pos_in_file+
|
|
|
|
(uint) (info->read_end - info->buffer));
|
2000-11-16 02:58:58 +01:00
|
|
|
my_off_t max_length;
|
|
|
|
uint diff_length,length;
|
|
|
|
if (info->seek_not_done)
|
|
|
|
{ /* File touched, do seek */
|
|
|
|
if (my_seek(info->file,pos_in_file,MY_SEEK_SET,MYF(0)) ==
|
|
|
|
MY_FILEPOS_ERROR)
|
|
|
|
{
|
|
|
|
info->error= 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
info->seek_not_done=0;
|
|
|
|
}
|
|
|
|
diff_length=(uint) (pos_in_file & (IO_SIZE-1));
|
|
|
|
max_length= (my_off_t) (info->end_of_file - pos_in_file);
|
|
|
|
if (max_length > (my_off_t) (info->read_length-diff_length))
|
|
|
|
max_length=(my_off_t) (info->read_length-diff_length);
|
|
|
|
if (!max_length)
|
|
|
|
{
|
|
|
|
info->error= 0;
|
|
|
|
return 0; /* EOF */
|
|
|
|
}
|
|
|
|
else if ((length=my_read(info->file,info->buffer,(uint) max_length,
|
|
|
|
info->myflags)) == (uint) -1)
|
|
|
|
{
|
|
|
|
info->error= -1;
|
|
|
|
return 0;
|
|
|
|
}
|
2001-11-28 01:55:52 +01:00
|
|
|
info->read_pos=info->buffer;
|
|
|
|
info->read_end=info->buffer+length;
|
2000-11-16 02:58:58 +01:00
|
|
|
info->pos_in_file=pos_in_file;
|
|
|
|
return length;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
** Read a string ended by '\n' into a buffer of 'max_length' size.
|
|
|
|
** Returns number of characters read, 0 on error.
|
|
|
|
** last byte is set to '\0'
|
2001-10-03 16:02:14 +02:00
|
|
|
** If buffer is full then to[max_length-1] will be set to \0.
|
2000-11-16 02:58:58 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
uint my_b_gets(IO_CACHE *info, char *to, uint max_length)
|
|
|
|
{
|
2001-01-07 23:04:30 +01:00
|
|
|
char *start = to;
|
2000-11-16 02:58:58 +01:00
|
|
|
uint length;
|
|
|
|
max_length--; /* Save place for end \0 */
|
|
|
|
/* Calculate number of characters in buffer */
|
2000-12-12 03:34:56 +01:00
|
|
|
if (!(length= my_b_bytes_in_cache(info)) &&
|
|
|
|
!(length= my_b_fill(info)))
|
|
|
|
return 0;
|
2000-11-16 02:58:58 +01:00
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
char *pos,*end;
|
|
|
|
if (length > max_length)
|
|
|
|
length=max_length;
|
2001-11-28 01:55:52 +01:00
|
|
|
for (pos=info->read_pos,end=pos+length ; pos < end ;)
|
2000-11-16 02:58:58 +01:00
|
|
|
{
|
|
|
|
if ((*to++ = *pos++) == '\n')
|
|
|
|
{
|
2001-11-28 01:55:52 +01:00
|
|
|
info->read_pos=pos;
|
2000-11-16 02:58:58 +01:00
|
|
|
*to='\0';
|
2001-01-07 23:04:30 +01:00
|
|
|
return (uint) (to-start);
|
2000-11-16 02:58:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!(max_length-=length))
|
|
|
|
{
|
|
|
|
/* Found enough charcters; Return found string */
|
2001-11-28 01:55:52 +01:00
|
|
|
info->read_pos=pos;
|
2000-11-16 02:58:58 +01:00
|
|
|
*to='\0';
|
2001-01-07 23:04:30 +01:00
|
|
|
return (uint) (to-start);
|
2000-11-16 02:58:58 +01:00
|
|
|
}
|
|
|
|
if (!(length=my_b_fill(info)))
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
Simple printf version. Supports '%s', '%d', '%u', "%ld" and "%lu"
|
|
|
|
Used for logging in MySQL
|
|
|
|
returns number of written character, or (uint) -1 on error
|
|
|
|
*/
|
|
|
|
|
|
|
|
uint my_b_printf(IO_CACHE *info, const char* fmt, ...)
|
|
|
|
{
|
2000-11-17 01:36:46 +01:00
|
|
|
int result;
|
2000-11-16 02:58:58 +01:00
|
|
|
va_list args;
|
2000-11-17 01:36:46 +01:00
|
|
|
va_start(args,fmt);
|
|
|
|
result=my_b_vprintf(info, fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
uint my_b_vprintf(IO_CACHE *info, const char* fmt, va_list args)
|
|
|
|
{
|
2000-11-16 02:58:58 +01:00
|
|
|
uint out_length=0;
|
|
|
|
|
|
|
|
for (; *fmt ; fmt++)
|
|
|
|
{
|
2000-11-17 01:36:46 +01:00
|
|
|
if (*fmt++ != '%')
|
2000-11-16 02:58:58 +01:00
|
|
|
{
|
|
|
|
/* Copy everything until '%' or end of string */
|
2000-11-17 01:36:46 +01:00
|
|
|
const char *start=fmt-1;
|
2000-11-16 02:58:58 +01:00
|
|
|
uint length;
|
2000-11-17 01:36:46 +01:00
|
|
|
for (; *fmt && *fmt != '%' ; fmt++ ) ;
|
2000-11-16 02:58:58 +01:00
|
|
|
length= (uint) (fmt - start);
|
|
|
|
out_length+=length;
|
|
|
|
if (my_b_write(info, start, length))
|
|
|
|
goto err;
|
|
|
|
if (!*fmt) /* End of format */
|
|
|
|
{
|
|
|
|
return out_length;
|
|
|
|
}
|
2000-11-17 01:36:46 +01:00
|
|
|
fmt++;
|
2000-11-16 02:58:58 +01:00
|
|
|
/* Found one '%' */
|
|
|
|
}
|
|
|
|
/* Skipp if max size is used (to be compatible with printf) */
|
|
|
|
while (isdigit(*fmt) || *fmt == '.' || *fmt == '-')
|
|
|
|
fmt++;
|
|
|
|
if (*fmt == 's') /* String parameter */
|
|
|
|
{
|
|
|
|
reg2 char *par = va_arg(args, char *);
|
|
|
|
uint length = (uint) strlen(par);
|
|
|
|
out_length+=length;
|
|
|
|
if (my_b_write(info, par, length))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else if (*fmt == 'd' || *fmt == 'u') /* Integer parameter */
|
|
|
|
{
|
|
|
|
register int iarg;
|
|
|
|
uint length;
|
|
|
|
char buff[17];
|
|
|
|
|
|
|
|
iarg = va_arg(args, int);
|
|
|
|
if (*fmt == 'd')
|
|
|
|
length= (uint) (int10_to_str((long) iarg,buff, -10) - buff);
|
|
|
|
else
|
|
|
|
length= (uint) (int10_to_str((long) (uint) iarg,buff,10)- buff);
|
|
|
|
out_length+=length;
|
|
|
|
if (my_b_write(info, buff, length))
|
|
|
|
goto err;
|
|
|
|
}
|
2000-11-25 03:49:13 +01:00
|
|
|
else if ((*fmt == 'l' && fmt[1] == 'd') || fmt[1] == 'u')
|
|
|
|
/* long parameter */
|
2000-11-16 02:58:58 +01:00
|
|
|
{
|
|
|
|
register long iarg;
|
|
|
|
uint length;
|
|
|
|
char buff[17];
|
|
|
|
|
|
|
|
iarg = va_arg(args, long);
|
|
|
|
if (*++fmt == 'd')
|
|
|
|
length= (uint) (int10_to_str(iarg,buff, -10) - buff);
|
|
|
|
else
|
|
|
|
length= (uint) (int10_to_str(iarg,buff,10)- buff);
|
|
|
|
out_length+=length;
|
|
|
|
if (my_b_write(info, buff, length))
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* %% or unknown code */
|
|
|
|
if (my_b_write(info, "%", 1))
|
|
|
|
goto err;
|
|
|
|
out_length++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return out_length;
|
|
|
|
|
|
|
|
err:
|
|
|
|
return (uint) -1;
|
|
|
|
}
|