diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-16 01:32:47 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-16 01:32:47 +0100 |
| commit | e2804d9b74099b9ae2b9f012be881d04dd78a75a (patch) | |
| tree | 8e5aa2b7385605d0b82f23949b51e3119e8f262f /storage/connect/tabwmi.cpp | |
| parent | d8ac8d187d09303cb6fc0ee67216f8144ce5a053 (diff) | |
| download | mariadb-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/tabwmi.cpp')
| -rw-r--r-- | storage/connect/tabwmi.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabwmi.cpp b/storage/connect/tabwmi.cpp index 5fb349fa5c0..6d3d1609430 100644 --- a/storage/connect/tabwmi.cpp +++ b/storage/connect/tabwmi.cpp @@ -213,7 +213,7 @@ PQRYRES WMIColumns(PGLOBAL g, char *nsp, char *cls, bool info) qrp = PlgAllocResult(g, ncol, n, IDS_COLUMNS + 3, buftyp, fldtyp, length, false, true); - if (info) + if (info || !qrp) return qrp; /*********************************************************************/ |