diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-02 12:01:24 +0300 |
| commit | e0a6b02c5d0a311e7167295494786077009743d1 (patch) | |
| tree | 72c934fe42261ad5de3139961e092f57e9d147df /Makefile.am | |
| parent | d2f8b7d04503478ab6b6998194a2070891f0c2bb (diff) | |
| parent | 6ad06b15222300e4eed4fe3972d1ad249c4c42a2 (diff) | |
| download | mariadb-git-e0a6b02c5d0a311e7167295494786077009743d1.tar.gz | |
Merge with MySQL 5.1.49
Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 7f212a67c3f..85b4018d6bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -161,8 +161,8 @@ test-bt: -if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \ cd mysql-test ; \ MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=ndb+rpl_ndb+ps --force --timer \ - --ps-protocol --mysqld=--binlog-format=row --suite=ndb,rpl_ndb ; \ + @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=ndb+ps --force --timer \ + --ps-protocol --mysqld=--binlog-format=row --suite=ndb ; \ MTR_BUILD_THREAD=auto \ @PERL@ ./mysql-test-run.pl $(MTR_EXTRA_OPTIONS) --comment=ndb --force --timer \ --with-ndbcluster-only ; \ |