Commit c785ed70 authored by Michael Widenius's avatar Michael Widenius

Added mytop to distribution (with some small trivial changes to make it workg...

Added mytop to distribution (with some small trivial changes to make it workg good also for MariaDB)

scripts/CMakeLists.txt:
  Added mytop
scripts/Makefile.am:
  Added mytop
scripts/make_binary_distribution.sh:
  Added mytop
scripts/make_win_bin_dist:
  Added mytop
scripts/mytop.sh:
  Added mytop (with some small trivial changes to make it workg good also for MariaDB)
support-files/mysql.spec.sh:
  Added mytop
parent ba9a890f
...@@ -1969,3 +1969,4 @@ plugin/handler_socket/client/hsclient ...@@ -1969,3 +1969,4 @@ plugin/handler_socket/client/hsclient
client/strings_def.h client/strings_def.h
libmysql/strings_def.h libmysql/strings_def.h
libmysql_r/strings_def.h libmysql_r/strings_def.h
scripts/mytop
...@@ -80,7 +80,10 @@ CONFIGURE_FILE(mysqldumpslow.sh ...@@ -80,7 +80,10 @@ CONFIGURE_FILE(mysqldumpslow.sh
CONFIGURE_FILE(mysqlhotcopy.sh CONFIGURE_FILE(mysqlhotcopy.sh
${CMAKE_BINARY_DIR}/scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY) ${CMAKE_BINARY_DIR}/scripts/mysqlhotcopy.pl ESCAPE_QUOTES @ONLY)
FOREACH(f mysqldumpslow.pl mysqlhotcopy.pl mysql_config.pl CONFIGURE_FILE(mytop.sh
${CMAKE_BINARY_DIR}/scripts/mytop.pl ESCAPE_QUOTES @ONLY)
FOREACH(f mysqldumpslow.pl mysqlhotcopy.pl mytop.pl mysql_config.pl
mysql_convert_table_format.pl mysql_install_db.pl mysql_convert_table_format.pl mysql_install_db.pl
mysql_secure_installation.pl mysqld_multi.pl) mysql_secure_installation.pl mysqld_multi.pl)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f}
...@@ -90,4 +93,4 @@ ENDFOREACH() ...@@ -90,4 +93,4 @@ ENDFOREACH()
INSTALL(FILES fill_help_tables.sql mysql_system_tables.sql INSTALL(FILES fill_help_tables.sql mysql_system_tables.sql
mysql_system_tables_data.sql mysql_system_tables_fix.sql mysql_test_data_timezone.sql mysql_system_tables_data.sql mysql_system_tables_fix.sql mysql_test_data_timezone.sql
DESTINATION share COMPONENT Server) DESTINATION share COMPONENT Server)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql DESTINATION share COMPONENT Server) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables.sql DESTINATION share COMPONENT Server)
\ No newline at end of file
...@@ -33,6 +33,7 @@ bin_SCRIPTS = @server_scripts@ \ ...@@ -33,6 +33,7 @@ bin_SCRIPTS = @server_scripts@ \
mysql_convert_table_format \ mysql_convert_table_format \
mysql_find_rows \ mysql_find_rows \
mysqlhotcopy \ mysqlhotcopy \
mytop \
mysqldumpslow \ mysqldumpslow \
mysqld_multi mysqld_multi
...@@ -58,6 +59,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \ ...@@ -58,6 +59,7 @@ EXTRA_SCRIPTS = make_binary_distribution.sh \
mysql_convert_table_format.sh \ mysql_convert_table_format.sh \
mysql_find_rows.sh \ mysql_find_rows.sh \
mysqlhotcopy.sh \ mysqlhotcopy.sh \
mytop.sh \
mysqldumpslow.sh \ mysqldumpslow.sh \
mysqld_multi.sh \ mysqld_multi.sh \
mysqld_safe.sh \ mysqld_safe.sh \
...@@ -91,6 +93,7 @@ CLEANFILES = @server_scripts@ \ ...@@ -91,6 +93,7 @@ CLEANFILES = @server_scripts@ \
mysql_convert_table_format \ mysql_convert_table_format \
mysql_find_rows \ mysql_find_rows \
mysqlhotcopy \ mysqlhotcopy \
mytop \
mysqldumpslow \ mysqldumpslow \
mysqld_multi \ mysqld_multi \
convert-debug-for-diff \ convert-debug-for-diff \
......
...@@ -459,6 +459,7 @@ copyfileto $BASE/bin $BIN_FILES ...@@ -459,6 +459,7 @@ copyfileto $BASE/bin $BIN_FILES
$CP netware/*.pl $BASE/scripts $CP netware/*.pl $BASE/scripts
$CP scripts/mysqlhotcopy $BASE/scripts/mysqlhotcopy.pl $CP scripts/mysqlhotcopy $BASE/scripts/mysqlhotcopy.pl
$CP scripts/mytop $BASE/scripts/mytop.pl
copyfileto $BASE/lib \ copyfileto $BASE/lib \
libmysql/.libs/libmysqlclient.a \ libmysql/.libs/libmysqlclient.a \
......
...@@ -373,6 +373,7 @@ mysql_secure_installation.pl \ ...@@ -373,6 +373,7 @@ mysql_secure_installation.pl \
mysqld_multi.pl \ mysqld_multi.pl \
mysqldumpslow.pl \ mysqldumpslow.pl \
mysqlhotcopy.pl \ mysqlhotcopy.pl \
mytop.pl \
" "
mkdir -p $DESTDIR/scripts mkdir -p $DESTDIR/scripts
......
This diff is collapsed.
...@@ -1016,6 +1016,7 @@ fi ...@@ -1016,6 +1016,7 @@ fi
%attr(755, root, root) %{_bindir}/mysqld_safe %attr(755, root, root) %{_bindir}/mysqld_safe
%attr(755, root, root) %{_bindir}/mysqldumpslow %attr(755, root, root) %{_bindir}/mysqldumpslow
%attr(755, root, root) %{_bindir}/mysqlhotcopy %attr(755, root, root) %{_bindir}/mysqlhotcopy
%attr(755, root, root) %{_bindir}/mytop
%attr(755, root, root) %{_bindir}/mysqltest %attr(755, root, root) %{_bindir}/mysqltest
%attr(755, root, root) %{_bindir}/perror %attr(755, root, root) %{_bindir}/perror
%attr(755, root, root) %{_bindir}/replace %attr(755, root, root) %{_bindir}/replace
......
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