diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-29 09:06:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-29 09:06:06 +0200 |
| commit | acf5b9490f9964abf95af4b94a8b3ba3fbd9a638 (patch) | |
| tree | f6ecc9b81bf485b6ce79abbead78cd46a8204802 /mysys | |
| parent | e9ad2183c306fe29432b68aac04132ebb16482cc (diff) | |
| parent | 81dd2cd096c08bd039738c594c2b06dd199de43f (diff) | |
| download | mariadb-git-acf5b9490f9964abf95af4b94a8b3ba3fbd9a638.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysys/default.c:
Auto merged
mysql-test/mysql-test-run.pl:
Merge backport
mysql-test/mysql-test-run.sh:
Merge backport
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
Diffstat (limited to 'mysys')
| -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 90f8dc5f689..540968d4ba0 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -755,7 +755,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--; |