summaryrefslogtreecommitdiff
path: root/sql/ha_federated.cc
diff options
context:
space:
mode:
authorunknown <reggie@fedora.(none)>2005-09-15 14:32:01 -0500
committerunknown <reggie@fedora.(none)>2005-09-15 14:32:01 -0500
commitdc6b96dd465783ce2c4c4a596f813b094f2ea081 (patch)
tree80680fe7b1fe491576584192c59a10e8b0ef2af2 /sql/ha_federated.cc
parentef83979a354a20040508485189031cedb54a0fac (diff)
downloadmariadb-git-dc6b96dd465783ce2c4c4a596f813b094f2ea081.tar.gz
some last minute Windows compile fixes and makefile corrections
VC++Files/libmysqld/libmysqld.vcproj: don't recall exactly what this change was. VC++Files/libmysqltest/myTest.vcproj: redirect to client_release and client_debug folders VC++Files/mysql.sln: remove bdb from embedded classic target VC++Files/mysqlserver/mysqlserver.vcproj: redirect to lib_release and lib_debug folders server-tools/instance-manager/mysqlmanager.vcproj: redirect to proper folders sql/ha_federated.cc: fix windows compile problems sql/sql_acl.cc: fix windows compile problems sql/table.cc: fix windows compile problems sql/unireg.cc: fix windows compile problems VC++Files/mysqlserver/dummy.cpp: added new file to make mysqlserver generate a lib
Diffstat (limited to 'sql/ha_federated.cc')
-rw-r--r--sql/ha_federated.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 2590e7881a4..6230fa7bb3c 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -591,9 +591,10 @@ static int parse_url(FEDERATED_SHARE *share, TABLE *table,
DBUG_PRINT("info", ("Length %d \n", table->s->connect_string.length));
DBUG_PRINT("info", ("String %.*s \n", table->s->connect_string.length,
table->s->connect_string.str));
- share->scheme= my_strdup_with_length(table->s->connect_string.str,
- table->s->connect_string.length+1,
- MYF(0));
+ share->scheme= my_strdup_with_length(
+ (const byte*)table->s->connect_string.str,
+ table->s->connect_string.length+1, MYF(0));
+
// Add a null for later termination of table name
share->scheme[table->s->connect_string.length]= 0;
DBUG_PRINT("info",("parse_url alloced share->scheme %lx", share->scheme));
@@ -2626,7 +2627,8 @@ int ha_federated::stash_remote_error()
{
DBUG_ENTER("ha_federated::stash_remote_error()");
remote_error_number= mysql_errno(mysql);
- snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE, mysql_error(mysql));
+ my_snprintf(remote_error_buf, FEDERATED_QUERY_BUFFER_SIZE,
+ mysql_error(mysql));
DBUG_RETURN(HA_FEDERATED_ERROR_WITH_REMOTE_SYSTEM);
}