summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ram@gw.mysql.r18.ru>2003-09-24 15:41:09 +0500
committerunknown <ram@gw.mysql.r18.ru>2003-09-24 15:41:09 +0500
commit272b8d2485dab380b4504bad802b71f357562d20 (patch)
treed3dbf98cff1ae15a1c80f75c19fb971713cbd06b
parentaddd5364f253b172a0d71735d82862ac9ca8eeb6 (diff)
downloadmariadb-git-272b8d2485dab380b4504bad802b71f357562d20.tar.gz
A fix. Please never use 'ulong' here!
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
-rw-r--r--BitKeeper/etc/logging_ok1
-rw-r--r--include/mysql.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 2e8ecfa0ad7..9fc395e6813 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -86,6 +86,7 @@ peter@linux.local
peter@mysql.com
peterg@mysql.com
pgulutzan@linux.local
+ram@gw.mysql.r18.ru
ram@mysql.r18.ru
ram@ram.(none)
ranger@regul.home.lan
diff --git a/include/mysql.h b/include/mysql.h
index 1db322d5304..95730c0f2f5 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -352,7 +352,7 @@ int STDCALL mysql_ping(MYSQL *mysql);
const char * STDCALL mysql_stat(MYSQL *mysql);
const char * STDCALL mysql_get_server_info(MYSQL *mysql);
const char * STDCALL mysql_get_client_info(void);
-ulong STDCALL mysql_get_client_version(void);
+unsigned long STDCALL mysql_get_client_version(void);
const char * STDCALL mysql_get_host_info(MYSQL *mysql);
unsigned int STDCALL mysql_get_proto_info(MYSQL *mysql);
MYSQL_RES * STDCALL mysql_list_dbs(MYSQL *mysql,const char *wild);