List:Commits« Previous MessageNext Message »
From:jonas oreland Date:June 25 2011 3:23pm
Subject:bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
(jonas.oreland:3517 to 3519)
View as plain text  
 3519 jonas oreland	2011-06-25 [merge]
      ndb - merge 70-main

    modified:
      mysql-test/suite/funcs_1/r/ndb_views.result
      sql/ha_ndb_index_stat.cc
 3518 jonas oreland	2011-06-25
      ndb - update result file in ndb_blob after merge of maintained row-estimates

    modified:
      mysql-test/suite/ndb/r/ndb_blob.result
 3517 Jan Wedvik	2011-06-24 [merge]
      Merged from mysql-5.1-telco-7.0 .

    added:
      mysql-test/suite/ndb/r/ndb_row_count.result
      mysql-test/suite/ndb/t/ndb_row_count.test
    modified:
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_index_unique.result
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
=== modified file 'mysql-test/suite/funcs_1/r/ndb_views.result'
--- a/mysql-test/suite/funcs_1/r/ndb_views.result	2009-10-27 16:44:30 +0000
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result	2011-06-25 14:19:31 +0000
@@ -21439,7 +21439,7 @@ f1
 1.000
 EXPLAIN SELECT * FROM test3.v32;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	1	
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	
 DROP VIEW test3.v0;
 SHOW CREATE VIEW test3.v32;
 View	Create View	character_set_client	collation_connection

=== modified file 'mysql-test/suite/ndb/r/ndb_blob.result'
--- a/mysql-test/suite/ndb/r/ndb_blob.result	2010-03-03 10:47:45 +0000
+++ b/mysql-test/suite/ndb/r/ndb_blob.result	2011-06-25 15:17:42 +0000
@@ -244,7 +244,7 @@ insert into t1 values(9,'b9',999,'dd9');
 commit;
 explain select * from t1 where c >= 100 order by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	c	PRIMARY	4	NULL	#	Using where with pushed condition
+1	SIMPLE	t1	range	c	c	4	NULL	#	Using where with pushed condition; Using filesort
 select * from t1 where c >= 100 order by a;
 a	b	c	d
 1	b1	111	dd1

=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-22 07:37:51 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-06-25 15:07:07 +0000
@@ -1084,10 +1084,10 @@ ndb_index_stat_proc_idle(Ndb_index_stat_
   const time_t check_wait=
     st->check_time == 0 ? 0 : st->check_time + check_delay - pr.now;
 
-  DBUG_PRINT("index_stat", ("st %s check wait:%ds force update:%u"
-                            " clean wait:%ds cache clean:%d",
-                            st->id, check_wait, st->force_update,
-                            clean_wait, st->cache_clean));
+  DBUG_PRINT("index_stat", ("st %s check wait:%lds force update:%u"
+                            " clean wait:%lds cache clean:%d",
+                            st->id, (long)check_wait, st->force_update,
+                            (long)clean_wait, st->cache_clean));
 
   if (!st->cache_clean && clean_wait <= 0)
   {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch(jonas.oreland:3517 to 3519) jonas oreland25 Jun