From bdbe7430bc16d8cff18733b84de5db62c89ad5d9 Mon Sep 17 00:00:00 2001 From: Olivier Bertrand Date: Thu, 27 Mar 2014 19:07:17 +0100 Subject: - Make local MySQL connection default to unix socket on Linux or enable to use named pipe on Windows by specifying the host as '.' This addresses MDEV-5952. modified: storage/connect/myconn.cpp - Clean some unused code modified: storage/connect/connect.cc storage/connect/connect.h storage/connect/ha_connect.cc storage/connect/ha_connect.h --- storage/connect/connect.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'storage/connect/connect.cc') diff --git a/storage/connect/connect.cc b/storage/connect/connect.cc index 66cd139c85e..879814833d4 100644 --- a/storage/connect/connect.cc +++ b/storage/connect/connect.cc @@ -57,7 +57,7 @@ extern "C" int trace; /* Routines called internally by semantic routines. */ /***********************************************************************/ void CntEndDB(PGLOBAL); -RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool mrr= false); +RCODE EvalColumns(PGLOBAL g, PTDB tdbp); /***********************************************************************/ /* MySQL routines called externally by semantic routines. */ @@ -387,7 +387,7 @@ bool CntRewindTable(PGLOBAL g, PTDB tdbp) /***********************************************************************/ /* Evaluate all columns after a record is read. */ /***********************************************************************/ -RCODE EvalColumns(PGLOBAL g, PTDB tdbp, bool mrr) +RCODE EvalColumns(PGLOBAL g, PTDB tdbp) { RCODE rc= RC_OK; PCOL colp; @@ -706,7 +706,7 @@ int CntIndexInit(PGLOBAL g, PTDB ptdb, int id) /* IndexRead: fetch a record having the index value. */ /***********************************************************************/ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op, - const void *key, int len, bool mrr) + const void *key, int len) { char *kp= (char*)key; int n; @@ -783,7 +783,7 @@ RCODE CntIndexRead(PGLOBAL g, PTDB ptdb, OPVAL op, xbp->SetNth(0); if ((rc= (RCODE)tdbp->ReadDB(g)) == RC_OK) - rc= EvalColumns(g, tdbp, mrr); + rc= EvalColumns(g, tdbp); return rc; } // end of CntIndexRead -- cgit v1.2.1