diff options
| author | unknown <iggy@alf.> | 2007-04-24 12:41:08 -0400 |
|---|---|---|
| committer | unknown <iggy@alf.> | 2007-04-24 12:41:08 -0400 |
| commit | da059fcb96e3016056821b0b69a65d2342a957cd (patch) | |
| tree | 267e8eb1eb3610880a79405fe745532070cdb680 /scripts | |
| parent | db1582e952f2dd617f732b180e429254c1c36ccf (diff) | |
| download | mariadb-git-da059fcb96e3016056821b0b69a65d2342a957cd.tar.gz | |
Minor fixes.
scripts/CMakeLists.txt:
Fix broken bk native builds.
sql/log_event_old.cc:
Fix for failing DBUG builds.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index bca0581ecbc..e9113b098da 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -13,20 +13,30 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Build mysql_fix_privilege_tables.sql +ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql + COMMAND copy /b + mysql_system_tables.sql + mysql_system_tables_fix.sql + mysql_fix_privilege_tables.sql + DEPENDS + ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables.sql + ${PROJECT_SOURCE_DIR}/scripts/mysql_system_tables_fix.sql) +# Build comp_sql - used for embedding SQL in C or C++ programs ADD_EXECUTABLE(comp_sql comp_sql.c) TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings) -# Build comp_sql - used for embedding SQL in C or C++ programs +# Use comp_sql to build mysql_fix_privilege_tables_sql.c GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION) ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c COMMAND ${COMP_SQL_EXE} mysql_fix_privilege_tables mysql_fix_privilege_tables.sql - mysql_fix_privilege_tables_sql.c + mysql_fix_privilege_tables_sql.c DEPENDS comp_sql ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables.sql) +# Add dummy target for the above to be built ADD_CUSTOM_TARGET(GenFixPrivs ALL DEPENDS ${PROJECT_SOURCE_DIR}/scripts/mysql_fix_privilege_tables_sql.c) |