Skip to content

Added handling of SELECT @@version and SELECT VERSION() without backend #4889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v3.0
Choose a base branch
from
Open

Added handling of SELECT @@version and SELECT VERSION() without backend #4889

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df287b2
Added handling of SELECT @@version and SELECT VERSION() without ba…
yashwantsahu20 Mar 27, 2025
b589e58
Using global mysql version
yashwantsahu20 Apr 2, 2025
2b5bd11
Using mysql_thread___server_version directly
yashwantsahu20 Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions lib/MySQL_Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ using json = nlohmann::json;
#define SELECT_VARIABLE_IDENTITY_LEN 17
#define SELECT_VARIABLE_IDENTITY_LIMIT1 "SELECT @@IDENTITY LIMIT 1"
#define SELECT_VARIABLE_IDENTITY_LIMIT1_LEN 25
#define SELECT_MYSQL_VERSION "SELECT @@version"
#define SELECT_MYSQL_VERSION_LEN 16
#define SELECT_MYSQL_VERSION_FUNC "SELECT VERSION()"
#define SELECT_MYSQL_VERSION_FUNC_LEN 16


#define EXPMARIA

Expand Down Expand Up @@ -6806,6 +6811,51 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
}
}

// handle case, about SELECT_MYSQL_VERSION or SELECT VERSION()
if ((pkt->size==SELECT_MYSQL_VERSION_LEN+5 && *((char *)(pkt->ptr)+4)==(char)0x03 && strncasecmp((char *)SELECT_MYSQL_VERSION,(char *)pkt->ptr+5,pkt->size-5)==0) ||
(pkt->size==SELECT_MYSQL_VERSION_FUNC_LEN+5 && *((char *)(pkt->ptr)+4)==(char)0x03 && strncasecmp((char *)SELECT_MYSQL_VERSION_FUNC,(char *)pkt->ptr+5,pkt->size-5)==0)) {
char buf2[32];
int l0=0;
if (pkt->size == SELECT_MYSQL_VERSION_LEN+5)
l0 = strlen(SELECT_MYSQL_VERSION);
else
l0 = strlen(SELECT_MYSQL_VERSION_FUNC);
memcpy(buf2, (char *)pkt->ptr + 5, l0);
buf2[l0]=0;
unsigned int nTrx=NumActiveTransactions();
uint16_t setStatus = (nTrx ? SERVER_STATUS_IN_TRANS : 0 );
if (autocommit) setStatus |= SERVER_STATUS_AUTOCOMMIT;
MySQL_Data_Stream *myds=client_myds;
MySQL_Protocol *myprot=&client_myds->myprot;
myds->DSS=STATE_QUERY_SENT_DS;
int sid=1;
myprot->generate_pkt_column_count(true,NULL,NULL,sid,1); sid++;
myprot->generate_pkt_field(true,NULL,NULL,sid,(char *)"",(char *)"",(char *)"",buf2,(char *)"",33,31,MYSQL_TYPE_VAR_STRING,0,0,false,0,NULL); sid++;
myds->DSS=STATE_COLUMN_DEFINITION;

bool deprecate_eof_active = myds->myconn->options.client_flag & CLIENT_DEPRECATE_EOF;
if (!deprecate_eof_active) {
myprot->generate_pkt_EOF(true,NULL,NULL,sid,0, setStatus); sid++;
}
char **p=(char **)malloc(sizeof(char*)*1);
unsigned long *l=(unsigned long *)malloc(sizeof(unsigned long *)*1);
l[0]= strlen(mysql_thread___server_version);
p[0]=mysql_thread___server_version;
myprot->generate_pkt_row(true,NULL,NULL,sid,1,l,p); sid++;
myds->DSS=STATE_ROW;
if (deprecate_eof_active) {
myprot->generate_pkt_OK(true,NULL,NULL,sid,0,0,setStatus,0,NULL,true); sid++;
} else {
myprot->generate_pkt_EOF(true,NULL,NULL,sid,0, setStatus); sid++;
}
myds->DSS=STATE_SLEEP;
RequestEnd(NULL);
l_free(pkt->size,pkt->ptr);
free(p);
free(l);
return true;
}

// handle command KILL #860
//if (prepared == false) {
if (handle_command_query_kill(pkt)) {
Expand Down
Loading