bk commit into 5.0 tree (evgen:1.2262) BUG#21261

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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, 2006-08-17 18:50:53+04:00, evgen@stripped +3 -0
  ndb_condition_pushdown.result:
    Corrected test case result after fix for bug#18165
  view.result, view.test:
    Corrected test case for bug#21261

  mysql-test/r/ndb_condition_pushdown.result@stripped, 2006-08-17 18:49:48+04:00,
evgen@stripped +2 -2
    Corrected test case result after fix for bug#18165

  mysql-test/r/view.result@stripped, 2006-08-17 18:49:30+04:00, evgen@stripped +2 -0
    Corrected test case for bug#21261

  mysql-test/t/view.test@stripped, 2006-08-17 18:49:02+04:00, evgen@stripped +2 -0
    Corrected test case for bug#21261

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/21261-bug-5.0-mysql

--- 1.171/mysql-test/r/view.result	2006-08-17 18:50:56 +04:00
+++ 1.172/mysql-test/r/view.result	2006-08-17 18:50:56 +04:00
@@ -2851,6 +2851,7 @@
 DROP TABLE t1;
 DROP VIEW IF EXISTS v1;
 CREATE DATABASE bug21261DB;
+USE bug21261DB;
 CREATE TABLE t1 (x INT);
 CREATE SQL SECURITY INVOKER VIEW v1 AS SELECT x FROM t1;
 GRANT INSERT, UPDATE ON v1 TO 'user21261'@'localhost';
@@ -2869,6 +2870,7 @@
 DROP VIEW v1;
 DROP TABLE t1;
 DROP DATABASE bug21261DB;
+USE test;
 create table t1 (f1 datetime);
 create view v1 as select * from t1 where f1 between now() and now() + interval 1 minute;
 show create view v1;

--- 1.156/mysql-test/t/view.test	2006-08-17 18:50:56 +04:00
+++ 1.157/mysql-test/t/view.test	2006-08-17 18:50:56 +04:00
@@ -2723,6 +2723,7 @@
 # Bug #21261: Wrong access rights was required for an insert to a view
 #
 CREATE DATABASE bug21261DB;
+USE bug21261DB;
 CONNECT (root,localhost,root,,bug21261DB);
 CONNECTION root;
 
@@ -2748,6 +2749,7 @@
 DROP VIEW v1;
 DROP TABLE t1;
 DROP DATABASE bug21261DB;
+USE test;
 
 #
 # Bug #15950: NOW() optimized away in VIEWs

--- 1.20/mysql-test/r/ndb_condition_pushdown.result	2006-08-17 18:50:56 +04:00
+++ 1.21/mysql-test/r/ndb_condition_pushdown.result	2006-08-17 18:50:56 +04:00
@@ -1307,7 +1307,7 @@
 ('1901-01-01 01:01:01' between date_time and date_time) 
 order by auto;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where with pushed condition; Using filesort
+1	SIMPLE	t1	range	medium_index	medium_index	3	NULL	10	Using where with pushed condition;
Using filesort
 select auto from t1 where
 ("aaaa" between string and string) and 
 ("aaaa" between vstring and vstring) and 
@@ -1409,7 +1409,7 @@
 ('1901-01-01 01:01:01' not between date_time and date_time) 
 order by auto;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using where with pushed condition; Using filesort
+1	SIMPLE	t1	range	medium_index	medium_index	3	NULL	20	Using where with pushed condition;
Using filesort
 select auto from t1 where
 ("aaaa" not between string and string) and 
 ("aaaa" not between vstring and vstring) and