1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

- Fix tabpivot compile errors on Linux.

- Fix Tabpivot not closing the source table.
- Fix pivot.test error on Linux by specifying ENDING=2 for the expenses table.

modified:
  storage/connect/mysql-test/connect/r/pivot.result
  storage/connect/mysql-test/connect/t/pivot.test
  storage/connect/tabpivot.cpp
  storage/connect/tabpivot.h
This commit is contained in:
Olivier Bertrand
2013-05-11 17:00:36 +02:00
parent 5657660ab0
commit 44cb1ce8a2
4 changed files with 7 additions and 7 deletions

View File

@@ -876,7 +876,7 @@ int TDBPIVOT::DeleteDB(PGLOBAL g, int irc)
/***********************************************************************/
void TDBPIVOT::CloseDB(PGLOBAL g)
{
//Tdbp->CloseDB(g);
Tdbp->CloseDB(g);
} // end of CloseDB
#if 0
@@ -1242,8 +1242,8 @@ QRSCOL::QRSCOL(PGLOBAL g, PCOLRES crp, PTDB tdbp, PCOL cprec, int i)
Long = Crp->Clen;
Buf_Type = crp->Type;
strcpy(Format.Type, GetFormatType(Buf_Type));
Format.Length = (SHORT)Long;
Format.Prec = (SHORT)Crp->Prec;
Format.Length = (short)Long;
Format.Prec = (short)Crp->Prec;
if (trace) {
htrc("Making new QRSCOL C%d %s at %p\n", Index, Name, this);
@@ -1284,7 +1284,7 @@ void QRSCOL::ReadColumn(PGLOBAL g)
/***********************************************************************/
/* Make file output of a Dos column descriptor block. */
/***********************************************************************/
void QRSCOL::Print(PGLOBAL g, FILE *f, UINT n)
void QRSCOL::Print(PGLOBAL g, FILE *f, uint n)
{
COLBLK::Print(g, f, n);