diff options
| author | monty@donna.mysql.com <> | 2001-01-31 04:47:25 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-31 04:47:25 +0200 |
| commit | bdbc0ef7a068d77e404bc4e13b864cb41112521a (patch) | |
| tree | 851a8ba92ed9883efe2504e0726aae6843c317c0 /libmysql/libmysql.c | |
| parent | acd45847ac0485617bece05abccbc9f4e9b2b782 (diff) | |
| download | mariadb-git-bdbc0ef7a068d77e404bc4e13b864cb41112521a.tar.gz | |
New myisamchk option --sort-recover
Allow delete of crashed MyISAM tables
Fixed bug when BLOB was first part of key
Fixed bug when using result from CASE in GROUP BY
Fixed core-dump bug in monthname()
Optimized calling of check_db_name()
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 52c76c4043a..0d77162fc08 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -485,7 +485,7 @@ static void free_old_query(MYSQL *mysql) DBUG_VOID_RETURN; } -#ifdef HAVE_GETPWUID +#if defined(HAVE_GETPWUID) && defined(NO_GETPWUID_DECL) struct passwd *getpwuid(uid_t); char* getlogin(void); #endif @@ -501,14 +501,6 @@ static void read_user_name(char *name) #ifdef HAVE_GETPWUID struct passwd *skr; const char *str; -/*#ifdef __cplusplus - extern "C" struct passwd *getpwuid(uid_t); - extern "C" { char* getlogin(void); } -#else - char * getlogin(); - struct passwd *getpwuid(uid_t); -#endif -*/ if ((str=getlogin()) == NULL) { if ((skr=getpwuid(geteuid())) != NULL) |