diff options
| author | monty@mashka.mysql.fi <> | 2003-02-12 21:55:37 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-02-12 21:55:37 +0200 |
| commit | e327393e9d2f8df0e2239464bb96a3eafd9de03b (patch) | |
| tree | 3ac37e452f15c8f05e9d1f338a6050281f838048 /cmd-line-utils | |
| parent | 15aee374560aa905995b1c5af8ac91bc2c0638c2 (diff) | |
| download | mariadb-git-e327393e9d2f8df0e2239464bb96a3eafd9de03b.tar.gz | |
Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/compat.h | 4 | ||||
| -rw-r--r-- | cmd-line-utils/libedit/fgetln.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmd-line-utils/libedit/compat.h b/cmd-line-utils/libedit/compat.h index f432ac45dfc..3693a2db809 100644 --- a/cmd-line-utils/libedit/compat.h +++ b/cmd-line-utils/libedit/compat.h @@ -36,4 +36,8 @@ #endif #endif +#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) +#define __attribute__(A) +#endif + #endif diff --git a/cmd-line-utils/libedit/fgetln.c b/cmd-line-utils/libedit/fgetln.c index 9804866147f..4f7416a4c8d 100644 --- a/cmd-line-utils/libedit/fgetln.c +++ b/cmd-line-utils/libedit/fgetln.c @@ -56,7 +56,8 @@ getline (char **lineptr, size_t *n, FILE *stream) if (*n >= new_size) /* Overflowed size_t */ line = NULL; else - line = (char *)*lineptr ? realloc (*lineptr, new_size) : malloc (new_size); + line = (char *) (*lineptr ? (char*) realloc(*lineptr, new_size) : + (char*) malloc(new_size)); if (line) { |