diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-05-05 15:12:14 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-05-05 15:12:14 +0200 |
| commit | d0b32f1af9d039d3bedf27654060beefb6dc3047 (patch) | |
| tree | 53ff08d02dad40afa99fc616d4be21b8ee1bf053 /storage/pbxt | |
| parent | 02ed15db571d7b6d4be79a5bf0434c1d5c975d6f (diff) | |
| parent | 1f6a936ddc46f9bf035277124ea6be0774038ca4 (diff) | |
| download | mariadb-git-d0b32f1af9d039d3bedf27654060beefb6dc3047.tar.gz | |
Automerge mariadb 5.1 -> mariadb 5.2
Diffstat (limited to 'storage/pbxt')
| -rw-r--r-- | storage/pbxt/src/locklist_xt.cc | 5 | ||||
| -rw-r--r-- | storage/pbxt/src/pbms_enabled.cc | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/storage/pbxt/src/locklist_xt.cc b/storage/pbxt/src/locklist_xt.cc index 9a4aeb8f501..cbb004a70ca 100644 --- a/storage/pbxt/src/locklist_xt.cc +++ b/storage/pbxt/src/locklist_xt.cc @@ -186,5 +186,10 @@ void xt_trace_thread_locks(XTThread *self) } } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif diff --git a/storage/pbxt/src/pbms_enabled.cc b/storage/pbxt/src/pbms_enabled.cc index cea6b231fdf..7a67d89a4bb 100644 --- a/storage/pbxt/src/pbms_enabled.cc +++ b/storage/pbxt/src/pbms_enabled.cc @@ -241,4 +241,9 @@ void pbms_completed(TABLE *table, bool ok) return ; } +#elif defined(__WIN__) + +// Remove linker warning 4221 about empty file +namespace { char dummy; }; + #endif // PBMS_ENABLED |