Skip to content

Commit f1f48fc

Browse files
committed
Fix build by updating to mysql 5.7.14
1 parent 2864417 commit f1f48fc

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ install:
1212
# Needs a newer version of pip to do the pip installation line
1313
- pip install pip --upgrade
1414
- pip install .[test] nose
15-
cache: apt
15+
cache:
16+
apt: true
17+
pip: true
18+
directories:
19+
- $HOME/bins
1620
before_script:
1721
- env | grep DB
1822
- bash -c "if [ '$DB' = 'mysql57' ]; then sudo ./scripts/install_mysql_sandbox.sh; ./scripts/install_mysql57_on_sandbox.sh; fi"

pymysqlreplication/tests/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def setUp(self):
2727
"host": "localhost",
2828
"user": "root",
2929
"passwd": "msandbox",
30-
"port": 5712,
30+
"port": 5714,
3131
"use_unicode": True,
3232
"charset": "utf8",
3333
"db": "pymysqlreplication_test"

scripts/install_mysql57_on_sandbox.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@ mkdir $HOME/bins
44
mkdir $HOME/sandboxes
55

66
cd $HOME/bins
7-
curl -O http://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.12-linux-glibc2.5-x86_64.tar.gz
8-
tar xfz mysql-5.7.12-linux-glibc2.5-x86_64.tar.gz
9-
ln -s mysql-5.7.12-linux-glibc2.5-x86_64 5.7.12
7+
if [ ! -f "5.7.14" ]; then
8+
echo 'Downloading MySQL 5.7.14'
9+
curl -O http://cdn.mysql.com/Downloads/MySQL-5.7/mysql-5.7.14-linux-glibc2.5-x86_64.tar.gz
10+
tar xfz mysql-5.7.14-linux-glibc2.5-x86_64.tar.gz
11+
ln -s mysql-5.7.14-linux-glibc2.5-x86_64 5.7.14
12+
fi
1013

1114
export SANDBOX_BINARY=$HOME/bins
1215
export SANDBOX_HOME=$HOME/sandboxes
13-
make_sandbox 5.7.12 -- --no_confirm --no_run
16+
make_sandbox 5.7.14 -- --no_confirm --no_run
1417

15-
CNF=$SANDBOX_HOME/msb_5_7_12/my.sandbox.cnf
18+
CNF=$SANDBOX_HOME/msb_5_7_14/my.sandbox.cnf
1619

1720
echo 'log-bin=mysql-bin' | tee -a $CNF
1821
echo 'server-id=1' | tee -a $CNF
@@ -23,12 +26,11 @@ echo 'log_slave_updates' | tee -a $CNF
2326

2427
cat $CNF
2528

26-
$SANDBOX_HOME/msb_5_7_12/start
29+
$SANDBOX_HOME/msb_5_7_14/start
2730

28-
MYSQL=$SANDBOX_BINARY/5.7.12/bin/mysql
31+
MYSQL=$SANDBOX_BINARY/5.7.14/bin/mysql
2932
$MYSQL --version
3033
$MYSQL -e 'SELECT VERSION();'
3134
# $MYSQL -u root -e "GRANT ALL PRIVILEGES ON *.* TO ''@'localhost';"
3235
$MYSQL -e 'CREATE DATABASE pymysqlreplication_test;'
3336
$MYSQL -e 'show variables;'
34-

0 commit comments

Comments
 (0)