Skip to content
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

Jump to bottom

Remove any trailing spaces and semicolons from the SET statement #4385

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Remove any trailing spaces and semicolons from the SET statement #4385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09eb50a
Remove any trailing spaces and semicolons from the SET statement
rahim-kanji Nov 21, 2023
786be5f
Updated TAP test
rahim-kanji Nov 27, 2023
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 lib/MySQL_Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6032,6 +6032,8 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
string nq=string((char *)CurrentQuery.QueryPointer,CurrentQuery.QueryLength);
RE2::GlobalReplace(&nq,(char *)"^/\\*!\\d\\d\\d\\d\\d SET(.*)\\*/",(char *)"SET\\1");
RE2::GlobalReplace(&nq,(char *)"(?U)/\\*.*\\*/",(char *)"");
// remove trailing space and semicolon if present. See issue#4380
nq.erase(nq.find_last_not_of(" ;") + 1);
/*
// we do not threat SET SQL_LOG_BIN as a special case
if (match_regexes && match_regexes[0]->match(dig)) {
Expand Down
24 changes: 24 additions & 0 deletions test/tap/tests/set_testing-240-t.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,29 @@ class var_counter {
}
};

// Generate string containing randomly chosen characters between
// ';' and ' ', with length between 1 and 8
std::string generate_random_noise() {
// Seed the random number generator with the current time
std::srand(static_cast<unsigned int>(std::time(nullptr)));

static const char characters[] = { ';', ' ' };
static const int numCharacters = sizeof(characters) / sizeof(char);

// max lengh of string is 8
const int length = std::rand() % 8 + 1;

std::string randomString;
randomString.reserve(length);

for (int i = 0; i < length; ++i) {
char randomChar = characters[std::rand() % numCharacters];
randomString.push_back(randomChar);
}

return randomString;
}

//std::unordered_map<std::string,int> unknown_var_counters;

std::unordered_map<std::string,var_counter> vars_counters;
Expand Down Expand Up @@ -160,6 +183,7 @@ void * my_conn_thread(void *arg) {
diag("Thread_id: %lu, random number: %d . Query/ies: %s", mysql->thread_id, r2, testCases[r2].command.c_str());
std::vector<std::string> commands = split(testCases[r2].command.c_str(), ';');
for (auto c : commands) {
c += generate_random_noise();
if (mysql_query(mysql, c.c_str())) {
if (silent==0) {
fprintf(stderr,"ERROR while running -- \"%s\" : (%d) %s\n", c.c_str(), mysql_errno(mysql), mysql_error(mysql));
Expand Down
Loading