Skip to content

Commit

Permalink
Merge pull request #849 from project-hatohol/mysql-charset
Browse files Browse the repository at this point in the history
Load global my.cnf
  • Loading branch information
yoshfuji committed Dec 18, 2014
2 parents af539ca + 8d0435d commit 4596c19
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Expand Up @@ -23,6 +23,8 @@ matrix:
install:
- server/misc/setup-cutter.sh
- sudo apt-get install -qq -y autotools-dev libglib2.0-dev libjson-glib-dev libsoup2.4-dev libmysqlclient-dev sqlite3 ndoutils-nagios3-mysql uuid-dev npm python-pip expect python-dev libqpidmessaging2-dev libqpidtypes1-dev libqpidcommon2-dev qpidd librabbitmq-dev
- sudo sh -c "printf '[%s]\n%s=%s\n' mysqld character-set-server utf8 > /etc/mysql/conf.d/utf8.cnf"
- sudo sh -c "printf '[%s]\n%s=%s\n' client default-character-set utf8 >> /etc/mysql/conf.d/utf8.cnf"
- mysql -u root < data/test/setup.sql
- npm install -g mocha
- npm install -g expect.js
Expand Down
1 change: 1 addition & 0 deletions server/src/DBAgentMySQL.cc
Expand Up @@ -578,6 +578,7 @@ void DBAgentMySQL::connect(void)
const char *passwd = getCStringOrNullIfEmpty(m_impl->password);
const char *db = getCStringOrNullIfEmpty(m_impl->dbName);
mysql_init(&m_impl->mysql);
mysql_options(&m_impl->mysql, MYSQL_READ_DEFAULT_GROUP, "hatohol");
MYSQL *result = mysql_real_connect(&m_impl->mysql, host, user, passwd,
db, m_impl->port,
unixSocket, clientFlag);
Expand Down

0 comments on commit 4596c19

Please sign in to comment.