You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-30 19:23:07 +03:00
MCOL-962 change mcssystemreadonly to a tri state return flag. Test for 0 to see if the system is in a writable state,
This commit is contained in:
@ -1866,7 +1866,7 @@ void mcssystemready_deinit(UDF_INIT* initid)
|
|||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
__declspec(dllexport)
|
__declspec(dllexport)
|
||||||
#endif
|
#endif
|
||||||
// Return 1 if system is read only; 0 if writeable
|
// Return non-zero if system is read only; 0 if writeable
|
||||||
long long mcssystemreadonly(UDF_INIT* initid, UDF_ARGS* args,
|
long long mcssystemreadonly(UDF_INIT* initid, UDF_ARGS* args,
|
||||||
char* is_null, char* error)
|
char* is_null, char* error)
|
||||||
{
|
{
|
||||||
@ -1875,9 +1875,13 @@ long long mcssystemreadonly(UDF_INIT* initid, UDF_ARGS* args,
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (dbrm.getSystemSuspended())
|
||||||
|
{
|
||||||
|
rtn = 1;
|
||||||
|
}
|
||||||
if (dbrm.isReadWrite()) // Returns 0 for writable, 5 for read only
|
if (dbrm.isReadWrite()) // Returns 0 for writable, 5 for read only
|
||||||
{
|
{
|
||||||
rtn = 1;
|
rtn = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (...)
|
catch (...)
|
||||||
@ -1903,46 +1907,6 @@ void mcssystemreadonly_deinit(UDF_INIT* initid)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
__declspec(dllexport)
|
|
||||||
#endif
|
|
||||||
// Return 1 if system is read only; 0 if writeable
|
|
||||||
long long mcswritessuspended(UDF_INIT* initid, UDF_ARGS* args,
|
|
||||||
char* is_null, char* error)
|
|
||||||
{
|
|
||||||
long long rtn = 0;
|
|
||||||
DBRM dbrm(true);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (dbrm.getSystemSuspended())
|
|
||||||
{
|
|
||||||
rtn = 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (...)
|
|
||||||
{
|
|
||||||
*error = 1;
|
|
||||||
rtn = 1;
|
|
||||||
}
|
|
||||||
return rtn;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
__declspec(dllexport)
|
|
||||||
#endif
|
|
||||||
my_bool mcswritessuspended_init(UDF_INIT* initid, UDF_ARGS* args, char* message)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
__declspec(dllexport)
|
|
||||||
#endif
|
|
||||||
void mcswritessuspended_deinit(UDF_INIT* initid)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#define MAXSTRINGLENGTH 50
|
#define MAXSTRINGLENGTH 50
|
||||||
|
|
||||||
const char* PmSmallSideMaxMemory = "pmmaxmemorysmallside";
|
const char* PmSmallSideMaxMemory = "pmmaxmemorysmallside";
|
||||||
|
@ -84,7 +84,6 @@ CREATE FUNCTION idbpartition RETURNS STRING soname 'libcalmysql.so';
|
|||||||
CREATE FUNCTION idblocalpm RETURNS INTEGER soname 'libcalmysql.so';
|
CREATE FUNCTION idblocalpm RETURNS INTEGER soname 'libcalmysql.so';
|
||||||
CREATE FUNCTION mcssystemready RETURNS INTEGER soname 'libcalmysql.so';
|
CREATE FUNCTION mcssystemready RETURNS INTEGER soname 'libcalmysql.so';
|
||||||
CREATE FUNCTION mcssystemreadonly RETURNS INTEGER soname 'libcalmysql.so';
|
CREATE FUNCTION mcssystemreadonly RETURNS INTEGER soname 'libcalmysql.so';
|
||||||
CREATE FUNCTION mcswritessuspended RETURNS INTEGER soname 'libcalmysql.so';
|
|
||||||
|
|
||||||
CREATE DATABASE IF NOT EXISTS infinidb_vtable;
|
CREATE DATABASE IF NOT EXISTS infinidb_vtable;
|
||||||
CREATE DATABASE IF NOT EXISTS infinidb_querystats;
|
CREATE DATABASE IF NOT EXISTS infinidb_querystats;
|
||||||
|
@ -11,7 +11,6 @@ CREATE FUNCTION calcleartablelock RETURNS STRING SONAME 'libcalmysql.dll';
|
|||||||
CREATE FUNCTION calgetsqlcount RETURNS STRING SONAME 'libcalmysql.dll';
|
CREATE FUNCTION calgetsqlcount RETURNS STRING SONAME 'libcalmysql.dll';
|
||||||
CREATE FUNCTION mcssystemready RETURNS INTEGER SONAME 'libcalmysql.dll';
|
CREATE FUNCTION mcssystemready RETURNS INTEGER SONAME 'libcalmysql.dll';
|
||||||
CREATE FUNCTION mcssystemreadonly RETURNS INTEGER SONAME 'libcalmysql.dll';
|
CREATE FUNCTION mcssystemreadonly RETURNS INTEGER SONAME 'libcalmysql.dll';
|
||||||
CREATE FUNCTION mcswritessuspended RETURNS INTEGER SONAME 'libcalmysql.dll';
|
|
||||||
|
|
||||||
create database if not exists calpontsys;
|
create database if not exists calpontsys;
|
||||||
use calpontsys;
|
use calpontsys;
|
||||||
|
Reference in New Issue
Block a user