summaryrefslogtreecommitdiff
path: root/storage/connect/tabutil.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-07-25 19:09:46 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2013-07-25 19:09:46 +0200
commit1c5c2c6db99e383f2cc924267cbf00e6ff741fb5 (patch)
tree0484f6e0863a93967fc771fc415e22cfdc34dd57 /storage/connect/tabutil.cpp
parent319414398fd445af25c007be3c7502c87bf51d5c (diff)
downloadmariadb-git-1c5c2c6db99e383f2cc924267cbf00e6ff741fb5.tar.gz
- Fix a few test in TYPVAL<PSZ> that cause Valgrind warnings
modified: storage/connect/value.cpp - Ignore column comment field in TabColumns because its pointer is flagged as invalid by Valgrind (this is a bypass but not a real fix) modified: storage/connect/tabutil.cpp storage/connect/value.cpp
Diffstat (limited to 'storage/connect/tabutil.cpp')
-rw-r--r--storage/connect/tabutil.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp
index 6e5f6784d3a..6f1305f476c 100644
--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -226,8 +226,12 @@ PQRYRES TabColumns(PGLOBAL g, THD *thd, const char *db,
crp->Kdata->SetValue((fp->null_ptr != 0) ? 1 : 0, i);
crp = crp->Next; // Remark
- fld = fp->comment.str;
- crp->Kdata->SetValue(fld, fp->comment.length, i);
+
+ // For Valgrind until bug on comment storage is fixed
+// if (fp->comment.length > 0 && (fld = fp->comment.str))
+// crp->Kdata->SetValue(fld, fp->comment.length, i);
+// else
+ crp->Kdata->Reset(i);
crp = crp->Next; // New
crp->Kdata->SetValue((fmt) ? fmt : (char*) "", i);