diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-20 17:43:02 +0200 |
| commit | 526b880fa25363319de3c33974b97865f6c54cae (patch) | |
| tree | e13a23a1c9f28ed5eb2d903ba59a153cda3355ac /libmysql | |
| parent | 587f70f9ccfbcef3dfda084a675e02438e8f3668 (diff) | |
| parent | 6dd5fe215cf3a3f223dd6fffb1d8088c95f35f55 (diff) | |
| download | mariadb-git-526b880fa25363319de3c33974b97865f6c54cae.tar.gz | |
merge with 4.0 to get security fixes and latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/include/srv0start.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/manager.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Removed wrong define USE_SYMLINK
include/config-win.h:
Use original code
innobase/srv/srv0srv.c:
merge
innobase/usr/usr0sess.c:
merge
libmysql/libmysql.c:
merge
mysql-test/r/func_test.result:
merge
mysql-test/t/func_test.test:
merge
sql/log.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 | ||||
| -rw-r--r-- | libmysql/manager.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 8da695c5a9d..548375a7de7 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -259,7 +259,8 @@ mysql_debug(const char *debug __attribute__((unused))) #else { char buff[80]; - strmov(strmov(buff,"libmysql: "),env); + buff[sizeof(buff)-1]= 0; + strxnmov(buff,sizeof(buff)-1,"libmysql: ", env, NullS); MessageBox((HWND) 0,"Debugging variable MYSQL_DEBUG used",buff,MB_OK); } #endif @@ -695,7 +696,7 @@ char* getlogin(void); #endif #if defined(__NETWARE__) -/* default to "root" on NetWare */ +/* Default to value of USER on NetWare, if unset use "UNKNOWN_USER" */ void read_user_name(char *name) { char *str=getenv("USER"); diff --git a/libmysql/manager.c b/libmysql/manager.c index ddf9b6c1010..f1c8d045e6c 100644 --- a/libmysql/manager.c +++ b/libmysql/manager.c @@ -133,7 +133,7 @@ MYSQL_MANAGER* STDCALL mysql_manager_connect(MYSQL_MANAGER* con, if (!hp) { con->last_errno=tmp_errno; - sprintf(con->last_error,"Could not resolve host '%s'",host); + sprintf(con->last_error,"Could not resolve host '%-.64s'",host); my_gethostbyname_r_free(); goto err; } |