diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-22 08:57:32 +0100 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-03-22 08:57:32 +0100 |
| commit | 81ce7da7a72e483b8f9d491c2d937d8ccc8c7b6e (patch) | |
| tree | 6f076508d09cd50b09869ce00b5f5810133c3402 /storage/connect/colblk.cpp | |
| parent | 7b400a088d049661b9a4dded385ac78923bb0017 (diff) | |
| parent | 31560c448a62514f244b67d0925cd3837188e4c9 (diff) | |
| download | mariadb-git-81ce7da7a72e483b8f9d491c2d937d8ccc8c7b6e.tar.gz | |
- Resolving conflicts
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/filamtxt.cpp
storage/connect/filamzip.cpp
storage/connect/ha_connect.cc
storage/connect/mycat.cc
storage/connect/myconn.cpp
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
Diffstat (limited to 'storage/connect/colblk.cpp')
| -rw-r--r-- | storage/connect/colblk.cpp | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/storage/connect/colblk.cpp b/storage/connect/colblk.cpp index e890ad1ce44..a3fb5587ba9 100644 --- a/storage/connect/colblk.cpp +++ b/storage/connect/colblk.cpp @@ -23,6 +23,8 @@ #include "xindex.h"
#include "xtable.h"
+extern "C" int trace;
+
/***********************************************************************/
/* COLBLK protected constructor. */
/***********************************************************************/
@@ -76,9 +78,8 @@ COLBLK::COLBLK(PCOL col1, PTDB tdbp) //To_Orig = col1;
To_Tdb = tdbp;
-#ifdef DEBTRACE
- htrc(" copying COLBLK %s from %p to %p\n", Name, col1, this);
-#endif
+ if (trace > 1)
+ htrc(" copying COLBLK %s from %p to %p\n", Name, col1, this);
if (tdbp)
// Attach the new column to the table block
@@ -116,10 +117,9 @@ bool COLBLK::SetFormat(PGLOBAL g, FORMAT& fmt) {
fmt = Format;
-#ifdef DEBTRACE
- htrc("COLBLK: %p format=%c(%d,%d)\n",
- this, *fmt.Type, fmt.Length, fmt.Prec);
-#endif
+ if (trace > 1)
+ htrc("COLBLK: %p format=%c(%d,%d)\n",
+ this, *fmt.Type, fmt.Length, fmt.Prec);
return false;
} // end of SetFormat
@@ -130,9 +130,8 @@ bool COLBLK::SetFormat(PGLOBAL g, FORMAT& fmt) /***********************************************************************/
bool COLBLK::Eval(PGLOBAL g)
{
-#ifdef DEBTRACE
- htrc("Col Eval: %s status=%.4X\n", Name, Status);
-#endif
+ if (trace > 1)
+ htrc("Col Eval: %s status=%.4X\n", Name, Status);
if (!GetStatus(BUF_READ)) {
// if (To_Tdb->IsNull())
@@ -168,10 +167,9 @@ bool COLBLK::InitValue(PGLOBAL g) AddStatus(BUF_READY);
Value->SetNullable(Nullable);
-#ifdef DEBTRACE
- htrc(" colp=%p type=%d value=%p coluse=%.4X status=%.4X\n",
- this, Buf_Type, Value, ColUse, Status);
-#endif
+ if (trace > 1)
+ htrc(" colp=%p type=%d value=%p coluse=%.4X status=%.4X\n",
+ this, Buf_Type, Value, ColUse, Status);
return false;
} // end of InitValue
|