diff options
| author | Daniel Fischer <df@sun.com> | 2010-04-30 15:28:08 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-04-30 15:28:08 +0200 |
| commit | fdf36464b385727f4426f754124dc542367d62d7 (patch) | |
| tree | d9d93b3dbc42aa2bd8443c9e894592c1971b9073 /cmake | |
| parent | 1ac9997b215580c691d1a078357212c38fc7abb9 (diff) | |
| download | mariadb-git-fdf36464b385727f4426f754124dc542367d62d7.tar.gz | |
apply wlad's patch to read the fill_help_tables.sql file whole, not line by line
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/create_initial_db.cmake.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/create_initial_db.cmake.in b/cmake/create_initial_db.cmake.in index 649d96a6627..01b2da665a6 100644 --- 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) |