database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
This commit is contained in:
msvensson@pilot.blaudden
2007-04-18 18:40:44 +02:00
parent 00d80b5474 453b6180d0
commit eeaf1fa655
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/mysql_upgrade.c
View File

@@ -269,8 +269,8 @@ static void create_defaults_file(void)
Create the option that should be added to
tools in order to use this file
*/
snprintf(defaults_file_option, sizeof(defaults_file_option),
"--defaults-file=%s", defaults_file_path);
my_snprintf(defaults_file_option, sizeof(defaults_file_option),
"--defaults-file=%s", defaults_file_path);
DBUG_PRINT("info", ("defaults_file_option: %s", defaults_file_option));
DBUG_VOID_RETURN;
@@ -403,7 +403,7 @@ static void find_tool(char *tool_path, const char *tool_name)
/* 2. my_progname contains relative path, prepend wd */
char buf[FN_REFLEN];
my_getwd(buf, FN_REFLEN, MYF(0));
snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
}
else
{

2
client/mysqltest.c
View File

@@ -1339,7 +1339,7 @@ void var_set_string(const char* name, const char* value)
void var_set_int(const char* name, int value)
{
char buf[21];
snprintf(buf, sizeof(buf), "%d", value);
my_snprintf(buf, sizeof(buf), "%d", value);
var_set_string(name, buf);
}