~mysql/mysql-server/5.7

« back to all changes in this revision

Viewing changes to mysys_ssl/my_default.cc

Merge from mysql-5.6 to mysql-trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
158
158
                                        const char *dir, const char *ext,
159
159
                                        const char *config_file, int recursion_level);
160
160
static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file);
161
 
static int check_file_permissions(const char *file_name);
162
161
 
163
162
 
164
163
/**
1468
1467
           1 - Failed to stat.
1469
1468
           2 - Success.
1470
1469
*/
1471
 
static int check_file_permissions(const char *file_name)
 
1470
int check_file_permissions(const char *file_name)
1472
1471
{
1473
1472
#if !defined(_WIN32)
1474
1473
  MY_STAT stat_info;