mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

portability.h:

Browse source 
Corrected OpenServer ifdef test
Makefile.am:
  Added test-pl and test-force-pl targets
This commit is contained in:
kent@mysql.com 2005-09-29 19:37:03 +02:00
commit 3b906e73d8
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Makefile.am
View file

@ -107,20 +107,26 @@ MYSQL_TEST_RUN_ARGS = --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:
cd mysql-test ; \
./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)
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol
test-force:
cd mysql-test; \
./mysql-test-run --force ;\
./mysql-test-run --ps-protocol --force
cd mysql-test ; \
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --force ; \
./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
test-pl:
cd mysql-test ; \
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol
test-force-pl:
cd mysql-test ; \
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --force ; \
./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) --ps-protocol --force
# Don't update the files from bitkeeper
%::SCCS/s.%

2
server-tools/instance-manager/portability.h
View file

@ -1,7 +1,7 @@
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
#if defined(__SCO_DS) && !defined(SHUT_RDWR)
#if defined(_SCO_DS) && !defined(SHUT_RDWR)
#define SHUT_RDWR 2
#endif