diff options
| author | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-27 00:30:28 +0300 |
| commit | a5717a950b77197b803ff8de013e882471c23cc1 (patch) | |
| tree | 5ed4e118d371f2a1d84eaaef85c5869d24977363 /libmysql_r/Makefile.am | |
| parent | 1369e5434174a1c7fa7feb9fb1eac6c680a8f078 (diff) | |
| parent | 00d5816b6dc8740f4010dc15e68caeeff6a6954a (diff) | |
| download | mariadb-git-a5717a950b77197b803ff8de013e882471c23cc1.tar.gz | |
merge with 4.0 to get windows fixes
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/que/que0que.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
Diffstat (limited to 'libmysql_r/Makefile.am')
| -rw-r--r-- | libmysql_r/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 60c29a99762..b75f65b6f78 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -18,7 +18,7 @@ target = libmysqlclient_r.la -target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ +target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ LIBS = @LIBS@ @openssl_libs@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) |