From ce1b9cb4ba8917af1f2d16b20ab69a46af8fc5e4 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Fri, 5 Jul 2013 13:13:45 +0200 Subject: - Try to fix a uninitialised valgrind warning modified: storage/connect/ha_connect.cc storage/connect/ha_connect.h storage/connect/mycat.cc - Fix a regression error on XML libdoc wrong Nlist freing modified: storage/connect/domdoc.h storage/connect/libdoc.cpp storage/connect/libdoc.h storage/connect/plgxml.h storage/connect/tabxml.cpp --- storage/connect/mycat.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'storage/connect/mycat.cc') diff --git a/storage/connect/mycat.cc b/storage/connect/mycat.cc index 3dd203949b6..fe93751d600 100644 --- a/storage/connect/mycat.cc +++ b/storage/connect/mycat.cc @@ -470,7 +470,7 @@ int MYCAT::GetColCatInfo(PGLOBAL g, PTABDEF defp) } // endswitch tc do { - field= Hc->GetColumnOption(field, pcf); + field= Hc->GetColumnOption(g, field, pcf); } while (field && (*pcf->Name =='*' /*|| pcf->Flags & U_VIRTUAL*/)); if (tc == TAB_DBF && pcf->Type == TYPE_DATE && !pcf->Datefmt) { -- cgit v1.2.1