diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-24 16:37:41 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-24 16:37:41 +0200 |
| commit | 18ca5c4dbc890684316df6c29e5b34c018849126 (patch) | |
| tree | ca03b2abab93a9d6172ede495fa358909c306f94 /bdb | |
| parent | 72da2e4c9463aeb80083fd53cc0e6f5091b5f4f7 (diff) | |
| parent | bb948c635507db07365554d0e33bc09522c77557 (diff) | |
| download | mariadb-git-18ca5c4dbc890684316df6c29e5b34c018849126.tar.gz | |
merge with 3.23 to get bugfixes for <=> NULL and --bind-address
Build-tools/Do-compile:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysql-test/mysql-test-run.sh:
Ignore changes from 3.23
mysql-test/r/func_time.result:
Update results
mysql-test/r/null_key.result:
Update results
scripts/mysqld_safe.sh:
Don't apply NICE handling change from 3.23
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
support-files/mysql.server.sh:
Don't apply changes from 3.23
Diffstat (limited to 'bdb')
| -rw-r--r-- | bdb/dist/aclocal/mutex.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bdb/dist/aclocal/mutex.m4 b/bdb/dist/aclocal/mutex.m4 index a6b1fa1a053..5c9218da163 100644 --- a/bdb/dist/aclocal/mutex.m4 +++ b/bdb/dist/aclocal/mutex.m4 @@ -403,5 +403,7 @@ UTS/cc-assembly) ADDITIONAL_OBJS="$ADDITIONAL_OBJS uts4.cc${o}" AC_DEFINE(HAVE_MUTEX_UTS_CC_ASSEMBLY);; x86/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" AC_DEFINE(HAVE_MUTEX_X86_GCC_ASSEMBLY);; +x86_64/gcc-assembly) ADDITIONAL_OBJS="mut_tas${o} $ADDITIONAL_OBJS" + AC_DEFINE(HAVE_MUTEX_X86_64_GCC_ASSEMBLY);; esac ])dnl |