summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsvensson@shellback.(none) <>2006-09-18 11:27:21 +0200
committermsvensson@shellback.(none) <>2006-09-18 11:27:21 +0200
commit0a59967cb0c3480d5cd0163765f469358e550af5 (patch)
treea5d74b92fc5867ecd962e9d912cff900a4945a90
parentdd769969550851e7ec3db326146608f4847fbe64 (diff)
downloadmariadb-git-0a59967cb0c3480d5cd0163765f469358e550af5.tar.gz
Remove trailing whitespace
Add linebreak
-rw-r--r--.bzrignore1
-rw-r--r--mysql-test/Makefile.am7
2 files changed, 5 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore
index db21a434335..56a72d3eca0 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1810,3 +1810,4 @@ win/vs71cache.txt
win/vs8cache.txt
zlib/*.ds?
zlib/*.vcproj
+mysql-test/mysql-test-run-shell
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index f8e00063030..d875ade1fcd 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -22,14 +22,15 @@ DIST_SUBDIRS=ndb
benchdir_root= $(prefix)
testdir = $(benchdir_root)/mysql-test
-EXTRA_SCRIPTS = mysql-test-run_shell.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
-EXTRA_DIST = $(EXTRA_SCRIPTS)
+EXTRA_SCRIPTS = mysql-test-run_shell.sh install_test_db.sh \
+ valgrind.supp $(PRESCRIPTS)
+EXTRA_DIST = $(EXTRA_SCRIPTS)
GENSCRIPTS = mysql-test-run-shell install_test_db mtr mysql-test-run
PRESCRIPTS = mysql-test-run.pl
test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS)
test_DATA = std_data/client-key.pem std_data/client-cert.pem \
std_data/cacert.pem std_data/server-cert.pem \
- std_data/server-key.pem
+ std_data/server-key.pem
CLEANFILES = $(GENSCRIPTS)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I..