diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-03 12:58:41 +0200 |
| commit | 530a6e74819ec14b5fdc42aa588b236ecb9f2fcd (patch) | |
| tree | a4d45b1fd0e434c23577507364fa443226676eb5 /CMakeLists.txt | |
| parent | 5088cbf4ed7224698678f3eaf406361c6e7db4b8 (diff) | |
| parent | 4b41e3c7f33714186c97a6cc2e6d3bb93b050c61 (diff) | |
| download | mariadb-git-530a6e74819ec14b5fdc42aa588b236ecb9f2fcd.tar.gz | |
Merge branch '10.0' into 10.1
referenced_by_foreign_key2(), needed for InnoDB to compile,
was taken from 10.0-galera
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d86004daa9c..6df6e736bbd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -401,7 +401,6 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() -ADD_SUBDIRECTORY(packaging/solaris) INCLUDE(for_clients) |