Skip to content

Don't set max_allowed_packets, as it is only allowed for root #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjoern-tantau wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Don't set max_allowed_packets, as it is only allowed for root #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d26ff7e
Add config to gitignore so that passwords are not saved in git.
bjoern-tantau Oct 6, 2016
11b52ec
Don't set max_allowed_packets, as it is only allowed for root.
bjoern-tantau Oct 6, 2016
ab9330d
Make PDO::MYSQL_ATTR_MAX_BUFFER_SIZE optional as it is not available …
bjoern-tantau Oct 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
odm/include/config.php

0 odm/include/config.php → odm/include/config.php.example
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions odm/include/db.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

function dbconnect() {
global $DB_HOST, $DB_USER, $DB_PASSWORD, $DB_DATABASE, $con;
$con = new PDO('mysql:dbname='.$DB_DATABASE.';host='.$DB_HOST.';charset=utf8', $DB_USER, $DB_PASSWORD, array(PDO::MYSQL_ATTR_MAX_BUFFER_SIZE=>1024*1024*50));
if (defined('PDO::MYSQL_ATTR_MAX_BUFFER_SIZE')) {
$con = new PDO('mysql:dbname='.$DB_DATABASE.';host='.$DB_HOST.';charset=utf8', $DB_USER, $DB_PASSWORD, array(PDO::MYSQL_ATTR_MAX_BUFFER_SIZE=>1024*1024*50));
} else {
$con = new PDO('mysql:dbname='.$DB_DATABASE.';host='.$DB_HOST.';charset=utf8', $DB_USER, $DB_PASSWORD);
}
$con->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
$con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
}
Expand Down Expand Up @@ -51,8 +55,6 @@ function storeMessage($message, $gcm_regid, $data) {

function storeFile($id, $handle) {
global $con;
$stmt = $con->prepare("SET GLOBAL max_allowed_packet = 524288000"); // 500MB
$stmt->execute();
$stmt = $con->prepare("INSERT INTO gcm_data(id, data) VALUES(?, ?)");
$stmt->bindParam(1, $id);
$stmt->bindParam(2, $handle, PDO::PARAM_LOB);
Expand All @@ -61,8 +63,6 @@ function storeFile($id, $handle) {

function storeData($id, $data) {
global $con;
$stmt = $con->prepare("SET GLOBAL max_allowed_packet = 524288000"); // 500MB
$stmt->execute();
$stmt = $con->prepare("INSERT INTO gcm_data(id, data) VALUES(?, ?)");
$stmt->execute(array($id, $data));
}
Expand Down