summaryrefslogtreecommitdiff
path: root/sql/mysql_install_db.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-19 10:45:28 +0800
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-19 10:45:28 +0800
commita9846f329935faba560387bab8fd897102e17385 (patch)
tree2734986279de4dbea54be2dda25c994fd99498a8 /sql/mysql_install_db.cc
parent6d373e8b817861d3fd3cb181c02d45d2874d5a27 (diff)
parent589a1235b64866c7bbe85da2a6f6bf19ee8282fe (diff)
downloadmariadb-git-a9846f329935faba560387bab8fd897102e17385.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql/mysql_install_db.cc')
-rw-r--r--sql/mysql_install_db.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index 915db629f44..f8b94159a8f 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -188,7 +188,7 @@ int main(int argc, char **argv)
die("--datadir option not provided, and default datadir not found");
my_print_help(my_long_options);
}
- strncat_s(default_datadir, sizeof(default_datadir), "\\data", _TRUNCATE);
+ strcat_s(default_datadir, "\\data");
opt_datadir= default_datadir;
printf("Default data directory is %s\n",opt_datadir);
}