diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-10-24 14:42:08 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-10-24 14:42:08 -0600 |
| commit | d4bfae38ac685d1f277fcc1b42ac003f98d8c940 (patch) | |
| tree | f6b3ce247f0c1b8d045348dca4533d282d470935 /CMakeLists.txt | |
| parent | 752e5f1ec77f79009804a6ed316843b184b46394 (diff) | |
| parent | 69c7200219dd2010de7ca33d89432aff4fbd9e3a (diff) | |
| download | mariadb-git-d4bfae38ac685d1f277fcc1b42ac003f98d8c940.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50
configure.in:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
myisam/sort.c:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
mysql-test/t/innodb_mysql.test:
Manual merge
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8058f615f7c..1c858eebb92 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,10 +122,10 @@ ADD_SUBDIRECTORY(myisam) ADD_SUBDIRECTORY(myisammrg) ADD_SUBDIRECTORY(client) IF(WITH_BERKELEY_STORAGE_ENGINE) -ADD_SUBDIRECTORY(bdb) + ADD_SUBDIRECTORY(bdb) ENDIF(WITH_BERKELEY_STORAGE_ENGINE) IF(WITH_INNOBASE_STORAGE_ENGINE) -ADD_SUBDIRECTORY(innobase) + ADD_SUBDIRECTORY(innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/examples) |