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
a3978ceb
Commit
a3978ceb
authored
18 years ago
by
mats@romeo.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
parents
083347db
fe4a22f3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
include/my_sys.h
include/my_sys.h
+2
-2
mysys/safemalloc.c
mysys/safemalloc.c
+1
-1
No files found.
include/my_sys.h
View file @
a3978ceb
...
...
@@ -163,7 +163,7 @@ extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
extern
void
my_no_flags_free
(
gptr
ptr
);
extern
gptr
my_memdup
(
const
byte
*
from
,
uint
length
,
myf
MyFlags
);
extern
char
*
my_strdup
(
const
char
*
from
,
myf
MyFlags
);
extern
char
*
my_strndup
(
const
byte
*
from
,
uint
length
,
extern
char
*
my_strndup
(
const
char
*
from
,
uint
length
,
myf
MyFlags
);
/* we do use FG (as a no-op) in below so that a typo on FG is caught */
#define my_free(PTR,FG) ((void)FG,my_no_flags_free(PTR))
...
...
@@ -587,7 +587,7 @@ extern gptr _my_memdup(const byte *from,uint length,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
extern
my_string
_my_strdup
(
const
char
*
from
,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
extern
char
*
_my_strndup
(
const
byte
*
from
,
uint
length
,
extern
char
*
_my_strndup
(
const
char
*
from
,
uint
length
,
const
char
*
sFile
,
uint
uLine
,
myf
MyFlag
);
...
...
This diff is collapsed.
Click to expand it.
mysys/safemalloc.c
View file @
a3978ceb
...
...
@@ -525,7 +525,7 @@ char *_my_strdup(const char *from, const char *filename, uint lineno,
}
/* _my_strdup */
char
*
_my_strndup
(
const
byte
*
from
,
uint
length
,
char
*
_my_strndup
(
const
char
*
from
,
uint
length
,
const
char
*
filename
,
uint
lineno
,
myf
MyFlags
)
{
...
...
This diff is collapsed.
Click to expand it.
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