Commit fdf36464 authored by Daniel Fischer's avatar Daniel Fischer

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

parent 1ac9997b
...@@ -31,8 +31,7 @@ ENDIF() ...@@ -31,8 +31,7 @@ ENDIF()
# Create bootstrapper SQL script # Create bootstrapper SQL script
FILE(WRITE bootstrap.sql "use mysql;\n" ) FILE(WRITE bootstrap.sql "use mysql;\n" )
FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql)
fill_help_tables.sql)
FILE(STRINGS ${CMAKE_SOURCE_DIR}/scripts/${FILENAME} CONTENTS) FILE(STRINGS ${CMAKE_SOURCE_DIR}/scripts/${FILENAME} CONTENTS)
FOREACH(STR ${CONTENTS}) FOREACH(STR ${CONTENTS})
IF(NOT STR MATCHES "@current_hostname") IF(NOT STR MATCHES "@current_hostname")
...@@ -40,6 +39,8 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql ...@@ -40,6 +39,8 @@ FOREACH(FILENAME mysql_system_tables.sql mysql_system_tables_data.sql
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
ENDFOREACH() ENDFOREACH()
FILE(READ ${CMAKE_SOURCE_DIR}/scripts/fill_help_tables.sql CONTENTS)
FILE(APPEND bootstrap.sql ${CONTENTS})
FILE(REMOVE_RECURSE mysql) FILE(REMOVE_RECURSE mysql)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment