diff options
| author | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-09-17 21:08:40 +0300 |
|---|---|---|
| committer | unknown <jani@rhols221.adsl.netsonic.fi> | 2003-09-17 21:08:40 +0300 |
| commit | b60a71c6003a8aaeeb141cfae82649e080810c24 (patch) | |
| tree | 04cbf3c0a90390ce0333c738f5567325ecd34e17 /mysys/default.c | |
| parent | d8fd2ad9a1c14692dab5988a0518f6b4da38a850 (diff) | |
| download | mariadb-git-b60a71c6003a8aaeeb141cfae82649e080810c24.tar.gz | |
Fixed a bug in default.c, which caused quoted arguments not
being read correctly from my.cnf.
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 8 |
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; |