diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-04-27 13:58:21 +0400 |
| commit | d328d5be33cddff7dfcc736ecc993f11560f8152 (patch) | |
| tree | 6fc830df498046ca29b2381fb809726faeb04f52 /scripts/CMakeLists.txt | |
| parent | 5575d724cf1e40c467ab0eab934ce8846b452a9a (diff) | |
| parent | 0c8c4a7133f955603029b3bc31e45b5ef02516ca (diff) | |
| download | mariadb-git-d328d5be33cddff7dfcc736ecc993f11560f8152.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
Diffstat (limited to 'scripts/CMakeLists.txt')
| -rwxr-xr-x | scripts/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index ad0f5652b1c..f39224b9457 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -261,7 +261,7 @@ IF(WIN32) SET(PLIN_FILES mysql_config mysql_secure_installation) # Input files with .sh extension - SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow + SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow mysqlhotcopy) FOREACH(file ${PLIN_FILES}) |