diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-04 21:04:34 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-11-04 21:04:34 +0100 |
| commit | 4fe2478b0d623b54486d16dfc66f5b7def9ad90c (patch) | |
| tree | d0fcd4466c6efd12700981e5be57f95154f38470 /cmake | |
| parent | cdb54f480d9a7aada5c4035aa603c139bdd8e727 (diff) | |
| download | mariadb-git-4fe2478b0d623b54486d16dfc66f5b7def9ad90c.tar.gz | |
Improve cleanup in create_initial_db.cmake, fix the 'table already exists' error if build is run twice.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/create_initial_db.cmake.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index 93266b1f870..e12ef0fa97f 100644 --- a/cmake/create_initial_db.cmake.in +++ b/cmake/create_initial_db.cmake.in @@ -42,8 +42,9 @@ ENDFOREACH() FILE(READ ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql CONTENTS) FILE(APPEND bootstrap.sql "${CONTENTS}") +FILE(REMOVE_RECURSE mysql performance_schema) +FILE(REMOVE ibdata1 ib_logfile0 ib_logfile1) -FILE(REMOVE_RECURSE mysql) MAKE_DIRECTORY(mysql) IF(WIN32) SET(CONSOLE --console) |