diff options
| author | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-24 14:24:06 +0200 |
|---|---|---|
| committer | unknown <mskold/marty@mysql.com/linux.site> | 2007-04-24 14:24:06 +0200 |
| commit | be5a3426bcffeecafdea2860c182e13ef813d634 (patch) | |
| tree | 03b91c4c17538204deb7f2a1c0bca9726b3688b4 /sql/ha_ndbcluster_cond.cc | |
| parent | 5506f6ca8b50ee2fc5e5cdf654834de5b1197659 (diff) | |
| download | mariadb-git-be5a3426bcffeecafdea2860c182e13ef813d634.tar.gz | |
ha_ndbcluster.h, ha_ndbcluster.cc:
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
Merge
libmysqld/Makefile.am:
Added compilation of ha_ndbcluster_cond
sql/Makefile.am:
Added compilation of ha_ndbcluster_cond
sql/ha_ndbcluster.cc:
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster.h:
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster_cond.cc:
Merge
sql/ha_ndbcluster_cond.h:
Merge
Diffstat (limited to 'sql/ha_ndbcluster_cond.cc')
| -rw-r--r-- | sql/ha_ndbcluster_cond.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/ha_ndbcluster_cond.cc b/sql/ha_ndbcluster_cond.cc index a0eaccb68d8..267be17c330 100644 --- a/sql/ha_ndbcluster_cond.cc +++ b/sql/ha_ndbcluster_cond.cc @@ -24,7 +24,7 @@ #include "mysql_priv.h" -#ifdef HAVE_NDBCLUSTER_DB +#ifdef WITH_NDBCLUSTER_STORAGE_ENGINE #include <ndbapi/NdbApi.hpp> #include "ha_ndbcluster_cond.h" @@ -351,8 +351,8 @@ void ndb_serialize_cond(const Item *item, void *arg) else { DBUG_PRINT("info", ("Was not expecting field from table %s (%s)", - context->table->s->table_name, - field->table->s->table_name)); + context->table->s->table_name.str, + field->table->s->table_name.str)); context->supported= FALSE; } break; |