diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-13 18:53:14 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-08-13 18:53:14 +0200 |
| commit | f772ed74d02ceb76d063e4f6c14de4c18c4b946c (patch) | |
| tree | 25eba4cc4256a4cb19915be40883fc84842b0084 /storage/connect/valblk.cpp | |
| parent | bce59293fb75d4a923ca42ff9ea38ef656a34765 (diff) | |
| download | mariadb-git-f772ed74d02ceb76d063e4f6c14de4c18c4b946c.tar.gz | |
- FIX MDEV-4853 + another bug causing the whole section to be deleted
when deleting one key of a INI table with layout=Row. The same happens
for layout=column but this is normal as one line is one section.
modified:
storage/connect/tabsys.cpp
- Should fix a valgrind warning in CHRBLK::GetValPtrEx
modified:
storage/connect/valblk.cpp
Diffstat (limited to 'storage/connect/valblk.cpp')
| -rw-r--r-- | storage/connect/valblk.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/valblk.cpp b/storage/connect/valblk.cpp index 7b52c598771..55f9da7571b 100644 --- a/storage/connect/valblk.cpp +++ b/storage/connect/valblk.cpp @@ -712,7 +712,7 @@ void *CHRBLK::GetValPtrEx(int n) // For VCT blocks we must remove rightmost blanks. char *p = Valp + Long; - for (p--; *p == ' ' && p >= Valp; p--) ; + for (p--; p >= Valp && *p == ' '; p--) ; *(++p) = '\0'; } // endif Blanks |