mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 21:12:26 +01:00
fcb61f5917
Portability fixes Added new client function: mysql_get_server_version() New server help code (From Victor Vagin) Fixed wrong usage of binary() Disabled RTREE usage for now. BitKeeper/etc/ignore: added scripts/fill_help_tables.sql client/mysql.cc: Some fixes when using 'help' cmd-line-utils/libedit/compat.h: Portability fix cmd-line-utils/libedit/fgetln.c: Portability fix include/mysql.h: Added new client function: mysql_get_server_version() libmysql/libmysql.c: Added new client function: mysql_get_server_version() libmysqld/libmysqld.c: Fixed prototype mysql-test/install_test_db.sh: Added creation of help tables mysql-test/r/connect.result: Added help tables mysql-test/r/myisam.result: Test of RTREE index mysql-test/r/type_ranges.result: updated results mysql-test/t/myisam.test: Test of RTREE index mysql-test/t/type_ranges.test: Updated test mysys/charset.c: Indentation change mysys/my_symlink.c: Removed compiler warning scripts/fill_help_tables.sh: Update for new help tables sql/field.cc: Indentation changes sql/filesort.cc: Optimized character set usage sql/item_cmpfunc.cc: Fix wrong usage of binary() sql/item_cmpfunc.h: Fix wrong usage of binary() sql/item_func.cc: Fix wrong usage of binary() sql/item_func.h: Fix wrong usage of binary() sql/item_strfunc.cc: Fix wrong usage of binary() sql/item_sum.cc: Fix wrong usage of binary() sql/item_sum.h: Fix wrong usage of binary() sql/key.cc: Indentation change sql/lex.h: HELP -> HELP_SYM sql/mysql_priv.h: Make get_field() more general sql/password.c: Indentation change + variable initialisation moved sql/sql_acl.cc: Make get_field() more general sql/sql_base.cc: Added comments + assertion for double call to mysql_lock_tables sql/sql_cache.cc: Indentation changes sql/sql_class.h: Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort sql/sql_derived.cc: Renamed variables sql/sql_help.cc: New help functions (from Victor Vagin) sql/sql_lex.cc: Removed variables that doesn't have to be initialized for each query sql/sql_lex.h: Removed not used variable (olap) sql/sql_parse.cc: Fixed (not fatal) access of unitialized memory Indentation / code cleanup sql/sql_prepare.cc: Indentaion cleanup sql/sql_table.cc: Disabled RTREE until 5.0 sql/sql_udf.cc: Make get_field() more general sql/sql_yacc.yy: Removed access to uninitialized memory Always set offset_limit and select_limit when using LIMIT (removed warnings) Allow usage of 'help week' sql/table.cc: Make get_field() more general More comments sql/table.h: Fixded type of TABLE_LIST->derived sql/time.cc: Stricter date / datetime handling (to be able to handle timestamps with days and microseconds) strings/ctype-bin.c: Added cha
142 lines
3.4 KiB
C
142 lines
3.4 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 "mysys_err.h"
|
|
#include <m_string.h>
|
|
#include <errno.h>
|
|
#ifdef HAVE_REALPATH
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
#endif
|
|
|
|
/*
|
|
Reads the content of a symbolic link
|
|
If the file is not a symbolic link, return the original file name in to.
|
|
Returns: 0 if table was a symlink,
|
|
1 if table was a normal file
|
|
-1 on error.
|
|
*/
|
|
|
|
int my_readlink(char *to, const char *filename, myf MyFlags)
|
|
{
|
|
#ifndef HAVE_READLINK
|
|
strmov(to,filename);
|
|
return 1;
|
|
#else
|
|
int result=0;
|
|
int length;
|
|
DBUG_ENTER("my_readlink");
|
|
|
|
if ((length=readlink(filename, to, FN_REFLEN-1)) < 0)
|
|
{
|
|
/* Don't give an error if this wasn't a symlink */
|
|
if ((my_errno=errno) == EINVAL)
|
|
{
|
|
result= 1;
|
|
strmov(to,filename);
|
|
}
|
|
else
|
|
{
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_CANT_READLINK, MYF(0), filename, errno);
|
|
result= -1;
|
|
}
|
|
}
|
|
else
|
|
to[length]=0;
|
|
DBUG_RETURN(result);
|
|
#endif /* HAVE_READLINK */
|
|
}
|
|
|
|
|
|
/* Create a symbolic link */
|
|
|
|
int my_symlink(const char *content, const char *linkname, myf MyFlags)
|
|
{
|
|
#ifndef HAVE_READLINK
|
|
return 0;
|
|
#else
|
|
int result;
|
|
DBUG_ENTER("my_symlink");
|
|
|
|
result= 0;
|
|
if (symlink(content, linkname))
|
|
{
|
|
result= -1;
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_CANT_SYMLINK, MYF(0), linkname, content, errno);
|
|
}
|
|
DBUG_RETURN(result);
|
|
#endif /* HAVE_READLINK */
|
|
}
|
|
|
|
/*
|
|
Resolve all symbolic links in path
|
|
'to' may be equal to 'filename'
|
|
|
|
Because purify gives a lot of UMR errors when using realpath(),
|
|
this code is disabled when using purify.
|
|
|
|
If MY_RESOLVE_LINK is given, only do realpath if the file is a link.
|
|
*/
|
|
|
|
#if defined(SCO)
|
|
#define BUFF_LEN 4097
|
|
#elif defined(MAXPATHLEN)
|
|
#define BUFF_LEN MAXPATHLEN
|
|
#else
|
|
#define BUFF_LEN FN_LEN
|
|
#endif
|
|
|
|
int my_realpath(char *to, const char *filename,
|
|
myf MyFlags __attribute__((unused)))
|
|
{
|
|
#if defined(HAVE_REALPATH) && !defined(HAVE_purify) && !defined(HAVE_BROKEN_REALPATH)
|
|
int result=0;
|
|
char buff[BUFF_LEN];
|
|
struct stat stat_buff;
|
|
DBUG_ENTER("my_realpath");
|
|
|
|
if (!(MyFlags & MY_RESOLVE_LINK) ||
|
|
(!lstat(filename,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
|
|
{
|
|
char *ptr;
|
|
DBUG_PRINT("info",("executing realpath"));
|
|
if ((ptr=realpath(filename,buff)))
|
|
{
|
|
strmake(to,ptr,FN_REFLEN-1);
|
|
}
|
|
else
|
|
{
|
|
/* Realpath didn't work; Use original name */
|
|
DBUG_PRINT("error",("realpath failed with errno: %d", errno));
|
|
my_errno=errno;
|
|
if (MyFlags & MY_WME)
|
|
my_error(EE_REALPATH, MYF(0), filename, my_errno);
|
|
if (to != filename)
|
|
strmov(to,filename);
|
|
result= -1;
|
|
}
|
|
}
|
|
DBUG_RETURN(result);
|
|
#else
|
|
if (to != filename)
|
|
strmov(to,filename);
|
|
return 0;
|
|
#endif
|
|
}
|