bk commit into 5.1 tree (stewart:1.2398) BUG#25567

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-24 00:27:19+11:00, stewart@willster.(none) +3 -0
  Bug#25567 records() call performs scan in NDB, performance bug

  mysql-test/r/ndb_basic.result@stripped, 2007-01-24 00:27:13+11:00, stewart@willster.(none)
+6 -6
    from spaces, to tabs. what fun!

  sql/ha_ndbcluster.h@stripped, 2007-01-24 00:27:13+11:00, stewart@willster.(none) +2 -0
    fix estimate_rows_upper_bound() to be correct for NDB

  sql/sql_select.cc@stripped, 2007-01-24 00:27:14+11:00, stewart@willster.(none) +1 -1
    use non-exact records information

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/bug25567

--- 1.480/sql/sql_select.cc	2007-01-17 01:22:20 +11:00
+++ 1.481/sql/sql_select.cc	2007-01-24 00:27:14 +11:00
@@ -2197,7 +2197,7 @@
     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)

--- 1.49/mysql-test/r/ndb_basic.result	2007-01-23 11:25:17 +11:00
+++ 1.50/mysql-test/r/ndb_basic.result	2007-01-24 00:27:13 +11:00
@@ -757,12 +757,12 @@
 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,

--- 1.164/sql/ha_ndbcluster.h	2007-01-05 03:26:01 +11:00
+++ 1.165/sql/ha_ndbcluster.h	2007-01-24 00:27:13 +11:00
@@ -676,6 +676,8 @@
 
   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);