summaryrefslogtreecommitdiff
path: root/storage/connect/value.cpp
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2013-12-16 01:32:47 +0100
committerOlivier Bertrand <bertrandop@gmail.com>2013-12-16 01:32:47 +0100
commite2804d9b74099b9ae2b9f012be881d04dd78a75a (patch)
tree8e5aa2b7385605d0b82f23949b51e3119e8f262f /storage/connect/value.cpp
parentd8ac8d187d09303cb6fc0ee67216f8144ce5a053 (diff)
downloadmariadb-git-e2804d9b74099b9ae2b9f012be881d04dd78a75a.tar.gz
- Fix MDEV-5393 and MDEV-5434. It is a major update of ODBC catalog tables
processing that takes care of: - Drastically reduce the amount of storge needed to process them. - Handle longjmp's. - Makes the line limit an opion (MAXRES) - Schema can also be specified with the DBNAME option. - Issue warnings on fetch errors or when result lines have been limited. - Change some column names to reflect ODBC version 3 standard. The documentation have been updated accordingly modified: storage/connect/filamdbf.cpp storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/mysql-test/connect/r/odbc.result storage/connect/mysql-test/connect/r/odbc_postgresql.result storage/connect/mysql-test/connect/r/odbc_sqlite3.result storage/connect/mysql-test/connect/r/odbc_xls.result storage/connect/mysql-test/connect/r/xml.result storage/connect/mysql-test/connect/t/odbc_postgresql.test storage/connect/odbccat.h storage/connect/odbconn.cpp storage/connect/odbconn.h storage/connect/plgdbsem.h storage/connect/plgdbutl.cpp storage/connect/rcmsg.c storage/connect/tabfmt.cpp storage/connect/table.cpp storage/connect/tabodbc.cpp storage/connect/tabodbc.h storage/connect/tabutil.cpp storage/connect/tabwmi.cpp storage/connect/user_connect.cc storage/connect/valblk.cpp storage/connect/valblk.h storage/connect/value.cpp
Diffstat (limited to 'storage/connect/value.cpp')
-rw-r--r--storage/connect/value.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/connect/value.cpp b/storage/connect/value.cpp
index 2522fa178cd..8857608015e 100644
--- a/storage/connect/value.cpp
+++ b/storage/connect/value.cpp
@@ -1129,7 +1129,8 @@ void TYPVAL<PSZ>::SetValue_psz(PSZ s)
/***********************************************************************/
void TYPVAL<PSZ>::SetValue_pvblk(PVBLK blk, int n)
{
- strncpy(Strp, blk->GetCharValue(n), Len);
+ // STRBLK's can return a NULL pointer
+ SetValue_psz(blk->GetCharValue(n));
} // end of SetValue_pvblk
/***********************************************************************/