mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
dc1e55f819
Fixed wrong logging of Access denied error (Bug #398) include/my_global.h: Fix for QNX mysql-test/r/union.result: new test case mysql-test/t/union.test: Test of bug in union and left join mysys/my_seek.c: Safety fix to find out when pos gets a wrong value sql/field.h: Fix for UNION and LEFT JOIN sql/mysql_priv.h: Fix for UNION and LEFT JOIN sql/sql_base.cc: Fix for UNION and LEFT JOIN sql/sql_insert.cc: Fix for UNION and LEFT JOIN sql/sql_parse.cc: Fixed wrong logging of Access denied error sql/sql_union.cc: Fix for UNION and LEFT JOIN sql/sql_update.cc: Fix for UNION and LEFT JOIN
65 lines
1.9 KiB
C
65 lines
1.9 KiB
C
/* Copyright (C) 2000 MySQL 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 */
|
|
|
|
#include "mysys_priv.h"
|
|
#include <assert.h>
|
|
|
|
/* Seek to position in file */
|
|
/*ARGSUSED*/
|
|
|
|
my_off_t my_seek(File fd, my_off_t pos, int whence,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
reg1 os_off_t newpos;
|
|
DBUG_ENTER("my_seek");
|
|
DBUG_PRINT("my",("Fd: %d Hpos: %lu Pos: %lu Whence: %d MyFlags: %d",
|
|
fd, (ulong) (((ulonglong) pos) >> 32), (ulong) pos,
|
|
whence, MyFlags));
|
|
DBUG_ASSERT(pos != MY_FILEPOS_ERROR); /* safety check */
|
|
|
|
newpos=lseek(fd, pos, whence);
|
|
if (newpos == (os_off_t) -1)
|
|
{
|
|
my_errno=errno;
|
|
DBUG_PRINT("error",("lseek: %lu, errno: %d",newpos,errno));
|
|
DBUG_RETURN(MY_FILEPOS_ERROR);
|
|
}
|
|
if ((my_off_t) newpos != pos)
|
|
{
|
|
DBUG_PRINT("exit",("pos: %lu", (ulong) newpos));
|
|
}
|
|
DBUG_RETURN((my_off_t) newpos);
|
|
} /* my_seek */
|
|
|
|
|
|
/* Tell current position of file */
|
|
/* ARGSUSED */
|
|
|
|
my_off_t my_tell(File fd, myf MyFlags __attribute__((unused)))
|
|
{
|
|
os_off_t pos;
|
|
DBUG_ENTER("my_tell");
|
|
DBUG_PRINT("my",("Fd: %d MyFlags: %d",fd, MyFlags));
|
|
#ifdef HAVE_TELL
|
|
pos=tell(fd);
|
|
#else
|
|
pos=lseek(fd, 0L, MY_SEEK_CUR);
|
|
#endif
|
|
if (pos == (os_off_t) -1)
|
|
my_errno=errno;
|
|
DBUG_PRINT("exit",("pos: %lu", (ulong) pos));
|
|
DBUG_RETURN((my_off_t) pos);
|
|
} /* my_tell */
|