mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
e049f92392
commit ac275d0b4ad (connect/10.0) Author: Olivier Bertrand <bertrandop@gmail.com> Date: Wed Mar 27 12:46:20 2019 +0100 Comment out unrecognized command line options: Modified CMakeLists.txt commit 592f1f75ad6 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 26 19:52:33 2019 +0100 Replace Command not recognized by CMake modified: CMakeLists.txt commit 00f72199b16 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Tue Mar 26 18:15:08 2019 +0100 - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode='' Fixed by replacing sprinf by snprintf in ShowValue to avoid buffer overflow. It nows always use a buffer and returns int. modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/value.cpp modified: storage/connect/value.h - Fix MDEV-18292: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure Was not fixed when the same table was called several times with different modes. Fixed by checking if a new statement is compatible in the start_stmt function. It nows do the same checks than external_lock. modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h - typo modified: storage/connect/user_connect.cc - Fix GetTableName that returned wrong value under Windows modified: storage/connect/ha_connect.cc - Fix MDEV-13136: enhance CREATE SERVER MyServerName FOREIGN DATA WRAPPER to work with CONNECT engine modified: storage/connect/tabjdbc.cpp - Add a function to retrieve User variable value (DEVELOPMENT only) modified: storage/connect/ha_connect.cc modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/tabjdbc.cpp - Fix MDEV-18192: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp - Enable CONNECT tables to have triggers Update version number modified: storage/connect/ha_connect.cc - Make user and password defined in CREATE TABLE have precedence on the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - JSONColumns: Copy locally constant strings to fix error in OEM modules modified: storage/connect/tabjson.cpp commit 99de7f4e486 Author: Olivier Bertrand <bertrandop@gmail.com> Date: Sun Jan 27 15:16:15 2019 +0100 - Fix MDEV-18192: CONNECT Engine JDBC not able to issue simple UPDATE statement from trigger or stored procedure modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp - Enable CONNECT tables to have triggers Update version number modified: storage/connect/ha_connect.cc - Make user and password defined in CREATE TABLE have precedence on the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - JSONColumns: Copy locally constant strings to fix error in OEM modules modified: storage/connect/tabjson.cpp
191 lines
5.4 KiB
C++
191 lines
5.4 KiB
C++
/* Copyright (C) MariaDB Corporation Ab
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */
|
|
|
|
/**
|
|
@file user_connect.cc
|
|
|
|
@brief
|
|
Implements the user_connect class.
|
|
|
|
@details
|
|
To support multi_threading, each query creates and use a PlugDB "user"
|
|
that is a connection with its personnal memory allocation.
|
|
|
|
@note
|
|
Author Olivier Bertrand
|
|
*/
|
|
|
|
/****************************************************************************/
|
|
/* Author: Olivier Bertrand -- bertrandop@gmail.com -- 2004-2015 */
|
|
/****************************************************************************/
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
|
#pragma implementation // gcc: Class implementation
|
|
#endif
|
|
|
|
#define DONT_DEFINE_VOID
|
|
#define MYSQL_SERVER
|
|
#include <my_global.h>
|
|
#include "sql_class.h"
|
|
#undef OFFSET
|
|
|
|
#define NOPARSE
|
|
#include "osutil.h"
|
|
#include "global.h"
|
|
#include "plgdbsem.h"
|
|
#include "connect.h"
|
|
#include "user_connect.h"
|
|
#include "mycat.h"
|
|
|
|
extern pthread_mutex_t usrmut;
|
|
|
|
/****************************************************************************/
|
|
/* Initialize the user_connect static member. */
|
|
/****************************************************************************/
|
|
PCONNECT user_connect::to_users= NULL;
|
|
|
|
/****************************************************************************/
|
|
/* Get the work_size SESSION variable value . */
|
|
/****************************************************************************/
|
|
uint GetWorkSize(void);
|
|
void SetWorkSize(uint);
|
|
|
|
/* -------------------------- class user_connect -------------------------- */
|
|
|
|
/****************************************************************************/
|
|
/* Constructor. */
|
|
/****************************************************************************/
|
|
user_connect::user_connect(THD *thd)
|
|
{
|
|
thdp= thd;
|
|
next= NULL;
|
|
previous= NULL;
|
|
g= NULL;
|
|
last_query_id= 0;
|
|
count= 0;
|
|
|
|
// Statistics
|
|
nrd= fnd= nfd= 0;
|
|
tb1= 0;
|
|
} // end of user_connect constructor
|
|
|
|
|
|
/****************************************************************************/
|
|
/* Destructor. */
|
|
/****************************************************************************/
|
|
user_connect::~user_connect()
|
|
{
|
|
// Terminate CONNECT and Plug-like environment, should return NULL
|
|
g= CntExit(g);
|
|
} // end of user_connect destructor
|
|
|
|
|
|
/****************************************************************************/
|
|
/* Initialization. */
|
|
/****************************************************************************/
|
|
bool user_connect::user_init()
|
|
{
|
|
// Initialize Plug-like environment
|
|
uint worksize= GetWorkSize();
|
|
PACTIVITY ap= NULL;
|
|
PDBUSER dup= NULL;
|
|
|
|
// Areasize= 64M because of VEC tables. Should be parameterisable
|
|
//g= PlugInit(NULL, 67108864);
|
|
//g= PlugInit(NULL, 134217728); // 128M was because of old embedded tests
|
|
g= PlugInit(NULL, worksize);
|
|
|
|
// Check whether the initialization is complete
|
|
if (!g || !g->Sarea || PlugSubSet(g->Sarea, g->Sarea_Size)
|
|
|| !(dup= PlgMakeUser(g))) {
|
|
if (g)
|
|
printf("%s\n", g->Message);
|
|
|
|
int rc= PlugExit(g);
|
|
g= NULL;
|
|
|
|
if (dup)
|
|
free(dup);
|
|
|
|
return true;
|
|
} // endif g->
|
|
|
|
dup->Catalog= new MYCAT(NULL);
|
|
|
|
ap= new ACTIVITY;
|
|
memset(ap, 0, sizeof(ACTIVITY));
|
|
strcpy(ap->Ap_Name, "CONNECT");
|
|
g->Activityp= ap;
|
|
g->Activityp->Aptr= dup;
|
|
|
|
pthread_mutex_lock(&usrmut);
|
|
next= to_users;
|
|
to_users= this;
|
|
|
|
if (next)
|
|
next->previous= this;
|
|
|
|
count = 1;
|
|
pthread_mutex_unlock(&usrmut);
|
|
|
|
last_query_id= thdp->query_id;
|
|
return false;
|
|
} // end of user_init
|
|
|
|
|
|
void user_connect::SetHandler(ha_connect *hc)
|
|
{
|
|
PDBUSER dup= (PDBUSER)g->Activityp->Aptr;
|
|
MYCAT *mc= (MYCAT*)dup->Catalog;
|
|
mc->SetHandler(hc);
|
|
}
|
|
|
|
/****************************************************************************/
|
|
/* Check whether we begin a new query and if so cleanup the previous one. */
|
|
/****************************************************************************/
|
|
bool user_connect::CheckCleanup(bool force)
|
|
{
|
|
if (thdp->query_id > last_query_id || force) {
|
|
uint worksize= GetWorkSize(), size = g->Sarea_Size;
|
|
|
|
PlugCleanup(g, true);
|
|
|
|
if (size != worksize) {
|
|
FreeSarea(g);
|
|
|
|
// Check whether the work area could be allocated
|
|
if (AllocSarea(g, worksize)) {
|
|
AllocSarea(g, size);
|
|
SetWorkSize(g->Sarea_Size); // Was too big
|
|
} // endif sarea
|
|
|
|
} // endif worksize
|
|
|
|
PlugSubSet(g->Sarea, g->Sarea_Size);
|
|
g->Xchk = NULL;
|
|
g->Createas = 0;
|
|
g->Alchecked = 0;
|
|
g->Mrr = 0;
|
|
g->More = 0;
|
|
last_query_id= thdp->query_id;
|
|
|
|
if (trace(65) && !force)
|
|
printf("=====> Begin new query %llu\n", last_query_id);
|
|
|
|
return true;
|
|
} // endif query_id
|
|
|
|
return false;
|
|
} // end of CheckCleanup
|
|
|