diff options
| author | unknown <anozdrin@mysql.com> | 2006-01-13 19:09:27 +0300 |
|---|---|---|
| committer | unknown <anozdrin@mysql.com> | 2006-01-13 19:09:27 +0300 |
| commit | 848235f797cbbc2e16cb132b67177a6728e6735d (patch) | |
| tree | c39f4747f6c64b9a61a4edb4ab053adc98010ea0 /client/Makefile.am | |
| parent | 4a114543d5ea588a69f74418fc0cb472a519ebda (diff) | |
| parent | 9d2def68963e2ecf578eeac0fb376b5d006073c5 (diff) | |
| download | mariadb-git-848235f797cbbc2e16cb132b67177a6728e6735d.tar.gz | |
Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into mysql.com:/home/alik/MySQL/devel/5.1-bug15110
BitKeeper/etc/ignore:
auto-union
client/mysqldump.c:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/type_time.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
client/Makefile.am:
Add my_user.c
include/Makefile.am:
Add my_user.c
libmysqld/Makefile.am:
Add my_user.c
mysql-test/t/disabled.def:
Enable type_time.test
sql/sql_parse.cc:
Merge.
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 1c2ca0670c7..a22b929207c 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -56,7 +56,7 @@ mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) mysqlslap_SOURCES= mysqlslap.c $(top_srcdir)/mysys/my_lock.c \ $(top_srcdir)/mysys/my_alarm.c \ $(yassl_dummy_link_fix) -mysqldump_SOURCES= mysqldump.c $(yassl_dummy_link_fix) +mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix) mysqlimport_SOURCES= mysqlimport.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 @@ -72,7 +72,10 @@ link_sources: for f in $(strings_src) ; do \ rm -f $(srcdir)/$$f; \ @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \ - done; + done; \ + rm -f $(srcdir)/my_user.c; \ + @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c; + # Don't update the files from bitkeeper %::SCCS/s.% |