diff options
| author | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-08-24 15:54:23 -0700 |
| commit | ffc086e60a5cdf0632d7987ddda438a4991db8fa (patch) | |
| tree | 2408b4ed8fd028e82c29e702dde98508806df16c /sql/share | |
| parent | ce38e65bdcbb6c94d4599b03079bb4e7d41af82d (diff) | |
| parent | 4b9431369611b4c3938288c0ef9eaa282f1bb417 (diff) | |
| download | mariadb-git-ffc086e60a5cdf0632d7987ddda438a4991db8fa.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11680
into mysql.com:/home/jimw/my/mysql-5.0-clean
configure.in:
Auto merged
sql/hostname.cc:
Resolve conflict
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am index b7ab8fead22..2e23027f1f5 100644 --- a/sql/share/Makefile.am +++ b/sql/share/Makefile.am @@ -33,7 +33,7 @@ all-local: english/errmsg.sys # created. Normally these are created by extra/Makefile english/errmsg.sys: errmsg.txt - rm $(top_builddir)/include/mysqld_error.h + rm -f $(top_builddir)/include/mysqld_error.h (cd $(top_builddir)/extra && $(MAKE)) install-data-local: |