Merge tag 'mariadb-10.0.35' into 10.0-galera

1 files changed, 5 insertions, 5 deletions

diff --git a/storage/connect/myconn.cpp b/storage/connect/myconn.cpp
index fe00f6a1eab..253c42bb002 100644
--- a/storage/connect/myconn.cpp
+++ b/storage/connect/myconn.cpp
@@ -177,7 +177,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
       return NULL;
       } // endif b
 
-    if (trace)
+    if (trace(1))
       htrc("MyColumns: cmd='%s'\n", cmd.GetStr());
 
     if ((n = myc.GetResultSize(g, cmd.GetStr())) < 0) {
@@ -248,7 +248,7 @@ PQRYRES MyColumns(PGLOBAL g, THD *thd, const char *host, const char *db,
 
 			while (true) {
 				p2 = strchr(p1, '\'');
-				len = MY_MAX(len, p2 - p1);
+				len = MY_MAX(len, (int)(p2 - p1));
 				if (*++p2 != ',') break;
 				p1 = p2 + 2;
 			} // endwhile
@@ -482,7 +482,7 @@ int MYSQLC::Open(PGLOBAL g, const char *host, const char *db,
     return RC_FX;
     } // endif m_DB
 
-	if (trace)
+	if (trace(1))
 		htrc("MYSQLC Open: m_DB=%.4X size=%d\n", m_DB, (int)sizeof(*m_DB));
 
 	// Removed to do like FEDERATED do
@@ -744,7 +744,7 @@ int MYSQLC::ExecSQL(PGLOBAL g, const char *query, int *w)
       m_Fields = mysql_num_fields(m_Res);
       m_Rows = (!m_Use) ? (int)mysql_num_rows(m_Res) : 0;
 
-			if (trace)
+			if (trace(1))
 				htrc("ExecSQL: m_Res=%.4X size=%d m_Fields=%d m_Rows=%d\n",
 				               m_Res, sizeof(*m_Res), m_Fields, m_Rows);
 
@@ -1068,7 +1068,7 @@ void MYSQLC::Close(void)
   {
   FreeResult();
 
-	if (trace)
+	if (trace(1))
 		htrc("MYSQLC Close: m_DB=%.4X\n", m_DB);
 
 	mysql_close(m_DB);