diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 09:42:05 +0200 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-12-14 09:42:05 +0200 |
| commit | c108939d194498dcc2f7da817f30c9a6112a260a (patch) | |
| tree | 8175b213f85abddbbbf19d7bc89ee8c7feb4976f /extra/Makefile.am | |
| parent | b141917a0af306743388f66a1df98a9346e8fb8d (diff) | |
| parent | 700e6cbd5ac5436039f4e7969bc97d5fb28cd11d (diff) | |
| download | mariadb-git-c108939d194498dcc2f7da817f30c9a6112a260a.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
extra/Makefile.am:
Auto merged
mysql-test/t/disabled.def:
Merged from 5.0
sql/handler.cc:
Merged from 5.0
sql/mysqld.cc:
Merged from 5.0
Diffstat (limited to 'extra/Makefile.am')
| -rw-r--r-- | extra/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index a2b4dce374a..56fed856637 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -29,8 +29,8 @@ SUBDIRS= DIST_SUBDIRS= yassl # This will build mysqld_error.h and sql_state.h -$(top_builddir)/include/mysqld_error.h: comp_err - $(top_builddir)/extra/comp_err \ +$(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT) + $(top_builddir)/extra/comp_err$(EXEEXT) \ --charset=$(top_srcdir)/sql/share/charsets \ --out-dir=$(top_builddir)/sql/share/ \ --header_file=$(top_builddir)/include/mysqld_error.h \ |