Skip to content

Commit adcd450

Browse files
committed
Merge branch 'v1.9'
2 parents deead96 + 5d3e616 commit adcd450

File tree

7 files changed

+3
-10
lines changed

7 files changed

+3
-10
lines changed

.evergreen/compile-unix.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
# Supported/used environment variables:

.evergreen/compile-windows.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#!/bin/sh
22
set -o igncr # Ignore CR in this script
3-
set -o xtrace # Write all commands first to stderr
43
set -o errexit # Exit the script with error if any of the commands fail
54

65
# Supported/used environment variables:

.evergreen/compile.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54

.evergreen/config.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ functions:
101101
102102
PREPARE_SHELL: |
103103
set -o errexit
104-
set -o xtrace
105104
export DRIVERS_TOOLS="$DRIVERS_TOOLS"
106105
export MONGO_ORCHESTRATION_HOME="$MONGO_ORCHESTRATION_HOME"
107106
export PROJECT_ORCHESTRATION_HOME="$PROJECT_ORCHESTRATION_HOME"
@@ -176,7 +175,7 @@ functions:
176175
- command: shell.exec
177176
params:
178177
continue_on_err: true
179-
script: "set -o xtrace && rm -rf ${PROJECT_DIRECTORY}"
178+
script: "rm -rf ${PROJECT_DIRECTORY}"
180179
- command: s3.get
181180
params:
182181
aws_key: ${aws_key}
@@ -188,7 +187,7 @@ functions:
188187
params:
189188
continue_on_err: true
190189
# EVG-1105: Use s3.get extract_to: ./
191-
script: "set -o xtrace && cd .. && rm -rf ${PROJECT_DIRECTORY} && mkdir ${PROJECT_DIRECTORY}/ && tar xf build.tar.gz -C ${PROJECT_DIRECTORY}/"
190+
script: "cd .. && rm -rf ${PROJECT_DIRECTORY} && mkdir ${PROJECT_DIRECTORY}/ && tar xf build.tar.gz -C ${PROJECT_DIRECTORY}/"
192191

193192
"exec compile script" :
194193
- command: shell.exec
@@ -473,7 +472,6 @@ tasks:
473472
type: test
474473
params:
475474
script: |
476-
set -o xtrace
477475
. ${DRIVERS_TOOLS}/.evergreen/download-mongodb.sh || true
478476
get_distro || true
479477
echo $DISTRO

.evergreen/run-ocsp-responder.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
# Fail on any command returning a non-zero exit status.
2626
set -o errexit
27-
set -o xtrace
2827

2928
USE_DELEGATE=${USE_DELEGATE:-OFF}
3029

.evergreen/run-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/bin/sh
2-
set -o xtrace # Write all commands first to stderr
32
set -o errexit # Exit the script with error if any of the commands fail
43

54
# Supported/used environment variables:

src/MongoDB/Manager.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ ZEND_BEGIN_ARG_INFO_EX(ai_Manager_executeBulkWrite, 0, 0, 2)
816816
ZEND_END_ARG_INFO()
817817

818818
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_selectServer, 0, 0, 1)
819-
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
819+
ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 0)
820820
ZEND_END_ARG_INFO()
821821

822822
ZEND_BEGIN_ARG_INFO_EX(ai_Manager_startSession, 0, 0, 0)

0 commit comments

Comments
 (0)