diff options
author | unknown <monty@work.mysql.com> | 2001-09-04 01:04:32 +0200 |
---|---|---|
committer | unknown <monty@work.mysql.com> | 2001-09-04 01:04:32 +0200 |
commit | 54e33e272d75345b09190052bb0c7d52cce56fc8 (patch) | |
tree | aaf42ebc12881df70581f25e72e0a95304a405ae /libmysql_r | |
parent | 5160501770aafc0b2b9ee287e5a8b7627b1b51bb (diff) | |
parent | 3b7bd02ebd175fd1e14e6e57e59e60af0a36f68f (diff) | |
download | mariadb-git-54e33e272d75345b09190052bb0c7d52cce56fc8.tar.gz |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
Docs/manual.texi:
Auto merged
client/mysqldump.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'libmysql_r')
-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 154c3df431b..88a566bdbf9 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -18,7 +18,7 @@ target = libmysqlclient_r.la -target_defs = +target_defs = -DDONT_USE_RAID ## LIBS = @LIBS@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \ |