diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-18 13:22:32 +0200 |
| commit | 5eab19d7a329af61c6c218bf192a85881b51088d (patch) | |
| tree | 3528bf5516292baeb59d3009dd2e876e94eceb91 /CMakeLists.txt | |
| parent | 2276ca1aef779a003dead2ce80f50ab6a9ae91d9 (diff) | |
| parent | 1d24597ff94a45e714151f3024a013e44a569169 (diff) | |
| download | mariadb-git-5eab19d7a329af61c6c218bf192a85881b51088d.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/my50-m-mysql_upgrade
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
CMakeLists.txt:
Auto merged
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a286071bb0..60ed1275521 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -133,6 +133,7 @@ ADD_SUBDIRECTORY(dbug) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) +ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(extra/yassl) ADD_SUBDIRECTORY(extra/yassl/taocrypt) ADD_SUBDIRECTORY(extra) |