diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
| commit | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (patch) | |
| tree | bf340fae8765f9d5f1e1ac543d2926bef0021e03 /configure.in | |
| parent | 2901c3b8fa7d4095445c6ca2070367d2f61af2d1 (diff) | |
| parent | a7c82c5693110bfa744bd4cf481b02eaabb7a0aa (diff) | |
| download | mariadb-git-755e72a0f55b593cf930ae9bd69998f82b70d5cf.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 783e3af5c61..40d3c0ba6f6 100644 --- a/configure.in +++ b/configure.in @@ -1814,7 +1814,7 @@ AC_CHECK_FUNCS(alarm bmove \ gethostbyaddr_r gethostbyname_r getpwnam \ bfill bzero bcmp strstr strpbrk strerror \ tell atod memcpy memmove \ - setupterm strcasecmp sighold vidattr lrand48 localtime_r \ + setupterm strcasecmp sighold vidattr lrand48 localtime_r gmtime_r \ sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np \ pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \ pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \ |