database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

Merge branch 'develop-1.1' into dev-merge-up-20180202

Browse Source
This commit is contained in:
Andrew Hutchings
2018-02-02 14:53:36 +00:00
parent 5eb3bbb3f6 c792188a5f
commit 0d7c0f7ae4
77 changed files with 1371 additions and 2547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/querystats/querystats.cpp
View File

@ -198,7 +198,7 @@ void QueryStats::insert()
ret = mysql.init(host.c_str(), port, user.c_str(), pwd.c_str(),
SCHEMA.c_str());
if (ret != 0)
if (ret != 0)
mysql.handleMySqlError(mysql.getError().c_str(), ret);
// escape quote characters
@ -267,12 +267,12 @@ uint32_t QueryStats::userPriority(string _host, const string _user)
ret = mysql.init(host.c_str(), port, user.c_str(), pwd.c_str(),
SCHEMA.c_str());
if (ret != 0)
if (ret != 0)
mysql.handleMySqlError(mysql.getError().c_str(), ret);
// get the part of host string befor ':' if there is.
size_t pos = _host.find(':', 0);
if (pos != string::npos)
_host = _host.substr(0, pos);
@ -288,18 +288,19 @@ uint32_t QueryStats::userPriority(string _host, const string _user)
<< "') and upper(a.priority) = upper(b.priority)";
ret = mysql.run(query.str().c_str());
if (ret != 0)
if (ret != 0)
mysql.handleMySqlError(mysql.getError().c_str(), ret);
char** rowIn;
rowIn = mysql.nextRow();
if(rowIn)
if (rowIn)
{
fPriority = rowIn[0];
fPriorityLevel = atoi(rowIn[1]);
}
return fPriorityLevel;
}