merge 5.5->5.6

gkodinov · gkodinov · commit 289c35a52c00 · 2013-06-28T17:16:25.000+03:00
diff --git a/mysys_ssl/my_getopt.cc b/mysys_ssl/my_getopt.cc
@@ -950,7 +950,7 @@ static int findopt(char *optpat, uint length,
                              "Using unique option prefix %.*s instead of %s "
                              "is deprecated and will be removed in a future "
                              "release. Please use the full name instead.",
-        length, optpat, *ffname);
+                             length, optpat, *ffname);
   return count;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ static int findopt(char *optpat, uint length,`
`950`	`950`	`"Using unique option prefix %.*s instead of %s "`
`951`	`951`	`"is deprecated and will be removed in a future "`
`952`	`952`	`"release. Please use the full name instead.",`
`953`		`- length, optpat, *ffname);`
	`953`	`+ length, optpat, *ffname);`
`954`	`954`	`return count;`
`955`	`955`	`}`
`956`	`956`