diff options
| author | unknown <monty@mysql.com> | 2004-10-20 16:24:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-20 16:24:28 +0300 |
| commit | 300b778f99c441a1e4314f8deeab1d9f116b9020 (patch) | |
| tree | f3f6e81dac72352598beb9c21f116d2ef7f9c3ef /configure.in | |
| parent | d088d80e791d9a9b72406da7ac58fc50d6d97052 (diff) | |
| parent | 0a505ccc080eca79903103d081da8214bcd51d47 (diff) | |
| download | mariadb-git-300b778f99c441a1e4314f8deeab1d9f116b9020.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
Docs/Support/texi2html:
Auto merged
innobase/trx/trx0rec.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_acl.cc:
Keep old code
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 5d305ea755e..494747ffb1e 100644 --- a/configure.in +++ b/configure.in @@ -44,12 +44,12 @@ do case $host_os in netware* | modesto*) echo "$i/errmsg.sys: $i/errmsg.txt - \$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ \$^ $i/errmsg.sys" \ + \$(top_builddir)/extra/comp_err.linux -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \ >> $AVAILABLE_LANGUAGES_ERRORS_RULES ;; *) echo "$i/errmsg.sys: $i/errmsg.txt - \$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ \$^ $i/errmsg.sys" \ + \$(top_builddir)/extra/comp_err -C\$(srcdir)/charsets/ $i/errmsg.txt $i/errmsg.sys" \ >> $AVAILABLE_LANGUAGES_ERRORS_RULES ;; esac |