database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch 'mysql/5.5' into 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2015-12-09 10:00:49 +01:00
parent 50a796dcba 40ae1b9b61
commit abf9d35213
37 changed files with 254 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libmysql/conf_to_src.c
View File

@ -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);