Merge branch '10.0-galera' into 10.1

This commit is contained in:
Nirbhay Choubey
2015-07-14 16:05:29 -04:00
parent 75931feabe
commit dced5146bd
399 changed files with 14892 additions and 1525 deletions

View File

@ -42,7 +42,7 @@ static void make_ftype(char * to,int flag);
FILE *my_fopen(const char *filename, int flags, myf MyFlags)
{
FILE *fd;
char type[5];
char type[10];
DBUG_ENTER("my_fopen");
DBUG_PRINT("my",("Name: '%s' flags: %d MyFlags: %lu",
filename, flags, MyFlags));
@ -350,9 +350,11 @@ static void make_ftype(register char * to, register int flag)
else
*to++= 'r';
#if FILE_BINARY /* If we have binary-files */
if (flag & FILE_BINARY)
*to++='b';
#endif
if (O_CLOEXEC)
*to++= 'e';
*to='\0';
} /* make_ftype */