From f772ed74d02ceb76d063e4f6c14de4c18c4b946c Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Tue, 13 Aug 2013 18:53:14 +0200 Subject: - 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 --- storage/connect/valblk.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'storage/connect/valblk.cpp') 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 -- cgit v1.2.1