diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-28 13:28:33 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-03-28 13:28:33 +0200 |
| commit | fb17414ba1797943c0050ed65951d709528928b5 (patch) | |
| tree | a97101ea152122f242184ad82eebd33358d668fa /sql | |
| parent | 8f7990e0c05c33824c86da6477f3b787948bdccb (diff) | |
| parent | 13b3d0ac611ef894e3c2d0743db3ddd946796106 (diff) | |
| download | mariadb-git-fb17414ba1797943c0050ed65951d709528928b5.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
mysql-test/t/disabled.def:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 795da2bdec2..bbe2e9ee305 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -74,6 +74,8 @@ handlerton ndbcluster_hton = { DB_TYPE_NDBCLUSTER, ndbcluster_init, ~(uint)0, /* slot */ + /* below are initialized by name in ndbcluster_init() */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }; static handler *ndbcluster_create_handler(TABLE_SHARE *table) @@ -2336,7 +2338,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key, if (generate_scan_filter(m_cond_stack, op)) DBUG_RETURN(ndb_err(trans)); - if (res= define_read_attrs(buf, op)) + if ((res= define_read_attrs(buf, op))) { DBUG_RETURN(res); } @@ -9235,7 +9237,7 @@ char* ha_ndbcluster::get_tablespace_name(THD *thd) { NdbDictionary::Tablespace ts= ndbdict->getTablespace(id); ndberr= ndbdict->getNdbError(); - if(ndberr.classification != ndberror_cl_none) + if(ndberr.classification != NdbError::NoError) goto err; return (my_strdup(ts.getName(), MYF(0))); } |