mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
- FIX PIVOT bug MDEV-5869 caused by using fop (field option ptr) when NULL.
modified: storage/connect/ha_connect.cc - Suppress the use of connect.in by adding the connect_xtrace system variable. modified: storage/connect/ha_connect.cc - Make column length, varchar, and temporal column types recognized in discovery when using SRCDEF,or PIVOT. modified: storage/connect/ha_connect.cc storage/connect/myconn.cpp storage/connect/myutil.cpp storage/connect/plgdbsem.h - Avoid (rare) crash when using DECIMAL type. (buf was too small) modified: storage/connect/tabfmt.cpp storage/connect/tabmysql.cpp storage/connect/tabodbc.cpp storage/connect/tabpivot.cpp storage/connect/valblk.cpp storage/connect/value.cpp - General cleaning of unused code, standardize tracing, and update version number modified: storage/connect/block.h storage/connect/colblk.cpp storage/connect/connect.cc storage/connect/csort.h storage/connect/filamap.cpp storage/connect/filamdbf.cpp storage/connect/filamfix.cpp storage/connect/filamzip.cpp storage/connect/ha_connect.cc storage/connect/mycat.cc storage/connect/myconn.cpp storage/connect/mysql-test/connect/r/alter.result storage/connect/mysql-test/connect/r/xml.result storage/connect/myutil.cpp storage/connect/osutil.c storage/connect/plgdbsem.h storage/connect/plgdbutl.cpp storage/connect/plugutil.c storage/connect/reldef.cpp storage/connect/tabcol.cpp storage/connect/tabfmt.cpp storage/connect/tabmysql.cpp storage/connect/tabodbc.cpp storage/connect/tabpivot.cpp storage/connect/tabvct.cpp storage/connect/user_connect.cc storage/connect/valblk.cpp storage/connect/value.cpp storage/connect/xindex.cpp
This commit is contained in:
@@ -22,6 +22,8 @@
|
||||
#include "xtable.h"
|
||||
#include "tabcol.h"
|
||||
|
||||
extern "C" int trace;
|
||||
|
||||
/***********************************************************************/
|
||||
/* XTAB public constructor. */
|
||||
/***********************************************************************/
|
||||
@@ -33,9 +35,9 @@ XTAB::XTAB(LPCSTR name, LPCSTR srcdef) : Name(name)
|
||||
Schema = NULL;
|
||||
Qualifier = NULL;
|
||||
|
||||
#ifdef DEBTRACE
|
||||
htrc(" making new TABLE %s %s\n", Name, Srcdef);
|
||||
#endif
|
||||
if (trace)
|
||||
htrc("XTAB: making new TABLE %s %s\n", Name, Srcdef);
|
||||
|
||||
} // end of XTAB constructor
|
||||
|
||||
/***********************************************************************/
|
||||
@@ -49,9 +51,9 @@ XTAB::XTAB(PTABLE tp) : Name(tp->Name)
|
||||
Schema = tp->Schema;
|
||||
Qualifier = tp->Qualifier;
|
||||
|
||||
#ifdef DEBTRACE
|
||||
htrc(" making copy TABLE %s %s\n", Name, Srcdef);
|
||||
#endif
|
||||
if (trace)
|
||||
htrc(" making copy TABLE %s %s\n", Name, Srcdef);
|
||||
|
||||
} // end of XTAB constructor
|
||||
|
||||
/***********************************************************************/
|
||||
@@ -61,9 +63,8 @@ PTABLE XTAB::Link(PTABLE tab2)
|
||||
{
|
||||
PTABLE tabp;
|
||||
|
||||
#ifdef DEBTRACE
|
||||
htrc("Linking tables %s... to %s\n", Name, tab2->Name);
|
||||
#endif
|
||||
if (trace)
|
||||
htrc("Linking tables %s... to %s\n", Name, tab2->Name);
|
||||
|
||||
for (tabp = this; tabp->Next; tabp = tabp->Next) ;
|
||||
|
||||
@@ -118,9 +119,9 @@ COLUMN::COLUMN(LPCSTR name) : Name(name)
|
||||
To_Col = NULL;
|
||||
Qualifier = NULL;
|
||||
|
||||
#ifdef DEBTRACE
|
||||
htrc(" making new COLUMN %s\n", Name);
|
||||
#endif
|
||||
if (trace)
|
||||
htrc(" making new COLUMN %s\n", Name);
|
||||
|
||||
} // end of COLUMN constructor
|
||||
|
||||
/***********************************************************************/
|
||||
|
Reference in New Issue
Block a user