summaryrefslogtreecommitdiff
path: root/storage/connect/filamtxt.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-11-08 13:35:03 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2014-11-08 13:35:03 +0100
commitbd4814328c0de8bec2d17f8f1f776e18115dd567 (patch)
treee7431c43384a7a335cec6cfa8dcc83343c081177 /storage/connect/filamtxt.cpp
parent1f9259dfea44fb2605b919d6b3b7ea9f151ed5ed (diff)
downloadmariadb-git-bd4814328c0de8bec2d17f8f1f776e18115dd567.tar.gz
- Calculate next position in filamap without assuming ENDING option is true.
modified: storage/connect/filamap.cpp - ftell error: indicate in the error msg that is can be due to wrong ENDING value. filamtxt.cpp (MDEV-7030) modified: storage/connect/filamtxt.cpp - Change STRING according to Alexander Barkov remarks. Suppress the wrong Strz function. The unconditional function strz is no more used for s->db and s->table_name because they are zero terminated. modified: storage/connect/ha_connect.cc storage/connect/xobject.cpp - Change version number modified: storage/connect/filamap.cpp - Change PATH_MAX to FN_REFLEN (MDEV-7036) modified: storage/connect/os.h storage/connect/tabmul.cpp - Fix bug by adding a void argument for OP_NOT in Makefilter. modified: storage/connect/filter.cpp - Begin implementing XMSG style Two new system variables are defined: msg_lang ENUM session errmsg_dir_path STR global readonly This is a work in progress. modified: storage/connect/ha_connect.cc storage/connect/plgdbutl.cpp storage/connect/plugutil.c storage/connect/rcmsg.c storage/connect/resource.h
Diffstat (limited to 'storage/connect/filamtxt.cpp')
-rw-r--r--storage/connect/filamtxt.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp
index ffe4c92d251..a1bcc464e06 100644
--- a/storage/connect/filamtxt.cpp
+++ b/storage/connect/filamtxt.cpp
@@ -683,6 +683,7 @@ bool DOSFAM::RecordPos(PGLOBAL g)
{
if ((Fpos = ftell(Stream)) < 0) {
sprintf(g->Message, MSG(FTELL_ERROR), 0, strerror(errno));
+ strcat(g->Message, " (possible wrong ENDING option value)");
return true;
} // endif Fpos