diff options
| author | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-11-30 13:51:23 -0800 |
| commit | 9c81773b37a5ec1a689632e3161ae6b9d1fdeb46 (patch) | |
| tree | b9c649237ea098d61c73d02638e8fbff45391d3f /extra/yassl | |
| parent | 8486e64f3bced3c5cd2234587235bae970cd8a92 (diff) | |
| parent | b6547d09d637bf971a0e895da6af2bef67307a56 (diff) | |
| download | mariadb-git-9c81773b37a5ec1a689632e3161ae6b9d1fdeb46.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.1-release
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/t/alter_table.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/show_check.result:
Resolve conflict
sql/authors.h:
Resolve conflicts, update replication/backup developers
Diffstat (limited to 'extra/yassl')
| -rw-r--r-- | extra/yassl/Makefile.am | 2 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am index 41c4d84f24f..7ec49ec8c33 100644 --- a/extra/yassl/Makefile.am +++ b/extra/yassl/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = taocrypt src -EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) +EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am index af3ded7abfd..c8413af3285 100644 --- a/extra/yassl/taocrypt/Makefile.am +++ b/extra/yassl/taocrypt/Makefile.am @@ -1,2 +1,2 @@ SUBDIRS = src -EXTRA_DIST = taocrypt.dsw taocrypt.dsp +EXTRA_DIST = taocrypt.dsw taocrypt.dsp taocrypt.vcproj |