diff options
| author | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-01-31 04:47:25 +0200 |
| commit | 495231ea25a82d97e69e96ff9e5d7688434cfff2 (patch) | |
| tree | 851a8ba92ed9883efe2504e0726aae6843c317c0 /libmysql | |
| parent | bf1f8fd3eb4b98dadd265f8ed10d92220dabe1bb (diff) | |
| download | mariadb-git-495231ea25a82d97e69e96ff9e5d7688434cfff2.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()
Docs/manual.texi:
Added more information about myisamchk
client/mysqladmin.c:
Added error message for CREATE database and fixed possible overflow bug
include/myisam.h:
New myisamchk option --sort-recover
libmysql/libmysql.c:
Removed commented code
Don't define getpwuid (breaks on SCO 3.2)
myisam/mi_check.c:
Fixed (new) bug when using --recover --optimize
myisam/mi_delete_table.c:
Allow delete of crashed tables
myisam/mi_key.c:
Fixed bug when BLOB was first part of key
myisam/myisamchk.c:
New myisamchk option --sort-recover
mysql-test/r/case.result:
New test cases to check for reported bugs
mysql-test/r/func_time.result:
New test cases to check for reported bugs
mysql-test/r/type_blob.result:
New test cases to check for reported bugs
mysql-test/r/type_datetime.result:
New test cases to check for reported bugs
mysql-test/t/case.test:
New test cases to check for reported bugs
mysql-test/t/func_time.test:
New test cases to check for reported bugs
mysql-test/t/type_blob.test:
New test cases to check for reported bugs
mysql-test/t/type_datetime.test:
New test cases to check for reported bugs
mysys/my_bitmap.c:
Optimize
sql-bench/limits/ms-sql.cfg:
Updated limits
sql/item_cmpfunc.cc:
Fixed bug when using result from CASE in GROUP BY
sql/item_cmpfunc.h:
Fixed bug when using result from CASE in GROUP BY
sql/item_timefunc.cc:
Fixed core-dump bug in monthname()
sql/sql_db.cc:
Optimized calling of check_db_name()
sql/sql_parse.cc:
Optimized calling of check_db_name()
sql/table.cc:
Fixed typo
Diffstat (limited to 'libmysql')
| -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) |