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:
@@ -555,7 +555,7 @@ template <>
|
||||
bool TYPVAL<double>::SetValue_char(char *p, int n)
|
||||
{
|
||||
if (p) {
|
||||
char buf[32];
|
||||
char buf[64];
|
||||
|
||||
for (; n > 0 && *p == ' '; p++)
|
||||
n--;
|
||||
@@ -957,7 +957,7 @@ bool TYPVAL<PSZ>::SetValue_pval(PVAL valp, bool chktype)
|
||||
if (chktype && (valp->GetType() != Type || valp->GetSize() > Len))
|
||||
return true;
|
||||
|
||||
char buf[32];
|
||||
char buf[64];
|
||||
|
||||
if (!(Null = valp->IsNull() && Nullable))
|
||||
strncpy(Strp, valp->GetCharString(buf), Len);
|
||||
@@ -1126,7 +1126,7 @@ void TYPVAL<PSZ>::SetValue(ulonglong n)
|
||||
/***********************************************************************/
|
||||
void TYPVAL<PSZ>::SetValue(double f)
|
||||
{
|
||||
char *p, buf[32];
|
||||
char *p, buf[64];
|
||||
PGLOBAL& g = Global;
|
||||
int k = sprintf(buf, "%lf", f);
|
||||
|
||||
@@ -1220,7 +1220,7 @@ bool TYPVAL<PSZ>::IsEqual(PVAL vp, bool chktype)
|
||||
else if (Null || vp->IsNull())
|
||||
return false;
|
||||
|
||||
char buf[32];
|
||||
char buf[64];
|
||||
|
||||
if (Ci || vp->IsCi())
|
||||
return !stricmp(Strp, vp->GetCharString(buf));
|
||||
@@ -1351,7 +1351,7 @@ bool DECVAL::SetValue_pval(PVAL valp, bool chktype)
|
||||
if (chktype && (valp->GetType() != Type || valp->GetSize() > Len))
|
||||
return true;
|
||||
|
||||
char buf[32];
|
||||
char buf[64];
|
||||
|
||||
if (!(Null = valp->IsNull() && Nullable))
|
||||
strncpy(Strp, valp->GetCharString(buf), Len);
|
||||
@@ -1450,7 +1450,7 @@ bool DECVAL::IsEqual(PVAL vp, bool chktype)
|
||||
else if (Null || vp->IsNull())
|
||||
return false;
|
||||
|
||||
char buf[32];
|
||||
char buf[64];
|
||||
|
||||
return !strcmp(Strp, vp->GetCharString(buf));
|
||||
} // end of IsEqual
|
||||
|
Reference in New Issue
Block a user