diff options
| author | unknown <holyfoot@deer.(none)> | 2006-03-18 17:56:24 +0400 |
|---|---|---|
| committer | unknown <holyfoot@deer.(none)> | 2006-03-18 17:56:24 +0400 |
| commit | de2201b13f543f927092b9c3ed8d30db084ca180 (patch) | |
| tree | 58561eae47080e6fe38ff61e442cd0c98c7b0dbe /client/Makefile.am | |
| parent | 4ac5afa3b991654a38b39ad44880e74da06a02c3 (diff) | |
| download | mariadb-git-de2201b13f543f927092b9c3ed8d30db084ca180.tar.gz | |
bug #18115 (mysql_upgrade missing in Windows binary)
VC++Files/mysql.dsw:
mysql_upgrade project added
VC++Files/mysql_ia64.dsw:
mysql_upgrade project added
client/Makefile.am:
mysql_upgrade programm added
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index af7c3d2a549..634f64be6ca 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -39,7 +39,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ mysqldump mysqlimport mysqltest mysqlbinlog \ mysqltestmanagerc mysqltestmanager-pwgen \ - mysqlslap + mysqlslap mysql_upgrade noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \ client_priv.h mysql_SOURCES = mysql.cc readline.cc sql_string.cc completion_hash.cc @@ -72,11 +72,14 @@ mysqlslap_SOURCES= mysqlslap.c \ 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 \ |