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.

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

Bug#25604587 BACKPORT BUG#24947217 TO 5.6 AND 5.7 #1692

Merged
merged 2 commits into from
May 4, 2017

Conversation

laurynas-biveinis
Copy link
Contributor

Change is needed in MySQL 5.6 and 5.7 as well.

In the 5.5 backport, replace std::string with a DYNAMIC_STRING.

(cherry picked from commit 6f8e0f1)

http://jenkins.percona.com/job/percona-server-5.5-param/1550/

Change is needed in MySQL 5.6 and 5.7 as well.

In the 5.5 backport, replace std::string with a DYNAMIC_STRING.

(cherry picked from commit 6f8e0f1)
str_to_file(temp_file_path, ds_script.str, ds_script.length);
/* Compatibility for Perl 5.24 and newer. */
static DYNAMIC_STRING script;
init_dynamic_string(&script, "push @INC, \".\";\n", 1024, 1024);
Copy link
Contributor

@robgolebiowski robgolebiowski May 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it not be better to move push @inc, "." to ds_stript initialization, i.e. init_dynamic_string(&ds_script, "", 1024, 1024); and abandon script variable ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure control flow actually lets do that, there is " command->content= ds_script;
" above

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack

Copy link
Contributor

@robgolebiowski robgolebiowski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@laurynas-biveinis laurynas-biveinis merged commit 11f5bbd into percona:5.5 May 4, 2017
@laurynas-biveinis laurynas-biveinis deleted the bug1688161-5.5 branch May 4, 2017 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants