apply wlad's patch to read the fill_help_tables.sql file whole, not line by line

9e753663 · Daniel Fischer · 5c4ccba3 · 9e753663
Commit 9e753663 authored Apr 30, 2010 by Daniel Fischer
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

cmake/create_initial_db.cmake.in cmake/create_initial_db.cmake.in +3 -2

No files found.
--- a/cmake/create_initial_db.cmake.in
+++ b/cmake/create_initial_db.cmake.in
@@ -31,8 +31,7 @@ ENDIF()

 # Create bootstrapper SQL script
 FILE(WRITE bootstrap.sql "use mysql;\n" )
-FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql
-   fill_help_tables.sql)
+FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql)
   FILE(STRINGS ${CMAKE_SOURCE_DIR}/scripts/${FILENAME} CONTENTS)
   FOREACH(STR ${CONTENTS})
    IF(NOT STR MATCHES "@current_hostname")
@@ -40,6 +39,8 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql
    ENDIF()
  ENDFOREACH()
 ENDFOREACH()
+FILE(READ ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql CONTENTS)
+FILE(APPEND bootstrap.sql ${CONTENTS})


 FILE(REMOVE_RECURSE mysql)