diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-18 02:21:29 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-18 02:21:29 +0300 |
| commit | aef675029f198c61a1a1c46dbb68890f705d40db (patch) | |
| tree | a902843afe48087da439aa3786b69dca86f00349 /include/my_sys.h | |
| parent | 081023e8fd9a5ab196ca56d55ea256f33ea76f3f (diff) | |
| download | mariadb-git-aef675029f198c61a1a1c46dbb68890f705d40db.tar.gz | |
Update mysql-test results after merge
include/my_sys.h:
Portability fix
include/sslopt-longopts.h:
Better help for --ssl
mysql-test/r/binary.result:
Update results after merge
mysys/my_malloc.c:
Portability fix
sql/udf_example.cc:
Use longlong instead of 'long long' to make things works on windows
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index e1054d825c6..444f7ab34ee 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -153,9 +153,9 @@ extern gptr my_malloc(uint Size,myf MyFlags); 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 my_string my_strdup(const char *from,myf MyFlags); -extern my_string my_strdup_with_length(const char *from,uint length, - myf MyFlags); +extern char *my_strdup(const char *from,myf MyFlags); +extern char *my_strdup_with_length(const byte *from, uint length, + myf MyFlags); #define my_free(PTR,FG) my_no_flags_free(PTR) #define CALLER_INFO_PROTO /* nothing */ #define CALLER_INFO /* nothing */ |