diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-12-03 13:19:05 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-12-03 13:19:05 +0200 |
| commit | 82e910d146fa3803200176875cc6cb5ddf6d1483 (patch) | |
| tree | 6395890be2935ea39f0babd666cfc8ac50577510 /unittest | |
| parent | 4c14f9f23c725fd15b6b3c29bff07d925047e8ac (diff) | |
| parent | fb8a529d6eeff616ff13fabce2234d3bfe2e4b57 (diff) | |
| download | mariadb-git-82e910d146fa3803200176875cc6cb5ddf6d1483.tar.gz | |
Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable federated_server.test
Author: Antony Curtis
License: BSD
client/mysql.cc:
Reset variable if CTRL-C was used to kill running query, so that the user can do it again
client/mysqlcheck.c:
Indentation fix
client/mysqlslap.c:
Indentation fixes
client/mysqltest.cc:
Make testing of commands safer by also testing length
Removed not used variable
Fixed indentation to be as it was before last patch
mysql-test/lib/mtr_report.pm:
Fixed typo
mysql-test/mysql-test-run.pl:
Merge (Align code with default mysql-tes-run.pl)
mysql-test/suite/federated/disabled.def:
Removed test case
storage/federatedx/ha_federatedx.cc:
Removed my changes and applied Antony's instead
Diffstat (limited to 'unittest')
| -rw-r--r-- | unittest/mysys/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unittest/mysys/Makefile.am b/unittest/mysys/Makefile.am index 7fb487ffabf..115eeb8df7a 100644 --- a/unittest/mysys/Makefile.am +++ b/unittest/mysys/Makefile.am @@ -24,7 +24,7 @@ LDADD = $(top_builddir)/unittest/mytap/libmytap.a \ $(top_builddir)/strings/libmystrings.a EXTRA_DIST = CMakeLists.txt -noinst_PROGRAMS = bitmap-t base64-t lf-t waiting_threads-t +noinst_PROGRAMS = bitmap-t base64-t my_atomic-t lf-t waiting_threads-t if NEED_THREAD # my_atomic-t is used to check thread functions, so it is safe to |