diff options
author | unknown <reggie@fedora.(none)> | 2005-09-15 14:32:01 -0500 |
---|---|---|
committer | unknown <reggie@fedora.(none)> | 2005-09-15 14:32:01 -0500 |
commit | dc6b96dd465783ce2c4c4a596f813b094f2ea081 (patch) | |
tree | 80680fe7b1fe491576584192c59a10e8b0ef2af2 /sql/unireg.cc | |
parent | ef83979a354a20040508485189031cedb54a0fac (diff) | |
download | mariadb-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/unireg.cc')
-rw-r--r-- | sql/unireg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index 1ac8be0f49a..d297b143d3b 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -153,8 +153,8 @@ bool mysql_create_frm(THD *thd, my_string file_name, { char buff[2]; int2store(buff,create_info->connect_string.length); - if (my_write(file, buff, sizeof(buff), MYF(MY_NABP)) || - my_write(file, create_info->connect_string.str, + if (my_write(file, (const byte*)buff, sizeof(buff), MYF(MY_NABP)) || + my_write(file, (const byte*)create_info->connect_string.str, create_info->connect_string.length, MYF(MY_NABP))) goto err; } |