Skip to content

Commit f5a0848

Browse files
bgraingerbgrainger
committed
Merge master into netstandard2.0.
Conflicts: .travis.yml src/MySqlConnector/MySqlConnector.csproj tests/SideBySide/CancelTests.cs
2 parents 6e4eb0a + dd9971e commit f5a0848

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+754
-334
lines changed

‎.ci/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
/mysqld
2-
1+
/run

‎.ci/config/config.buffer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true;BufferResultSets=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.compression+ssl.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;use compression=true;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.compression.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;UseCompression=true;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.ssl.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;certificate file=../../../../../.ci/server/certs/ssl-client.pfx;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.uds+ssl.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/config/config.uds.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=mysqltest;password='test;key=\"val';database=mysqltest;ssl mode=none;Use Affected Rows=true",
3+
"ConnectionString": "server=./../../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password='test;key=\"val';database=mysqltest;ssl mode=none;Use Affected Rows=true",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
6-
"SupportsCachedProcedures": true,
7-
"SupportsJson": true,
6+
"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
87
"MySqlBulkLoaderLocalCsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.CSV",
98
"MySqlBulkLoaderLocalTsvFile": "%TESTDATA%/LoadData_UTF8_BOM_Unix.TSV"
109
}

‎.ci/docker-run-mysql.sh

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.ci/docker-run.sh

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#!/bin/bash
2+
cd $(dirname $0)
3+
4+
display_usage() {
5+
echo -e "\nUsage:\n$0 [image] [name] [port] [features]\n"
6+
}
7+
8+
# check whether user had supplied -h or --help . If yes display usage
9+
if [[ ( $# == "--help") || $# == "-h" ]]
10+
then
11+
display_usage
12+
exit 0
13+
fi
14+
15+
# check number of arguments
16+
if [ $# -ne 4 ]
17+
then
18+
display_usage
19+
exit 1
20+
fi
21+
22+
IMAGE=$1
23+
NAME=$2
24+
PORT=$3
25+
FEATURES=$4
26+
27+
sudo mkdir -p run/$NAME
28+
sudo chmod 777 run/$NAME
29+
30+
docker run -d \
31+
-v $(pwd)/run/$NAME:/var/run/mysqld:rw \
32+
-v $(pwd)/server:/etc/mysql/conf.d:ro \
33+
-p $PORT:3306 \
34+
--name $NAME \
35+
-e MYSQL_ROOT_PASSWORD='test' \
36+
$IMAGE
37+
38+
for i in `seq 1 30`; do
39+
# wait for mysql to come up
40+
sleep 1
41+
# try running the init script
42+
docker exec -it $NAME bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init.sql' >/dev/null 2>&1
43+
if [ $? -ne 0 ]; then continue; fi
44+
if [[ $FEATURES == *"Sha256Password"* ]]; then
45+
docker exec -it $NAME bash -c 'mysql -uroot -ptest < /etc/mysql/conf.d/init_sha256.sql' >/dev/null 2>&1
46+
if [ $? -ne 0 ]; then continue; fi
47+
fi
48+
49+
# exit if successful
50+
docker exec -it $NAME mysql -ussltest -ptest \
51+
--ssl-mode=REQUIRED \
52+
--ssl-ca=/etc/mysql/conf.d/certs/ssl-ca-cert.pem \
53+
--ssl-cert=/etc/mysql/conf.d/certs/ssl-client-cert.pem \
54+
--ssl-key=/etc/mysql/conf.d/certs/ssl-client-key.pem \
55+
-e "SELECT 1"
56+
if [ $? -ne 0 ]; then
57+
# mariadb uses --ssl=TRUE instead of --ssl-mode=REQUIRED
58+
docker exec -it $NAME mysql -ussltest -ptest \
59+
--ssl=TRUE \
60+
--ssl-ca=/etc/mysql/conf.d/certs/ssl-ca-cert.pem \
61+
--ssl-cert=/etc/mysql/conf.d/certs/ssl-client-cert.pem \
62+
--ssl-key=/etc/mysql/conf.d/certs/ssl-client-key.pem \
63+
-e "SELECT 1"
64+
if [ $? -ne 0 ]; then
65+
>&2 echo "Problem with SSL"
66+
exit 1
67+
fi
68+
fi
69+
echo "Ran Init Script"
70+
exit 0
71+
done
72+
73+
# init script did not run
74+
>&2 echo "Unable to Run Init Script"
75+
exit 1

0 commit comments

Comments
 (0)