diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-11-01 16:49:39 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-11-01 16:49:39 +0100 |
| commit | 181f564bfa58e539bbcff16874016c5e1481a8e1 (patch) | |
| tree | 62fbc1800ae09244e6b369413d914fa186b335f8 /client/Makefile.am | |
| parent | 17e9db8cdbb787b9a1798e05e9ec520067491d90 (diff) | |
| parent | 2a415a2f9d92e1b07eb308a42ea8d84e8da1ec3f (diff) | |
| download | mariadb-git-181f564bfa58e539bbcff16874016c5e1481a8e1.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
into pilot.mysql.com:/data/msvensson/mysql/bug31004/my51-bug31004
client/CMakeLists.txt:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
client/Makefile.am:
Merge 5.0->5.1
client/mysqltest.c:
Merge 5.0->5.1
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 2d8bd918734..c57a5673367 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -88,7 +88,8 @@ mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ mysqltest_SOURCES= mysqltest.c \ $(top_srcdir)/mysys/my_getsystime.c \ - $(top_srcdir)/mysys/my_copy.c + $(top_srcdir)/mysys/my_copy.c \ + $(top_srcdir)/mysys/my_mkdir.c mysqltest_LDADD = $(top_builddir)/regex/libregex.a $(LDADD) mysql_upgrade_SOURCES= mysql_upgrade.c \ |