diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-23 13:36:25 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-23 13:36:25 +0300 |
| commit | 58ec8f35f7a92005b1a06f8d071b56649ca43857 (patch) | |
| tree | b593284eb804b90e72044fd9fc3f716bab425789 /mysys | |
| parent | a86e11ef153433cf52886692c493e90784e10ee2 (diff) | |
| parent | f46ca5fbe905caa7efb3f3cafdbdcc7c0f83a2b0 (diff) | |
| download | mariadb-git-58ec8f35f7a92005b1a06f8d071b56649ca43857.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
extra/comp_err.c:
Auto merged
Diffstat (limited to 'mysys')
| -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; |