mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
c807724f36
Ensure that ccache is also used for C programs mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter Fixed test cases by adding missing DROP's and rename views to be of type 'v#' Removed MY_UNIX_PATH from fn_format() Removed current_db_used from TABLE_LIST Removed usage of 'current_thd' in Item_splocal Removed some compiler warnings A bit faster longlong2str code BUILD/FINISH.sh: Ensure that ccache is also used for C programs BUILD/SETUP.sh: Ensure that ccache is also used for C programs client/mysql.cc: More debugging Ensure that 'delimiter' works the same way in batch mode as in normal mode. Compare 'delimiter' command case-insensitive. The above fixes the delimiter bugs so that we can now use ;; as a trigger/SP function delimiter in mysqldump. client/mysqldump.c: Indentation fixes Use ;; as a delmimiter for stored procedures and triggers instead of // client/mysqltest.c: Indentation fixes include/my_sys.h: Remove not needed MY_UNIX_PATH parameter mysql-test/r/alter_table.result: Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start) mysql-test/r/func_str.result: More testing of CONV() (to ensure that longlong2str() works correctly) mysql-test/r/information_schema.result: Drop all used tables and views Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails mysql-test/r/information_schema_inno.result: Drop all used tables mysql-test/r/multi_statement.result: Drop used tables mysql-test/r/mysql.result: Add error messages to result mysql-test/r/mysqldump.result: ;; is now used as SP/trigger delimiter mysql-test/r/mysqlshow.result: Drop used tables mysql-test/r/temp_table.result: Drop used views Rename views to v# mysql-test/t/alter_table.test: Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start) mysql-test/t/func_str.test: More testing of CONV() (to ensure that longlong2str() works correctly) mysql-test/t/information_schema.test: Drop all used tables and views Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails mysql-test/t/information_schema_inno.test: Drop all used tables mysql-test/t/multi_statement.test: Drop used tables mysql-test/t/mysql.test: Add error messages to result mysql-test/t/mysqlshow.test: Drop used tables mysql-test/t/temp_table.test: Drop used views Rename views to v# mysys/mf_format.c: Remove not needed MY_UNIX_PATH parameter (This goes against how fn_format() is supposed to work and also conflicts with other options like MY_RETURN_REAL_PATH) sql/ha_federated.cc: Removed extra empty line sql/item.cc: Use 'str_value' instead of 'str_value_ptr' to hold result for Item_splocal Remove some calls to 'thd' in Item_splocal by making 'thd' a class variable One doesn't have to set 'null_value' when calling 'is_null()' sql/item.h: Add THD as a class variable to Item_splocal Use 'str_value' instead of 'str_value_ptr' to hold temp result Fixed bug in Item_hex when used in CAST() sql/item_func.cc: Optimize new code sql/log_event.cc: Move 'to_unix_path()' out of fn_format() sql/opt_range.cc: Simplify code sql/sp_head.cc: Ensure that Item_splocal has thd set before we call '->this_item()' sql/sql_class.cc: Return error if Statement::insert() fails in either hash_insert() sql/sql_parse.cc: Remove 'current_db_used' as we can trivially check if db table qualifier was used without this. Simplify code sql/sql_prepare.cc: Use enum instead of const int, to avoid ugly code for VC++ sql/structs.h: Remove compiler warnings when using STRING_WITH_LEN() with constant strings. sql/table.cc: Fixed indentation sql/table.h: Remove not needed current_db_used strings/decimal.c: Simplify code strings/longlong2str-x86.s: A bit faster longlong2str. (Took some ideas from Peter Gulutzan's code) strings/my_strtoll10.c: Simplify code for MetroWerks compiler
140 lines
3.9 KiB
C
140 lines
3.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 <m_string.h>
|
|
|
|
/*
|
|
Formats a filename with possible replace of directory of extension
|
|
Function can handle the case where 'to' == 'name'
|
|
For a description of the flag values, consult my_sys.h
|
|
The arguments should be in unix format.
|
|
*/
|
|
|
|
my_string fn_format(my_string to, const char *name, const char *dir,
|
|
const char *extension, uint flag)
|
|
{
|
|
reg1 uint length;
|
|
char dev[FN_REFLEN], buff[FN_REFLEN], *pos, *startpos;
|
|
const char *ext;
|
|
DBUG_ENTER("fn_format");
|
|
DBUG_PRINT("enter",("name: %s dir: %s extension: %s flag: %d",
|
|
name,dir,extension,flag));
|
|
|
|
/* Copy and skip directory */
|
|
name+=(length=dirname_part(dev,(startpos=(my_string) name)));
|
|
if (length == 0 || (flag & MY_REPLACE_DIR))
|
|
{
|
|
/* Use given directory */
|
|
convert_dirname(dev,dir,NullS); /* Fix to this OS */
|
|
}
|
|
else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(dev))
|
|
{
|
|
/* Put 'dir' before the given path */
|
|
strmake(buff,dev,sizeof(buff)-1);
|
|
pos=convert_dirname(dev,dir,NullS);
|
|
strmake(pos,buff,sizeof(buff)-1- (int) (pos-dev));
|
|
}
|
|
|
|
if (flag & MY_PACK_FILENAME)
|
|
pack_dirname(dev,dev); /* Put in ./.. and ~/.. */
|
|
if (flag & MY_UNPACK_FILENAME)
|
|
(void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */
|
|
|
|
if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS)
|
|
{
|
|
if ((flag & MY_REPLACE_EXT) == 0) /* If we should keep old ext */
|
|
{
|
|
length=strlength(name); /* Use old extension */
|
|
ext = "";
|
|
}
|
|
else
|
|
{
|
|
length=(uint) (pos-(char*) name); /* Change extension */
|
|
ext= extension;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
length=strlength(name); /* No ext, use the now one */
|
|
ext=extension;
|
|
}
|
|
|
|
if (strlen(dev)+length+strlen(ext) >= FN_REFLEN || length >= FN_LEN )
|
|
{
|
|
/* To long path, return original or NULL */
|
|
uint tmp_length;
|
|
if (flag & MY_SAFE_PATH)
|
|
return NullS;
|
|
tmp_length=strlength(startpos);
|
|
DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %d",dev,ext,length));
|
|
(void) strmake(to,startpos,min(tmp_length,FN_REFLEN-1));
|
|
}
|
|
else
|
|
{
|
|
if (to == startpos)
|
|
{
|
|
bmove(buff,(char*) name,length); /* Save name for last copy */
|
|
name=buff;
|
|
}
|
|
pos=strmake(strmov(to,dev),name,length);
|
|
(void) strmov(pos,ext); /* Don't convert extension */
|
|
}
|
|
/*
|
|
If MY_RETURN_REAL_PATH and MY_RESOLVE_SYMLINK is given, only do
|
|
realpath if the file is a symbolic link
|
|
*/
|
|
if (flag & MY_RETURN_REAL_PATH)
|
|
(void) my_realpath(to, to, MYF(flag & MY_RESOLVE_SYMLINKS ?
|
|
MY_RESOLVE_LINK: 0));
|
|
else if (flag & MY_RESOLVE_SYMLINKS)
|
|
{
|
|
strmov(buff,to);
|
|
(void) my_readlink(to, buff, MYF(0));
|
|
}
|
|
DBUG_RETURN(to);
|
|
} /* fn_format */
|
|
|
|
|
|
/*
|
|
strlength(const string str)
|
|
Return length of string with end-space:s not counted.
|
|
*/
|
|
|
|
size_s strlength(const char *str)
|
|
{
|
|
reg1 my_string pos;
|
|
reg2 my_string found;
|
|
DBUG_ENTER("strlength");
|
|
|
|
pos=found=(char*) str;
|
|
|
|
while (*pos)
|
|
{
|
|
if (*pos != ' ')
|
|
{
|
|
while (*++pos && *pos != ' ') {};
|
|
if (!*pos)
|
|
{
|
|
found=pos; /* String ends here */
|
|
break;
|
|
}
|
|
}
|
|
found=pos;
|
|
while (*++pos == ' ') {};
|
|
}
|
|
DBUG_RETURN((size_s) (found-(char*) str));
|
|
} /* strlength */
|