diff options
| author | unknown <patg@radha.patg.net> | 2006-12-20 13:40:58 -0500 |
|---|---|---|
| committer | unknown <patg@radha.patg.net> | 2006-12-20 13:40:58 -0500 |
| commit | 4a08b64f56c55a6a2f371f20011b2297bf2f0b25 (patch) | |
| tree | f826b17526b0b683fba4b8c3a85b0ba1feb6f667 /storage/federated | |
| parent | b74c46110161a2599ea517954daff2cd53504697 (diff) | |
| download | mariadb-git-4a08b64f56c55a6a2f371f20011b2297bf2f0b25.tar.gz | |
WL #3031
fixing pushbuild warnings and errors
sql/sql_servers.cc:
WL# 3031
Cleaning up compile warnings on various platforms that I found with pushbuild
storage/federated/ha_federated.cc:
WL# 3031
Cleaning up compile warnings on various platforms that I found with pushbuild,
error on windows
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 397922e6e51..be8238f54b6 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -574,9 +574,9 @@ int get_connection(FEDERATED_SHARE *share) int error_num= ER_FOREIGN_SERVER_DOESNT_EXIST; char error_buffer[FEDERATED_QUERY_BUFFER_SIZE]; FOREIGN_SERVER *server; - MYSQL *mysql_conn; + MYSQL *mysql_conn= 0; MYSQL_RES *result= 0; - MYSQL_ROW row; + MYSQL_ROW row= 0; DBUG_ENTER("ha_federated::get_connection"); if (!(server= @@ -607,7 +607,7 @@ int get_connection(FEDERATED_SHARE *share) if (server->db) share->database= server->db; - share->port= server->port ? server->port : MYSQL_PORT; + share->port= server->port ? (ushort) server->port : MYSQL_PORT; if (server->host) share->hostname= server->host; @@ -704,8 +704,7 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table, DBUG_PRINT("info", ("Length: %d", table->s->connect_string.length)); DBUG_PRINT("info", ("String: '%.*s'", table->s->connect_string.length, table->s->connect_string.str)); - share->connection_string= my_strndup((const byte*)table->s-> - connect_string.str, + share->connection_string= my_strndup(table->s->connect_string.str, table->s->connect_string.length, MYF(0)); |