diff options
| -rw-r--r-- | mysql-test/r/ndb_basic.result | 12 | ||||
| -rw-r--r-- | sql/ha_ndbcluster.h | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/mysql-test/r/ndb_basic.result b/mysql-test/r/ndb_basic.result index ec7f8186c49..b4a55641e80 100644 --- a/mysql-test/r/ndb_basic.result +++ b/mysql-test/r/ndb_basic.result @@ -757,12 +757,12 @@ PRIMARY KEY (b,c)) ENGINE=ndbcluster; INSERT INTO t1 VALUES ("a","ab","abc"),("b","abc","abcd"),("c","abc","ab"),("d","ab","ab"),("e","abc","abc"); SELECT * FROM t1 ORDER BY a; -a b c -a ab abc -b abc abcd -c abc ab -d ab ab -e abc abc +a b c +a ab abc +b abc abcd +c abc ab +d ab ab +e abc abc DROP TABLE t1; End of 5.0 tests CREATE TABLE t1 (a VARCHAR(255) NOT NULL, diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 50f24c7a4cf..5b6900766b6 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -676,6 +676,8 @@ class ha_ndbcluster: public handler bool get_error_message(int error, String *buf); ha_rows records(); + ha_rows estimate_rows_upper_bound() + { return HA_POS_ERROR; } int info(uint); void get_dynamic_partition_info(PARTITION_INFO *stat_info, uint part_id); int extra(enum ha_extra_function operation); diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7715575d65b..919024ba457 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2197,7 +2197,7 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds, s->key_dependent= 0; if (tables->schema_table) table->file->stats.records= 2; - table->quick_condition_rows= table->file->records(); + table->quick_condition_rows= table->file->stats.records; s->on_expr_ref= &tables->on_expr; if (*s->on_expr_ref) |