summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2001-01-19 04:57:29 +0200
committerunknown <monty@donna.mysql.com>2001-01-19 04:57:29 +0200
commit67891255f5d99c36832e54373fabfcfa758aa979 (patch)
treee6062d0caaa582f6d8fee0a4660b1e970681da48 /mysys
parente6b408608630b52955da5e76e5240e1da878f080 (diff)
downloadmariadb-git-67891255f5d99c36832e54373fabfcfa758aa979.tar.gz
Added MYSQL_SERVER_SUFFIX to mysqld
Fixed bug in TRIM changed strnmov -> strmake BUILD/SETUP.sh: Removed --disable-shared Docs/manual.texi: Changelog Installing many servers acinclude.m4: Force use of db-3.2.3h client/mysql.cc: cleanup mysql-test/r/func_str.result: Added new TRIM test mysql-test/t/func_str.test: Added new TRIM test mysys/charset.c: change to use strmake instead of strnmov mysys/mf_format.c: change to use strmake instead of strnmov mysys/mf_tempfile.c: change to use strmake instead of strnmov scripts/make_binary_distribution.sh: Removed error messages for missing files sql/handler.cc: More debug sql/item_strfunc.cc: Fixed bug in TRIM() sql/mysqld.cc: Added MYSQL_SERVER_SUFFIX to mysqld
Diffstat (limited to 'mysys')
-rw-r--r--mysys/charset.c2
-rw-r--r--mysys/mf_format.c6
-rw-r--r--mysys/mf_tempfile.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/mysys/charset.c b/mysys/charset.c
index 47716540b2c..c17c6113b57 100644
--- a/mysys/charset.c
+++ b/mysys/charset.c
@@ -100,7 +100,7 @@ char *get_charsets_dir(char *buf)
DBUG_ENTER("get_charsets_dir");
if (charsets_dir != NULL)
- strnmov(buf, charsets_dir, FN_REFLEN);
+ strmake(buf, charsets_dir, FN_REFLEN-1);
else
{
if (test_if_hard_path(sharedir) ||
diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index 3050fd88e90..bb784ff08fe 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -57,7 +57,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk,
name+=(length=dirname_part(dev,(startpos=(my_string) name)));
if (length == 0 || flag & 1)
{
- (void) strnmov(dev,dsk, sizeof(dev) - 2);
+ (void) strmake(dev,dsk, sizeof(dev) - 2);
/* Use given directory */
convert_dirname(dev); /* Fix to this OS */
}
@@ -100,7 +100,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk,
bmove(buff,(char*) name,length); /* Save name for last copy */
name=buff;
}
- pos=strnmov(strmov(to,dev),name,length);
+ pos=strmake(strmov(to,dev),name,length);
#ifdef FN_UPPER_CASE
caseup_str(to);
#endif
@@ -117,7 +117,7 @@ my_string fn_format(my_string to, const char *name, const char *dsk,
if (flag & 32 || (!lstat(to,&stat_buff) && S_ISLNK(stat_buff.st_mode)))
{
if (realpath(to,buff))
- strnmov(to,buff,FN_REFLEN-1);
+ strmake(to,buff,FN_REFLEN-1);
}
}
#endif
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index a12b4326705..6204c4d0407 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.c
@@ -69,7 +69,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
}
if ((res=tempnam((char*) dir,(char *) prefix)))
{
- strnmov(to,res,FN_REFLEN);
+ strmake(to,res,FN_REFLEN-1);
(*free)(res);
file=my_create(to,0, mode, MyFlags);
}
@@ -80,7 +80,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
dir=getenv("TMPDIR");
if ((res=tempnam((char*) dir,(char *) prefix)))
{
- strnmov(to,res,FN_REFLEN);
+ strmake(to,res,FN_REFLEN-1);
(*free)(res);
file=my_create(to, 0, mode, MyFlags);
}
@@ -130,7 +130,7 @@ File create_temp_file(char *to, const char *dir, const char *prefix,
}
if ((res=tempnam((char*) dir, (char*) prefix)))
{
- strnmov(to,res,FN_REFLEN);
+ strmake(to,res,FN_REFLEN-1);
(*free)(res);
file=my_create(to,0,
(int) (O_RDWR | O_BINARY | O_TRUNC |