summaryrefslogtreecommitdiff
path: root/storage/connect/plgdbutl.cpp
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-02-07 17:56:48 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-02-07 17:56:48 +0400
commitf8f79d933462e39b1039d0644dfc7697850501c7 (patch)
tree570473e4aaf79d092131a60e861e68c27a5d5500 /storage/connect/plgdbutl.cpp
parent40398f3660273a646eb974092a9ddf6f881d700e (diff)
downloadmariadb-git-f8f79d933462e39b1039d0644dfc7697850501c7.tar.gz
Fixing wrong sprintf() calls.
modified: storage/connect/filamap.cpp storage/connect/filamdbf.cpp storage/connect/filamfix.cpp storage/connect/filamtxt.cpp storage/connect/filamvct.cpp storage/connect/ha_connect.cc storage/connect/osutil.c storage/connect/plgdbutl.cpp storage/connect/plugutil.c storage/connect/tabfix.cpp storage/connect/tabxml.cpp storage/connect/user_connect.cc storage/connect/value.cpp storage/connect/xindex.cpp
Diffstat (limited to 'storage/connect/plgdbutl.cpp')
-rw-r--r--storage/connect/plgdbutl.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/connect/plgdbutl.cpp b/storage/connect/plgdbutl.cpp
index 6969b49cb81..e980926c820 100644
--- a/storage/connect/plgdbutl.cpp
+++ b/storage/connect/plgdbutl.cpp
@@ -164,7 +164,9 @@ global_open_error_msg(GLOBAL *g, int msgid, const char *path, const char *mode)
case MSGID_OPEN_ERROR_AND_STRERROR:
len= snprintf(g->Message, sizeof(g->Message) - 1,
- MSG(OPEN_ERROR) "%s",// "Open error %d in mode %d on %s: %s"
+ //OPEN_ERROR does not work, as it wants mode %d (not %s)
+ //MSG(OPEN_ERROR) "%s",// "Open error %d in mode %d on %s: %s"
+ "Open error %d in mode %s on %s: %s",
errno, mode, path, strerror(errno));
break;
@@ -1472,6 +1474,7 @@ DllExport void NewPointer(PTABS t, void *oldv, void *newv)
return;
if (!t->P1 || t->P1->Num == 50)
+ {
if (!(tp = new TABPTR)) {
PGLOBAL g = t->G;
@@ -1482,6 +1485,7 @@ DllExport void NewPointer(PTABS t, void *oldv, void *newv)
tp->Num = 0;
t->P1 = tp;
} /* endif tp */
+ }
t->P1->Old[t->P1->Num] = oldv;
t->P1->New[t->P1->Num++] = newv;