Commit ac9c1fa3 authored by unknown's avatar unknown

Fixes needed to build 5.0.13 on Windows:

- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.


VC++Files/libmysqld/libmysqld.vcproj:
  Reflect a change done by Kostja in the Unix "libmysqld/Makefile.am":
  New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".
VC++Files/sql/mysqld.vcproj:
  Reflect a change done by Kostja in the Unix "sql/Makefile.am":
  New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".
sql/ha_federated.cc:
  Correct a typo (matters only if "SAFEMALLOC" is set).
parent 7d6d4c83
...@@ -2299,7 +2299,7 @@ ...@@ -2299,7 +2299,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="..\sql\protocol_cursor.cpp"> RelativePath="..\sql\sql_cursor.cpp">
<FileConfiguration <FileConfiguration
Name="Debug|Win32"> Name="Debug|Win32">
<Tool <Tool
......
...@@ -4578,7 +4578,7 @@ ...@@ -4578,7 +4578,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath="protocol_cursor.cpp"> RelativePath="sql_cursor.cpp">
<FileConfiguration <FileConfiguration
Name="classic nt|Win32"> Name="classic nt|Win32">
<Tool <Tool
......
...@@ -1378,7 +1378,7 @@ static int free_share(FEDERATED_SHARE *share) ...@@ -1378,7 +1378,7 @@ static int free_share(FEDERATED_SHARE *share)
if (!--share->use_count) if (!--share->use_count)
{ {
hash_delete(&federated_open_tables, (byte*) share); hash_delete(&federated_open_tables, (byte*) share);
my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR0)); my_free((gptr) share->scheme, MYF(MY_ALLOW_ZERO_PTR));
share->scheme= 0; share->scheme= 0;
thr_lock_delete(&share->lock); thr_lock_delete(&share->lock);
VOID(pthread_mutex_destroy(&share->mutex)); VOID(pthread_mutex_destroy(&share->mutex));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment