Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
c248859e
Commit
c248859e
authored
Dec 24, 2009
by
Georgi Kodinov
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
a21a0b47
adc17cd4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
12 deletions
+5
-12
client/mysql.cc
client/mysql.cc
+1
-1
include/m_string.h
include/m_string.h
+3
-6
strings/strmov.c
strings/strmov.c
+1
-5
No files found.
client/mysql.cc
View file @
c248859e
...
@@ -4195,7 +4195,7 @@ char *get_arg(char *line, my_bool get_next_arg)
...
@@ -4195,7 +4195,7 @@ char *get_arg(char *line, my_bool get_next_arg)
if
(
*
ptr
==
'\\'
&&
ptr
[
1
])
// escaped character
if
(
*
ptr
==
'\\'
&&
ptr
[
1
])
// escaped character
{
{
// Remove the backslash
// Remove the backslash
strmov
(
ptr
,
ptr
+
1
);
strmov
_overlapp
(
ptr
,
ptr
+
1
);
}
}
else
if
((
!
quoted
&&
*
ptr
==
' '
)
||
(
quoted
&&
*
ptr
==
qtype
))
else
if
((
!
quoted
&&
*
ptr
==
' '
)
||
(
quoted
&&
*
ptr
==
qtype
))
{
{
...
...
include/m_string.h
View file @
c248859e
...
@@ -95,9 +95,7 @@ extern char NEAR _dig_vec_lower[];
...
@@ -95,9 +95,7 @@ extern char NEAR _dig_vec_lower[];
/* Defined in strtod.c */
/* Defined in strtod.c */
extern
const
double
log_10
[
309
];
extern
const
double
log_10
[
309
];
#ifdef BAD_STRING_COMPILER
#ifndef strmov
#define strmov(A,B) (memccpy(A,B,0,INT_MAX)-1)
#else
#define strmov_overlapp(A,B) strmov(A,B)
#define strmov_overlapp(A,B) strmov(A,B)
#define strmake_overlapp(A,B,C) strmake(A,B,C)
#define strmake_overlapp(A,B,C) strmake(A,B,C)
#endif
#endif
...
@@ -155,12 +153,11 @@ extern size_t strinstr(const char *str,const char *search);
...
@@ -155,12 +153,11 @@ extern size_t strinstr(const char *str,const char *search);
extern
size_t
r_strinstr
(
const
char
*
str
,
size_t
from
,
const
char
*
search
);
extern
size_t
r_strinstr
(
const
char
*
str
,
size_t
from
,
const
char
*
search
);
extern
char
*
strkey
(
char
*
dst
,
char
*
head
,
char
*
tail
,
char
*
flags
);
extern
char
*
strkey
(
char
*
dst
,
char
*
head
,
char
*
tail
,
char
*
flags
);
extern
char
*
strmake
(
char
*
dst
,
const
char
*
src
,
size_t
length
);
extern
char
*
strmake
(
char
*
dst
,
const
char
*
src
,
size_t
length
);
#ifndef strmake_overlapp
extern
char
*
strmake_overlapp
(
char
*
dst
,
const
char
*
src
,
size_t
length
);
#endif
#ifndef strmov
#ifndef strmov
extern
char
*
strmov
(
char
*
dst
,
const
char
*
src
);
extern
char
*
strmov
(
char
*
dst
,
const
char
*
src
);
#else
extern
char
*
strmov_overlapp
(
char
*
dst
,
const
char
*
src
);
#endif
#endif
extern
char
*
strnmov
(
char
*
dst
,
const
char
*
src
,
size_t
n
);
extern
char
*
strnmov
(
char
*
dst
,
const
char
*
src
,
size_t
n
);
extern
char
*
strsuff
(
const
char
*
src
,
const
char
*
suffix
);
extern
char
*
strsuff
(
const
char
*
src
,
const
char
*
suffix
);
...
...
strings/strmov.c
View file @
c248859e
...
@@ -24,13 +24,11 @@
...
@@ -24,13 +24,11 @@
#include <my_global.h>
#include <my_global.h>
#include "m_string.h"
#include "m_string.h"
#ifdef
BAD_STRING_COMPILER
#ifdef
strmov
#undef strmov
#undef strmov
#define strmov strmov_overlapp
#define strmov strmov_overlapp
#endif
#endif
#ifndef strmov
#if !defined(MC68000) && !defined(DS90)
#if !defined(MC68000) && !defined(DS90)
char
*
strmov
(
register
char
*
dst
,
register
const
char
*
src
)
char
*
strmov
(
register
char
*
dst
,
register
const
char
*
src
)
...
@@ -53,5 +51,3 @@ char *strmov(dst, src)
...
@@ -53,5 +51,3 @@ char *strmov(dst, src)
}
}
#endif
#endif
#endif
/* strmov */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment