summaryrefslogtreecommitdiff
path: root/client/Makefile.am
diff options
context:
space:
mode:
authorunknown <holyfoot@deer.(none)>2006-04-28 09:07:25 +0500
committerunknown <holyfoot@deer.(none)>2006-04-28 09:07:25 +0500
commit82c45de638c4a3ae9c52019eb7c658a171b5eef2 (patch)
treec0e0a652c3357f1581b8835382508b5adf547d01 /client/Makefile.am
parent66b56724ffb0a8265445b91f50724076cfdeebf2 (diff)
downloadmariadb-git-82c45de638c4a3ae9c52019eb7c658a171b5eef2.tar.gz
bug #18115 (mysql_upgrade on Windows)
pushed in 5.0 VC++Files/mysql.dsw: mysql_upgrade tool added VC++Files/mysql.sln: mysql_upgrade tool added VC++Files/mysql_ia64.dsw: mysql_upgrade tool added client/Makefile.am: mysql_upgrade tool added
Diffstat (limited to 'client/Makefile.am')
-rw-r--r--client/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index 2c513d3d7c7..9d133125a0d 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -31,6 +31,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la
bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \
mysqldump mysqlimport mysqltest mysqlbinlog \
+ mysql_upgrade \
mysqltestmanagerc mysqltestmanager-pwgen
noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
client_priv.h
@@ -48,11 +49,14 @@ mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix)
mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix)
mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix)
mysqlimport_SOURCES= mysqlimport.c $(yassl_dummy_link_fix)
+mysql_upgrade_SOURCES= mysql_upgrade.c $(yassl_dummy_link_fix)
sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc
strings_src=decimal.c
# Fix for mit-threads
-DEFS = -DUNDEF_THREADS_HACK
+DEFS = -DUNDEF_THREADS_HACK \
+ -DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
+ -DDATADIR="\"$(localstatedir)\""
link_sources:
for f in $(sql_src) ; do \