diff options
| -rw-r--r-- | libmysql/libmysql.c | 29 | ||||
| -rw-r--r-- | sql-common/client.c | 30 |
2 files changed, 30 insertions, 29 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 323ddfca36f..bfec476fde3 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1386,35 +1386,6 @@ mysql_get_server_info(MYSQL *mysql) } -/* - Get version number for server in a form easy to test on - - SYNOPSIS - mysql_get_server_version() - mysql Connection - - EXAMPLE - 4.1.0-alfa -> 40100 - - NOTES - We will ensure that a newer server always has a bigger number. - - RETURN - Signed number > 323000 -*/ - -ulong STDCALL -mysql_get_server_version(MYSQL *mysql) -{ - uint major, minor, version; - char *pos= mysql->server_version, *end_pos; - major= (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); - return (ulong) major*10000L+(ulong) (minor*100+version); -} - - const char * STDCALL mysql_get_host_info(MYSQL *mysql) { diff --git a/sql-common/client.c b/sql-common/client.c index e7e74795fa0..84df31b7440 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2817,6 +2817,36 @@ const char * STDCALL mysql_error(MYSQL *mysql) return mysql->net.last_error; } + +/* + Get version number for server in a form easy to test on + + SYNOPSIS + mysql_get_server_version() + mysql Connection + + EXAMPLE + 4.1.0-alfa -> 40100 + + NOTES + We will ensure that a newer server always has a bigger number. + + RETURN + Signed number > 323000 +*/ + +ulong STDCALL +mysql_get_server_version(MYSQL *mysql) +{ + uint major, minor, version; + char *pos= mysql->server_version, *end_pos; + major= (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); + return (ulong) major*10000L+(ulong) (minor*100+version); +} + + /* mysql_set_character_set function sends SET NAMES cs_name to the server (which changes character_set_client, character_set_result |