Commit 9aafd0da authored by Michael Widenius's avatar Michael Widenius

Ensure that mysql_get_server_version() also works if there is a non numerical...

Ensure that mysql_get_server_version() also works if there is a non numerical prefix before the version number
parent 626dd5e8
...@@ -3208,7 +3208,7 @@ const char * STDCALL mysql_error(MYSQL *mysql) ...@@ -3208,7 +3208,7 @@ const char * STDCALL mysql_error(MYSQL *mysql)
mysql Connection mysql Connection
EXAMPLE EXAMPLE
4.1.0-alfa -> 40100 MariaDB-4.1.0-alfa -> 40100
NOTES NOTES
We will ensure that a newer server always has a bigger number. We will ensure that a newer server always has a bigger number.
...@@ -3221,7 +3221,11 @@ ulong STDCALL ...@@ -3221,7 +3221,11 @@ ulong STDCALL
mysql_get_server_version(MYSQL *mysql) mysql_get_server_version(MYSQL *mysql)
{ {
uint major, minor, version; uint major, minor, version;
char *pos= mysql->server_version, *end_pos; const char *pos= mysql->server_version;
char *end_pos;
/* Skip possible prefix */
while (*pos && !my_isdigit(&my_charset_latin1, *pos))
pos++;
major= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1; major= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
minor= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1; minor= (uint) strtoul(pos, &end_pos, 10); pos=end_pos+1;
version= (uint) strtoul(pos, &end_pos, 10); version= (uint) strtoul(pos, &end_pos, 10);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment