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/odbconn.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/odbconn.cpp')
| -rw-r--r-- | storage/connect/odbconn.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/odbconn.cpp b/storage/connect/odbconn.cpp index 105a5d262b4..a34413428f3 100644 --- a/storage/connect/odbconn.cpp +++ b/storage/connect/odbconn.cpp @@ -540,7 +540,7 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *tabpat, bool info) FLD_TYPE, FLD_REM}; static unsigned int length[] = {0, 0, 0, 16, 128}; int n, ncol = 5; - int maxres; + int maxres; PQRYRES qrp; CATPARM *cap; ODBConn *ocp = NULL; @@ -557,7 +557,7 @@ PQRYRES ODBCTables(PGLOBAL g, char *dsn, char *tabpat, bool info) if (ocp->Open(dsn, 2) < 1) // 2 is openReadOnly return NULL; - maxres = 512; // This is completely arbitrary + maxres = 16384; // This is completely arbitrary n = ocp->GetMaxValue(SQL_MAX_QUALIFIER_NAME_LEN); length[0] = (n) ? (n + 1) : 128; n = ocp->GetMaxValue(SQL_MAX_USER_NAME_LEN); @@ -2088,7 +2088,7 @@ int ODBConn::GetCatInfo(CATPARM *cap) if (m_RowsetSize == 1 && cap->Qrp->Maxres > 1) { pval = (PVAL *)PlugSubAlloc(m_G, NULL, n * sizeof(PVAL)); - vlen = (SQLLEN *)PlugSubAlloc(m_G, NULL, n * sizeof(SDWORD *)); + vlen = (SQLLEN *)PlugSubAlloc(m_G, NULL, n * sizeof(SQLLEN *)); } // endif // Now bind the column buffers |