summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorjani@rhols221.adsl.netsonic.fi <>2003-09-17 21:08:40 +0300
committerjani@rhols221.adsl.netsonic.fi <>2003-09-17 21:08:40 +0300
commit6b2cf69dcaa31b17aeabc7f60516d09796f8ca01 (patch)
tree04cbf3c0a90390ce0333c738f5567325ecd34e17 /mysys
parentf13d9312a79f840ac990c903b91d72ac8805013e (diff)
downloadmariadb-git-6b2cf69dcaa31b17aeabc7f60516d09796f8ca01.tar.gz
Fixed a bug in default.c, which caused quoted arguments not
being read correctly from my.cnf.
Diffstat (limited to 'mysys')
-rw-r--r--mysys/default.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysys/default.c b/mysys/default.c
index d938bc4435f..0318efeb448 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -387,6 +387,8 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
*ptr++= '=';
for ( ; value != value_end; value++)
{
+ if (*value == '\"' || *value == '\'')
+ continue;
if (*value == '\\' && value != value_end-1)
{
switch(*++value) {
@@ -405,6 +407,12 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc,
case 's':
*ptr++= ' '; /* space */
break;
+ case '\"':
+ *ptr++= '\"';
+ break;
+ case '\'':
+ *ptr++= '\'';
+ break;
case '\\':
*ptr++= '\\';
break;