diff options
| author | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2006-05-30 16:07:49 +0300 |
|---|---|---|
| committer | jani@a193-229-222-105.elisa-laajakaista.fi <> | 2006-05-30 16:07:49 +0300 |
| commit | c81b4c01bf4d4b05633e66000115366dca2411e6 (patch) | |
| tree | 2c12e857ee11b7f222060e29da2c84e53eaf050b /mysys/default.c | |
| parent | 1edd2cf833b65368263d824e2b79ed9ac93e62e6 (diff) | |
| parent | d402c3d4a39658eb967ee65f49688a2db1d9b9b3 (diff) | |
| download | mariadb-git-c81b4c01bf4d4b05633e66000115366dca2411e6.tar.gz | |
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/default.c b/mysys/default.c index 3a80d7b37b9..863ebc37dbc 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -763,7 +763,9 @@ static int search_default_file_with_ext(Process_option_func opt_handler, value_end=value; /* remove quotes around argument */ - if ((*value == '\"' || *value == '\'') && *value == value_end[-1]) + if ((*value == '\"' || *value == '\'') && /* First char is quote */ + (value + 1 < value_end ) && /* String is longer than 1 */ + *value == value_end[-1] ) /* First char is equal to last char */ { value++; value_end--; |