diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 23:35:09 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 23:35:09 +0300 |
| commit | 66f426c0635d16f7f594f6bf867e13e5cba18500 (patch) | |
| tree | cbcb80b627d5f9bc7c0b27150bbdef3cd36d22aa /mysys | |
| parent | 4d094257dbb785d792785e610ab3cdf41eae9b8c (diff) | |
| download | mariadb-git-66f426c0635d16f7f594f6bf867e13e5cba18500.tar.gz | |
Fixed some compilation problems in last changeset
Docs/manual.texi:
Small changes regarind user resources
client/mysqlbinlog.cc:
Applied patch to support --database
mysql-test/r/func_isnull.result:
New test results
mysql-test/r/join.result:
New test results
mysql-test/r/show_check.result:
New test results
mysql-test/r/type_datetime.result:
New test results
mysql-test/r/type_decimal.result:
New test results
mysql-test/r/type_float.result:
New test results
mysys/my_gethostbyname.c:
Fixed type on last push
mysys/my_pthread.c:
Fixed type on last push
sql/sql_select.cc:
Fixed bug in LIMIT handling
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_gethostbyname.c | 6 | ||||
| -rw-r--r-- | mysys/my_pthread.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c index 19381734e83..76a0a780dd3 100644 --- a/mysys/my_gethostbyname.c +++ b/mysys/my_gethostbyname.c @@ -47,7 +47,7 @@ struct hostent *my_gethostbyname_r(const char *name, int buflen, int *h_errnop) { struct hostent *hp; - dbug_assert((size_t) buflen >= sizeof(*result)); + DBUG_ASSERT((size_t) buflen >= sizeof(*result)); if (gethostbyname_r(name,result, buffer, (size_t) buflen, &hp, h_errnop)) return 0; return hp; @@ -59,7 +59,7 @@ struct hostent *my_gethostbyname_r(const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop) { - dbug_assert(buflen >= sizeof(struct hostent_data)); + DBUG_ASSERT(buflen >= sizeof(struct hostent_data)); if (gethostbyname_r(name,result,(struct hostent_data *) buffer) == -1) { *h_errnop= errno; @@ -77,7 +77,7 @@ struct hostent *my_gethostbyname_r(const char *name, int buflen, int *h_errnop) { struct hostent *hp; - dbug_assert(buflen >= sizeof(struct hostent_data)); + DBUG_ASSERT(buflen >= sizeof(struct hostent_data)); hp= gethostbyname_r(name,result,(struct hostent_data *) buffer); *h_errnop= errno; return hp; diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c index 209b61159ec..0ac35123ad0 100644 --- a/mysys/my_pthread.c +++ b/mysys/my_pthread.c @@ -415,7 +415,8 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) Note that currently we only remap pthread_ functions used by MySQL. If we are depending on the value for some other pthread_xxx functions, - this has to be added here + this has to be added here. +****************************************************************************/ #if defined(HPUX) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT) |