[Commits] Rev 3474: Improve cleanup in create_initial_db.cmake, fix the 'table already exists' error if build is run twice. in file:///H:/bzr/10.0-serg/

Vladislav Vaintroub wlad at montyprogram.com
Sun Nov 4 22:04:41 EET 2012


At file:///H:/bzr/10.0-serg/

------------------------------------------------------------
revno: 3474
revision-id: wlad at montyprogram.com-20121104200434-655ald2fmpmgzwvb
parent: wlad at montyprogram.com-20121104200404-dlu9sfihd1fyg81v
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 10.0-serg
timestamp: Sun 2012-11-04 21:04:34 +0100
message:
  Improve cleanup in create_initial_db.cmake,  fix the 'table already exists' error if build is run twice.
-------------- next part --------------
=== modified file 'cmake/create_initial_db.cmake.in'
--- a/cmake/create_initial_db.cmake.in	2012-10-29 15:52:15 +0000
+++ b/cmake/create_initial_db.cmake.in	2012-11-04 20:04:34 +0000
@@ -42,8 +42,9 @@
 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)



More information about the commits mailing list