diff options
| author | unknown <joerg@mysql.com> | 2005-09-22 18:57:07 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-09-22 18:57:07 +0200 |
| commit | ac9c1fa39bb770a568387c2bee08c8821abdbf92 (patch) | |
| tree | c058d04ad7fe39f35e0b2bee070bbb3ca4bb98ef /sql/ha_federated.cc | |
| parent | 7d6d4c8355a5a532de73156ae5e3b0b106f12cb7 (diff) | |
| download | mariadb-git-ac9c1fa39bb770a568387c2bee08c8821abdbf92.tar.gz | |
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).
Diffstat (limited to 'sql/ha_federated.cc')
| -rw-r--r-- | sql/ha_federated.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 6d5c5b48ab6..08bfb6f2be7 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -1378,7 +1378,7 @@ static int free_share(FEDERATED_SHARE *share) if (!--share->use_count) { 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; thr_lock_delete(&share->lock); VOID(pthread_mutex_destroy(&share->mutex)); |