summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorAtanu Ghosh <atanu.ghosh@oracle.com>2013-11-14 14:27:31 +0530
committerAtanu Ghosh <atanu.ghosh@oracle.com>2013-11-14 14:27:31 +0530
commit0c2030e2500c4144ad18c160fb22488a340eca36 (patch)
tree58f9e10343181187a760bc5fca469157881973a6 /sql/mysqld.cc
parent2577662c7ad00cfa9362f735063f04910c04cfb5 (diff)
downloadmariadb-git-0c2030e2500c4144ad18c160fb22488a340eca36.tar.gz
Bug #17049656 : MYSQLD --LOCAL-SERVICE PARAMETER DOES NOT WORK
Problem: The "--local-install" service does not perform as expected for, at least, Windows. Fix: A NULL pointer was dereferenced due to which there was crash.A check was introduced for NULL string before dereferencing it.No test cases written as it is a bug during installation.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 145e2220d38..bb5ceba9253 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4786,7 +4786,7 @@ default_service_handling(char **argv,
/* We have to quote filename if it contains spaces */
pos= add_quoted_string(path_and_service, file_path, end);
- if (*extra_opt)
+ if (extra_opt && *extra_opt)
{
/*
Add option after file_path. There will be zero or one extra option. It's