diff options
| author | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-03-28 10:07:03 +0200 |
| commit | fa780d44c64df04bb78d097e984b40fdf11edc84 (patch) | |
| tree | 6724cacb8e05bc9947fee00d5a2dd6c47605ce66 /vio | |
| parent | 73970addd82584a9ec6ad4c95ba5d54dfe0f640c (diff) | |
| parent | 421ae80b0ccbfa33856fe1f079bc3cd6acf44175 (diff) | |
| download | mariadb-git-fa780d44c64df04bb78d097e984b40fdf11edc84.tar.gz | |
Manual merge.
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'vio')
| -rw-r--r-- | vio/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vio/Makefile.am b/vio/Makefile.am index 544639139de..b7e002a3033 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -38,6 +38,7 @@ test_sslclient_LDADD= @CLIENT_EXTRA_LDFLAGS@ ../dbug/libdbug.a libvio.a \ ../mysys/libmysys.a ../strings/libmystrings.a \ $(openssl_libs) $(yassl_libs) libvio_a_SOURCES= vio.c viosocket.c viossl.c viosslfactories.c +EXTRA_DIST= cmakelists.txt # Don't update the files from bitkeeper %::SCCS/s.% |