diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2017-01-16 15:13:40 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2017-01-16 15:13:40 +0100 |
| commit | 707cd98592fc13d40ee750097993a85fae93245c (patch) | |
| tree | 5e958eb3b131fefe9ffa996531ca335e04b27d33 /storage/connect/tabxml.cpp | |
| parent | df21d45fddcde1f1b00d00a17024d5d7e5d19b5d (diff) | |
| download | mariadb-git-707cd98592fc13d40ee750097993a85fae93245c.tar.gz | |
Fix info cardinality for catalog tables.
Was returning 0, which caused an assert error when retreiving records.
modified: storage/connect/connect.cc
modified: storage/connect/xtable.h
Add the create and insert possibility to zipped tables
modified: storage/connect/domdoc.cpp
modified: storage/connect/domdoc.h
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.h
modified: storage/connect/ha_connect.c
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plgxml.cpp
modified: storage/connect/plgxml.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabfmt.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabzip.cpp
modified: storage/connect/tabzip.h
Fix skipping header record for mulentries zipped CSV tabled
modified: storage/connect/filamap.cpp
Accept M (memo) column type for DBF tables
Fix miscalculation of Blksize when LRECL was replaced by DBF LRECL
modified: storage/connect/filamdbf.cpp
Change the names of GZ compress classes (not to be confused with ZIP)
modified: storage/connect/filamgz.cpp
modified: storage/connect/filamgz.h
add trace in PlugSetPath
modified: storage/connect/plugutil.c
Add tests fir ZIP
added: storage/connect/mysql-test/connect/r/xml_zip.result
added: storage/connect/mysql-test/connect/r/zip.result
added: storage/connect/mysql-test/connect/std_data/bios.json
added: storage/connect/mysql-test/connect/std_data/xsample2.xml
added: storage/connect/mysql-test/connect/t/have_zip.inc
added: storage/connect/mysql-test/connect/t/xml_zip.test
added: storage/connect/mysql-test/connect/t/zip.test
Diffstat (limited to 'storage/connect/tabxml.cpp')
| -rw-r--r-- | storage/connect/tabxml.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp index 3b8229fcf51..aa9b612feac 100644 --- a/storage/connect/tabxml.cpp +++ b/storage/connect/tabxml.cpp @@ -537,6 +537,11 @@ PTDB XMLDEF::GetTable(PGLOBAL g, MODE m) if (Catfunc == FNC_COL) return new(g) TDBXCT(this); + if (Zipped && !(m == MODE_READ || m == MODE_ANY)) { + strcpy(g->Message, "ZIpped XML tables are read only"); + return NULL; + } // endif Zipped + PTDBASE tdbp = new(g) TDBXML(this); if (Multiple) |