Skip to content

M
MariaDB
Commit 7a63b00c authored by unknown's avatar unknown
Browse files
Options

Merge trift2.:/MySQL/M51/mysql-5.1 

into  trift2.:/MySQL/M51/push-5.1


scripts/Makefile.am:
  Auto merged
parents 60069acd 5f2fcf68
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
scripts/Makefile.am
View file @ 7a63b00c
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
BUILT_SOURCES = mysql_fix_privilege_tables.sql \ BUILT_SOURCES = mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c mysql_fix_privilege_tables_sql.c
noinst_PROGRAMS = comp_sql EXTRA_PROGRAMS = comp_sql
bin_SCRIPTS = @server_scripts@ \ bin_SCRIPTS = @server_scripts@ \
msql2mysql \ msql2mysql \
...@@ -62,6 +62,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \ ...@@ -62,6 +62,8 @@ EXTRA_DIST = $(EXTRA_SCRIPTS) \
mysqlaccess.conf \ mysqlaccess.conf \
mysqlbug \ mysqlbug \
make_win_bin_dist \ make_win_bin_dist \
mysql_fix_privilege_tables.sql \
mysql_fix_privilege_tables_sql.c \
mysql_system_tables_fix.sql \ mysql_system_tables_fix.sql \
CMakeLists.txt CMakeLists.txt
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7