Skip to content

Commit

Permalink
Revert "store result to make blobs available", closes #60, closes #61.…
Browse files Browse the repository at this point in the history
… This reverts commit 66d500e.

- Avoid storing all results on the client due to instability with large datasets (#60, #61).
  • Loading branch information
krlmlr committed Sep 30, 2017
1 parent f3ffe86 commit 53e571d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
13 changes: 0 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ env:

matrix:
include:
- os: linux
dist: trusty
sudo: false
service: mysql
addons:
apt:
packages:
- libmariadbclient-dev
- os: linux
dist: trusty
sudo: false
Expand All @@ -25,11 +17,6 @@ matrix:
apt:
packages:
- libmysqlclient-dev
- os: osx
osx_image: xcode8.3
before_install:
- brew install mariadb
- mysql.server start
- os: osx
osx_image: xcode8.3
before_install:
Expand Down
11 changes: 6 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ PKG_LIBS="-lmysqlclient"
PKG_LIBS_STATIC="-lmysqlclient -lssl -lcrypto -lz"

# Use mysql_config (on Solaris /opt/csw/bin must be in PATH)
if [ $(command -v mariadb_config) ]; then
echo "Using mariadb_config"
PKGCONFIG_CFLAGS=$(mariadb_config --cflags)
PKGCONFIG_LIBS=$(mariadb_config --libs)
elif [ $(command -v mysql_config) ]; then
if [ $(command -v mysql_config) ]; then
echo "Using mysql_config"
PKGCONFIG_CFLAGS=$(mysql_config --cflags)
PKGCONFIG_LIBS=$(mysql_config --libs)
elif [ $(command -v mariadb_config) ]; then
echo "Using mariadb_config"
echo "WARNING: Connector versions prior to 2.3.4/3.0.3 have a known problem with retrieving string and blob data. See https://github.com/rstats-db/RMariaDB/issues/53 for details."
PKGCONFIG_CFLAGS=$(mariadb_config --cflags)
PKGCONFIG_LIBS=$(mariadb_config --libs)
fi

# Note that cflags may be empty in case of success
Expand Down
6 changes: 1 addition & 5 deletions src/MariaResult.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ void MariaResult::execute() {

if (mysql_stmt_execute(pStatement_) != 0)
throw_error();
if (has_result()) {
// This is necessary for Connector/C, otherwise blobs and strings are unavailable
mysql_stmt_store_result(pStatement_);
}
else {
if (!has_result()) {
rowsAffected_ += mysql_stmt_affected_rows(pStatement_);
}
}
Expand Down

0 comments on commit 53e571d

Please sign in to comment.