diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-19 18:33:48 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-19 18:33:48 +0100 |
| commit | 4a39f83ff7ebca7881850b10bfe9d1ca9da7f556 (patch) | |
| tree | 3fa997217e9d20626bda412cfaddf80465b751d3 | |
| parent | 53afccc829b76d0f238fb1fe50b2641b637608e6 (diff) | |
| download | mariadb-git-4a39f83ff7ebca7881850b10bfe9d1ca9da7f556.tar.gz | |
Fix errors when building release
- package some more perl scripts on Windows (mysqlhotcopy and mysqldumpslow)
- do not try to pack .map files (no more produced)
- (CMake-unrelated) fix debug build on FreeBSD, trying to use uninitialized attribute
MY_MUTEX_INIT_FAST
| -rw-r--r-- | dbug/dbug.c | 2 | ||||
| -rwxr-xr-x | scripts/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | scripts/make_win_bin_dist | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index 9bcea988b33..d75a5ae269e 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -384,7 +384,7 @@ static CODE_STATE *code_state(void) if (!init_done) { init_done=TRUE; - pthread_mutex_init(&THR_LOCK_dbug,MY_MUTEX_INIT_FAST); + pthread_mutex_init(&THR_LOCK_dbug, NULL); bzero(&init_settings, sizeof(init_settings)); init_settings.out_file=stderr; init_settings.flags=OPEN_APPEND; diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 3352eb23a73..ad0f5652b1c 100755 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -261,7 +261,8 @@ IF(WIN32) SET(PLIN_FILES mysql_config mysql_secure_installation) # Input files with .sh extension - SET(SH_FILES mysql_convert_table_format mysqld_multi) + SET(SH_FILES mysql_convert_table_format mysqld_multi mysqldumpslow + mysqlhotcopy) FOREACH(file ${PLIN_FILES}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 51271a3dad0..e54a14cc66e 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -158,7 +158,6 @@ cp tests/$TARGET/*.exe $DESTDIR/bin/ cp libmysql/$TARGET/libmysql.dll $DESTDIR/bin/ cp sql/$TARGET/mysqld.exe $DESTDIR/bin/mysqld$EXE_SUFFIX.exe -cp sql/$TARGET/mysqld.map $DESTDIR/bin/mysqld$EXE_SUFFIX.map if [ x"$TARGET" != x"release" ] ; then cp sql/$TARGET/mysqld.pdb $DESTDIR/bin/mysqld$EXE_SUFFIX.pdb fi @@ -167,7 +166,6 @@ if [ x"$PACK_DEBUG" = x"" -a -f "sql/debug/mysqld.exe" -o \ x"$PACK_DEBUG" = x"yes" ] ; then cp sql/debug/mysqld.exe $DESTDIR/bin/mysqld-debug.exe cp sql/debug/mysqld.pdb $DESTDIR/bin/mysqld-debug.pdb - cp sql/debug/mysqld.map $DESTDIR/bin/mysqld-debug.map fi # ---------------------------------------------------------------------- |