diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-09-28 11:34:53 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-09-28 11:34:53 +0200 |
| commit | 69bfcd9c400e0b00fe53aaee8da0b38b0bf5f9ad (patch) | |
| tree | 5b0761b29daf8c864538d0fb55e20e9b54758e47 /Makefile.am | |
| parent | 59041a2b356943bda95d38c10e9ba01f7b2c7a73 (diff) | |
| parent | e4fe90bfa767366a4784adb4e7c65bca7c5c0537 (diff) | |
| download | mariadb-git-69bfcd9c400e0b00fe53aaee8da0b38b0bf5f9ad.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysys/my_init.c:
Auto merged
sql/sql_update.cc:
Auto merged
Makefile.am:
Manual merge
mysql-test/r/cast.result:
Manual merge
mysql-test/t/cast.test:
Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Manual merge
sql/ha_ndbcluster.cc:
Manual merge
sql/item.h:
Manual merge
sql/opt_sum.cc:
Manual merge
sql/sql_delete.cc:
Manual merge
sql/sql_lex.cc:
Manual merge
sql/sql_load.cc:
Manual merge
sql/sql_prepare.cc:
Manual merge
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index ee0353349ea..3be3ce80b71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,13 +109,18 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) test: cd mysql-test ; \ - ./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \ - ./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS) + ./mysql-test-run \ + --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ + --master_port=$(MYSQL_TEST_MASTER_PORT) \ + --slave_port=$(MYSQL_TEST_SLAVE_PORT) \ + --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \ + ./mysql-test-run --ps-protocol \ + --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ + --master_port=$(MYSQL_TEST_MASTER_PORT) \ + --slave_port=$(MYSQL_TEST_SLAVE_PORT) \ + --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) test-force: - cd mysql-test ; \ - ./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \ - ./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS) - -# Don't update the files from bitkeeper -%::SCCS/s.% + cd mysql-test; \ + ./mysql-test-run --force ;\ + ./mysql-test-run --ps-protocol --force |