Merge branch 'mysql-5.6' into mysql-5.7

Author: harinvadodaria

libmysql/conf_to_src.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -118,7 +118,7 @@ print_arrays_for(char *set)
 {
   FILE *f;
 
-  sprintf(buf, "%s.conf", set);
+  snprintf(buf, sizeof(buf), "%s.conf", set);
 
   if ((f = fopen(buf, "r")) == NULL) {
     fprintf(stderr, "%s: can't read conf file for charset %s\n", prog, set);

regex/main.c

@@ -26,6 +26,7 @@ extern void regprint(my_regex_t *r, FILE *d);
 
 
 #ifdef _WIN32
+#define snprintf _snprintf
 char *optarg= "";
 int optind= 1;
 int opterr;
@@ -501,7 +502,8 @@ char *should;
 				(sub.rm_so != -1 && sub.rm_eo == -1) ||
 				(sub.rm_so != -1 && sub.rm_so < 0) ||
 				(sub.rm_eo != -1 && sub.rm_eo < 0) ) {
-		sprintf(grump, "start %ld end %ld", (long)sub.rm_so,
+		snprintf(grump, sizeof(grump),
+			 "start %ld end %ld", (long)sub.rm_so,
 							(long)sub.rm_eo);
 		return(grump);
 	}
@@ -514,7 +516,8 @@ char *should;
 
 	/* check for in range */
 	if ((int) sub.rm_eo > (int) strlen(str)) {
-		sprintf(grump, "start %ld end %ld, past end of string",
+		snprintf(grump, sizeof(grump),
+			 "start %ld end %ld, past end of string",
 					(long)sub.rm_so, (long)sub.rm_eo);
 		return(grump);
 	}
@@ -525,13 +528,13 @@ char *should;
 
 	/* check for not supposed to match */
 	if (should == NULL) {
-          sprintf(grump, "matched `%.*s'", (int)len, p);
+          snprintf(grump, sizeof(grump), "matched `%.*s'", (int)len, p);
 		return(grump);
 	}
 
 	/* check for wrong match */
 	if (len != shlen || strncmp(p, should, shlen) != 0) {
-          sprintf(grump, "matched `%.*s' instead", (int)len, p);
+          snprintf(grump, sizeof(grump), "matched `%.*s' instead", (int)len, p);
 		return(grump);
 	}
 	if (shlen > 0)
@@ -544,7 +547,8 @@ char *should;
 	if (shlen == 0)
 		shlen = 1;	/* force check for end-of-string */
 	if (strncmp(p, at, shlen) != 0) {
-		sprintf(grump, "matched null at `%.20s'", p);
+		snprintf(grump, sizeof(grump),
+			 "matched null at `%.20s'", p);
 		return(grump);
 	}
 	return(NULL);
@@ -577,7 +581,7 @@ char *name;
 	static char efbuf[100];
 	my_regex_t re;
 
-	sprintf(efbuf, "MY_REG_%s", name);
+	snprintf(efbuf, sizeof(efbuf), "MY_REG_%s", name);
 	assert(strlen(efbuf) < sizeof(efbuf));
 	re.re_endp = efbuf;
 	(void) my_regerror(MY_REG_ATOI, &re, efbuf, sizeof(efbuf));