database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

post merge fixes (from merging test fixes from bug 19914)

Browse Source
This commit is contained in:
stewart@willster.(none)
2006-10-25 20:37:10 +10:00
parent d5810cd067
commit 1f05ac4ac3
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/ndb_multi.result
View File

@ -35,6 +35,10 @@ a
select * from t1; select * from t1;
a a
2 2
flush status;
select * from t1;
a
2
update t1 set a=3 where a=2; update t1 set a=3 where a=2;
show status like 'handler_discover%'; show status like 'handler_discover%';
Variable_name Value Variable_name Value

15
sql/ha_ndbcluster.cc
View File

@ -449,16 +449,13 @@ ha_rows ha_ndbcluster::records()
Ndb *ndb= get_ndb(); Ndb *ndb= get_ndb();
ndb->setDatabaseName(m_dbname); ndb->setDatabaseName(m_dbname);
struct Ndb_statistics stat; struct Ndb_statistics stat;
if (ndb_get_table_statistics(ndb, m_table, &stat) == 0) if (ndb_get_table_statistics(this, true, ndb, m_table, &stat) == 0)
{ {
retval= stat.row_count; retval= stat.row_count;
} }
else else
{ {
/** DBUG_RETURN(HA_POS_ERROR);
* Be consistent with BUG#19914 until we fix it properly
*/
DBUG_RETURN(-1);
} }
THD *thd= current_thd; THD *thd= current_thd;
@ -5760,8 +5757,10 @@ int ha_ndbcluster::open(const char *name, int mode, uint test_if_locked)
Ndb *ndb= get_ndb(); Ndb *ndb= get_ndb();
ndb->setDatabaseName(m_dbname); ndb->setDatabaseName(m_dbname);
struct Ndb_statistics stat; struct Ndb_statistics stat;
res= ndb_get_table_statistics(NULL, false, ndb, m_tabname, &stat); res= ndb_get_table_statistics(NULL, false, ndb, m_table, &stat);
records= stat.row_count; stats.mean_rec_length= stat.row_size;
stats.data_file_length= stat.fragment_memory;
stats.records= stat.row_count;
if(!res) if(!res)
res= info(HA_STATUS_CONST); res= info(HA_STATUS_CONST);
} }
@ -6829,7 +6828,7 @@ ha_ndbcluster::records_in_range(uint inx, key_range *min_key,
else else
{ {
Ndb_statistics stat; Ndb_statistics stat;
if ((res=ndb_get_table_statistics(ndb, m_table, &stat)) != 0) if ((res=ndb_get_table_statistics(this, true, ndb, m_table, &stat)) != 0)
break; break;
table_rows=stat.row_count; table_rows=stat.row_count;
DBUG_PRINT("info", ("use db row_count: %llu", table_rows)); DBUG_PRINT("info", ("use db row_count: %llu", table_rows));