Merge branch 'mysql-5.6' into mysql-5.7

harinvadodaria · harinvadodaria · commit d24a51ed8c46 · 2016-10-28T12:23:00.000+05:30
diff --git a/plugin/connection_control/connection_delay.cc b/plugin/connection_control/connection_delay.cc
@@ -849,7 +849,7 @@ namespace connection_control
           char buff[1024];
           String *res;
           String filter(buff, sizeof(buff), system_charset_info);
-          if (eq_func->arguments()[2] != NULL &&
+          if (eq_func->arguments()[1] != NULL &&
             (res= eq_func->arguments()[1]->val_str(&filter)))
           {
             eq_arg->append(res->c_ptr_safe(), res->length());

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ namespace connection_control`
`849`	`849`	`char buff[1024];`
`850`	`850`	`String *res;`
`851`	`851`	`String filter(buff, sizeof(buff), system_charset_info);`
`852`		`- if (eq_func->arguments()[2] != NULL &&`
	`852`	`+ if (eq_func->arguments()[1] != NULL &&`
`853`	`853`	`(res= eq_func->arguments()[1]->val_str(&filter)))`
`854`	`854`	`{`
`855`	`855`	`eq_arg->append(res->c_ptr_safe(), res->length());`