diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 21:55:12 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-05-04 21:55:12 +0200 |
| commit | a15ac50637254bc0b984a101ff19f7fce5406602 (patch) | |
| tree | 1dae947e072d55116c0bdbea78fcba6e97293c50 /sql/ha_ndbcluster_binlog.cc | |
| parent | 97d8da57a3d2618ca9926a3a3127a4c9ba3bb268 (diff) | |
| parent | 462a43e16b5bb2307effe44d18cdb82fef1ff170 (diff) | |
| download | mariadb-git-a15ac50637254bc0b984a101ff19f7fce5406602.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Diffstat (limited to 'sql/ha_ndbcluster_binlog.cc')
| -rw-r--r-- | sql/ha_ndbcluster_binlog.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc index e3e779d533c..6139234a50e 100644 --- a/sql/ha_ndbcluster_binlog.cc +++ b/sql/ha_ndbcluster_binlog.cc @@ -16,6 +16,7 @@ */ #include "mysql_priv.h" +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE #include "ha_ndbcluster.h" #ifdef HAVE_NDB_BINLOG @@ -3695,3 +3696,4 @@ ndbcluster_show_status_binlog(THD* thd, stat_print_fn *stat_print, } #endif /* HAVE_NDB_BINLOG */ +#endif |