diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-06 01:37:56 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-12-06 01:37:56 +0100 |
| commit | 1e1345c4514d2e41a58c2b7171abdb2de2f1fd61 (patch) | |
| tree | c2bd630652573c8a0192d28a3842e664cfc75e2b /storage/connect/tabodbc.cpp | |
| parent | 37611b2a324ff7e04df858ddfd3d6321ab40e76c (diff) | |
| download | mariadb-git-1e1345c4514d2e41a58c2b7171abdb2de2f1fd61.tar.gz | |
- Raise the limit on returned lines for table ODBC catalog tables
to 16384 (MDEV-5393)
modified:
storage/connect/odbconn.cpp
- Fix sorting catalog table result set (MDEV-5394)
added:
storage/connect/mysql-test/connect/r/xml_mdev5261.result
storage/connect/mysql-test/connect/t/xml_mdev5261.test
modified:
storage/connect/mysql-test/connect/r/odbc_sqlite3.result
storage/connect/mysql-test/connect/t/odbc_sqlite3.test
storage/connect/table.cpp
storage/connect/tabodbc.cpp
storage/connect/xtable.h
- Remove unnecessary closing of opened table in rnd_init
modified:
storage/connect/ha_connect.cc
Diffstat (limited to 'storage/connect/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index 10b730fd834..164049b5267 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -1083,7 +1083,7 @@ void ODBCCOL::AllocateBuffers(PGLOBAL g, int rows) } // endelse if (rows > 1) - StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(int)); + StrLen = (SQLLEN *)PlugSubAlloc(g, NULL, rows * sizeof(SQLLEN)); } // end of AllocateBuffers |