List:Commits« Previous MessageNext Message »
From:holyfoot Date:January 19 2006 9:25am
Subject:bk commit into 5.1 tree (holyfoot:1.2030)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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
  1.2030 06/01/19 13:25:12 holyfoot@deer.(none) +15 -0
  Embedded-server related tests fixes

  mysql-test/r/subselect_notembedded.result
    1.1 06/01/19 13:25:06 holyfoot@stripped +1 -0

  mysql-test/r/subselect_notembedded.result
    1.0 06/01/19 13:25:06 holyfoot@stripped +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/subselect_notembedded.result

  mysql-test/r/sp_notembedded.result
    1.1 06/01/19 13:25:05 holyfoot@stripped +35 -0

  mysql-test/r/innodb_notembedded.result
    1.1 06/01/19 13:25:05 holyfoot@stripped +19 -0

  mysql-test/r/sp_notembedded.result
    1.0 06/01/19 13:25:05 holyfoot@stripped +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/sp_notembedded.result

  mysql-test/r/innodb_notembedded.result
    1.0 06/01/19 13:25:05 holyfoot@stripped +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/innodb_notembedded.result

  mysql-test/r/ctype_cp932_notembedded.result
    1.1 06/01/19 13:25:04 holyfoot@stripped +17 -0

  mysql-test/t/view_grant.test
    1.10 06/01/19 13:25:04 holyfoot@stripped +9 -0
    lines moved from view.test

  mysql-test/t/view.test
    1.132 06/01/19 13:25:04 holyfoot@stripped +0 -11
    lines moved to view_grant.test

  mysql-test/t/sp-destruct.test
    1.5 06/01/19 13:25:04 holyfoot@stripped +5 -0
    test disabled

  mysql-test/r/view_grant.result
    1.10 06/01/19 13:25:04 holyfoot@stripped +9 -0
    result fixed

  mysql-test/r/view.result
    1.143 06/01/19 13:25:04 holyfoot@stripped +0 -9
    result fixed

  mysql-test/r/sp.result
    1.178 06/01/19 13:25:04 holyfoot@stripped +0 -82
    result fixed

  mysql-test/r/sp-error.result
    1.99 06/01/19 13:25:04 holyfoot@stripped +0 -13
    result fixed

  mysql-test/r/query_cache_notembedded.result
    1.3 06/01/19 13:25:04 holyfoot@stripped +220 -0
    result fixed

  mysql-test/r/query_cache.result
    1.69 06/01/19 13:25:04 holyfoot@stripped +0 -45
    result fixed

  mysql-test/r/innodb.result
    1.154 06/01/19 13:25:04 holyfoot@stripped +0 -19
    result fixed

  mysql-test/r/ctype_cp932_notembedded.result
    1.0 06/01/19 13:25:04 holyfoot@stripped +0 -0
    BitKeeper file /home/hf/work/5.1.emb/mysql-test/r/ctype_cp932_notembedded.result

  BitKeeper/deleted/.del-ctype_cp932_notembedded.test~7c748e8e7ae6e7fe
    1.2 06/01/11 16:19:26 holyfoot@stripped +0 -0
    Delete: mysql-test/t/ctype_cp932_notembedded.test

# 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:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/5.1.emb

--- 1.142/mysql-test/r/view.result	Sat Dec 24 21:06:16 2005
+++ 1.143/mysql-test/r/view.result	Thu Jan 19 13:25:04 2006
@@ -2213,15 +2213,6 @@
 120001a080000542	guser02
 drop view v1, v2;
 drop table t1, t2;
-create definer=some_user@`` sql security invoker view v1 as select 1;
-ERROR HY000: Definer is not fully qualified
-create definer=some_user@localhost sql security invoker view v1 as select 1;
-Warnings:
-Note	1449	There is no 'some_user'@'localhost' registered
-show create view v1;
-View	Create View
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`some_user`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select 1 AS `1`
-drop view v1;
 create table t1 (s1 int);
 create view abc as select * from t1 as abc;
 drop table t1;

--- 1.131/mysql-test/t/view.test	Wed Jan  4 14:28:28 2006
+++ 1.132/mysql-test/t/view.test	Thu Jan 19 13:25:04 2006
@@ -2080,17 +2080,6 @@
 drop table t1, t2;
 
 #
-# DEFINER information check
-#
--- error ER_MALFORMED_DEFINER
-create definer=some_user@`` sql security invoker view v1 as select 1;
---disable_warnings
-create definer=some_user@localhost sql security invoker view v1 as select 1;
---enable_warnings
-show create view v1;
-drop view v1;
-
-#
 # Bug #6808 - Views: CREATE VIEW v ... FROM t AS v fails
 #
 

--- 1.2/mysql-test/r/query_cache_notembedded.result	Thu Aug 11 15:05:53 2005
+++ 1.3/mysql-test/r/query_cache_notembedded.result	Thu Jan 19 13:25:04 2006
@@ -94,4 +94,224 @@
 SELECT * FROM t1;
 a
 drop table t1;
+flush query cache;
+reset query cache;
+flush status;
+create table t1 (s1 int)//
+create procedure f1 () begin
+select sql_cache * from t1;
+select sql_cache * from t1;
+select sql_cache * from t1;
+end;//
+create procedure f2 () begin
+select sql_cache * from t1 where s1=1;
+select sql_cache * from t1;
+end;//
+create procedure f3 () begin
+select sql_cache * from t1;
+select sql_cache * from t1 where s1=1;
+end;//
+create procedure f4 () begin
+select sql_cache * from t1;
+select sql_cache * from t1 where s1=1;
+select sql_cache * from t1;
+select sql_cache * from t1 where s1=1;
+select sql_cache * from t1 where s1=1;
+end;//
+call f1();
+s1
+s1
+s1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	3
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	3
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	0
+call f1();
+s1
+s1
+s1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	3
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	3
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	3
+call f1();
+s1
+s1
+s1
+select sql_cache * from t1;
+s1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	4
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	4
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	6
+insert into t1 values (1);
+select sql_cache * from t1;
+s1
+1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	1
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	5
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	6
+call f1();
+s1
+1
+s1
+1
+s1
+1
+call f1();
+s1
+1
+s1
+1
+s1
+1
+select sql_cache * from t1;
+s1
+1
+show status like "Qcache_queries_in_cache";
+Variable_name	Value
+Qcache_queries_in_cache	4
+show status like "Qcache_inserts";
+Variable_name	Value
+Qcache_inserts	8
+show status like "Qcache_hits";
+Variable_name	Value
+Qcache_hits	10
+flush query cache;
+reset query cache;
+flush status;
+select sql_cache * from t1;
+s1
+1
+select sql_cache * from t1 where s1=1;
+s1
+1
+call f1();
+s1
+1
+s1
+1
+s1
+1
+call f2();
+s1
+1
+s1
+1
+call f3();
+s1
+1
+s1
+1
+call f4();
+s1
+1
+s1
+1
+s1
+1
+s1
+1
+s1
+1
+call f4();
+s1
+1
+s1
+1
+s1
+1
+s1
+1
+s1
+1
+call f3();
+s1
+1
+s1
+1
+call f2();
+s1
+1
+s1
+1
+select sql_cache * from t1 where s1=1;
+s1
+1
+insert into t1 values (2);
+call f1();
+s1
+1
+2
+s1
+1
+2
+s1
+1
+2
+select sql_cache * from t1 where s1=1;
+s1
+1
+select sql_cache * from t1;
+s1
+1
+2
+call f1();
+s1
+1
+2
+s1
+1
+2
+s1
+1
+2
+call f3();
+s1
+1
+2
+s1
+1
+call f3();
+s1
+1
+2
+s1
+1
+call f1();
+s1
+1
+2
+s1
+1
+2
+s1
+1
+2
+drop procedure f1;
+drop procedure f2;
+drop procedure f3;
+drop procedure f4;
+drop table t1;
 set GLOBAL query_cache_size=0;
--- New file ---
+++ mysql-test/r/ctype_cp932_notembedded.result	06/01/19 13:25:04
drop table if exists t1;
set names cp932;
set character_set_database = cp932;
RESET MASTER;
CREATE TABLE t1(f1 blob);
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';
SET @var1= x'8300';
EXECUTE stmt1 USING @var1;
SHOW BINLOG EVENTS FROM 102;
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(f1 blob)
master-bin.000001	#	Table_map	1	#	test.t1
master-bin.000001	#	Write_rows	1	#	
SELECT HEX(f1) FROM t1;
HEX(f1)
8300
DROP table t1;

--- New file ---
+++ mysql-test/r/innodb_notembedded.result	06/01/19 13:25:05
create table t1 (col1 integer primary key, col2 integer) engine=innodb;
insert t1 values (1,100);
create function f1 () returns integer begin
declare var1 int;
select col2 into var1 from t1 where col1=1 for update;
return var1;
end|
start transaction;
select f1();
f1()
100
 update t1 set col2=0 where col1=1;
select * from t1;
col1	col2
1	100
rollback;
rollback;
drop table t1;
drop function f1;

--- New file ---
+++ mysql-test/r/sp_notembedded.result	06/01/19 13:25:05
drop procedure if exists bug4902|
create procedure bug4902()
begin
show grants for 'root'@'localhost';
end|
call bug4902()|
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
call bug4902()|
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
drop procedure bug4902|
drop procedure if exists bug4902_2|
create procedure bug4902_2()
begin
show processlist;
end|
call bug4902_2()|
Id	User	Host	db	Command	Time	State	Info
#	root	localhost	test	Query	#	NULL	show processlist
call bug4902_2()|
Id	User	Host	db	Command	Time	State	Info
#	root	localhost	test	Query	#	NULL	show processlist
drop procedure bug4902_2|
drop function if exists bug5278|
create function bug5278 () returns char
begin
SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('newpass');
return 'okay';
end|
select bug5278()|
ERROR 42000: Can't find any matching row in the user table
select bug5278()|
ERROR 42000: Can't find any matching row in the user table
drop function bug5278|

--- New file ---
+++ mysql-test/r/subselect_notembedded.result	06/01/19 13:25:06
purge master logs before (select adddate(current_timestamp(), interval -4 day));


--- 1.9/mysql-test/r/view_grant.result	Thu Nov 24 08:17:35 2005
+++ 1.10/mysql-test/r/view_grant.result	Thu Jan 19 13:25:04 2006
@@ -520,3 +520,12 @@
 use test;
 drop user mysqltest_1@localhost;
 drop database mysqltest;
+create definer=some_user@`` sql security invoker view v1 as select 1;
+ERROR HY000: Definer is not fully qualified
+create definer=some_user@localhost sql security invoker view v1 as select 1;
+Warnings:
+Note	1449	There is no 'some_user'@'localhost' registered
+show create view v1;
+View	Create View
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`some_user`@`localhost` SQL SECURITY INVOKER VIEW `v1` AS select 1 AS `1`
+drop view v1;

--- 1.9/mysql-test/t/view_grant.test	Thu Nov 24 08:17:35 2005
+++ 1.10/mysql-test/t/view_grant.test	Thu Jan 19 13:25:04 2006
@@ -706,3 +706,12 @@
 disconnect user1;
 disconnect root;
 connection default;
+
+#
+# DEFINER information check
+#
+-- error ER_MALFORMED_DEFINER
+create definer=some_user@`` sql security invoker view v1 as select 1;
+create definer=some_user@localhost sql security invoker view v1 as select 1;
+show create view v1;
+drop view v1;

--- 1.153/mysql-test/r/innodb.result	Thu Dec 22 08:10:53 2005
+++ 1.154/mysql-test/r/innodb.result	Thu Jan 19 13:25:04 2006
@@ -2635,25 +2635,6 @@
 Table	Checksum
 test.t1	2050879373
 drop table t1;
-create table t1 (col1 integer primary key, col2 integer) engine=innodb;
-insert t1 values (1,100);
-create function f1 () returns integer begin
-declare var1 int;
-select col2 into var1 from t1 where col1=1 for update;
-return var1;
-end|
-start transaction;
-select f1();
-f1()
-100
- update t1 set col2=0 where col1=1;
-select * from t1;
-col1	col2
-1	100
-rollback;
-rollback;
-drop table t1;
-drop function f1;
 create table t1 (
 a int, b char(10), c char(10), filler char(10), primary key(a, b(2)), unique key (a, c(2))
 ) character set utf8 engine = innodb;

--- 1.68/mysql-test/r/query_cache.result	Sat Dec  3 10:53:14 2005
+++ 1.69/mysql-test/r/query_cache.result	Thu Jan 19 13:25:04 2006
@@ -1105,56 +1105,20 @@
 s1
 s1
 s1
-show status like "Qcache_queries_in_cache";
-Variable_name	Value
-Qcache_queries_in_cache	3
-show status like "Qcache_inserts";
-Variable_name	Value
-Qcache_inserts	3
-show status like "Qcache_hits";
-Variable_name	Value
-Qcache_hits	0
 call f1();
 s1
 s1
 s1
-show status like "Qcache_queries_in_cache";
-Variable_name	Value
-Qcache_queries_in_cache	3
-show status like "Qcache_inserts";
-Variable_name	Value
-Qcache_inserts	3
-show status like "Qcache_hits";
-Variable_name	Value
-Qcache_hits	3
 call f1();
 s1
 s1
 s1
 select sql_cache * from t1;
 s1
-show status like "Qcache_queries_in_cache";
-Variable_name	Value
-Qcache_queries_in_cache	4
-show status like "Qcache_inserts";
-Variable_name	Value
-Qcache_inserts	4
-show status like "Qcache_hits";
-Variable_name	Value
-Qcache_hits	6
 insert into t1 values (1);
 select sql_cache * from t1;
 s1
 1
-show status like "Qcache_queries_in_cache";
-Variable_name	Value
-Qcache_queries_in_cache	1
-show status like "Qcache_inserts";
-Variable_name	Value
-Qcache_inserts	5
-show status like "Qcache_hits";
-Variable_name	Value
-Qcache_hits	6
 call f1();
 s1
 1
@@ -1172,15 +1136,6 @@
 select sql_cache * from t1;
 s1
 1
-show status like "Qcache_queries_in_cache";
-Variable_name	Value
-Qcache_queries_in_cache	4
-show status like "Qcache_inserts";
-Variable_name	Value
-Qcache_inserts	8
-show status like "Qcache_hits";
-Variable_name	Value
-Qcache_hits	10
 flush query cache;
 reset query cache;
 flush status;

--- 1.98/mysql-test/r/sp-error.result	Wed Dec  7 17:55:08 2005
+++ 1.99/mysql-test/r/sp-error.result	Thu Jan 19 13:25:04 2006
@@ -464,19 +464,6 @@
 call bug3294()|
 ERROR 42S02: Unknown table 't5'
 drop procedure bug3294|
-drop procedure if exists bug6807|
-create procedure bug6807()
-begin
-declare id int;
-set id = connection_id();
-kill query id;
-select 'Not reached';
-end|
-call bug6807()|
-ERROR 70100: Query execution was interrupted
-call bug6807()|
-ERROR 70100: Query execution was interrupted
-drop procedure bug6807|
 drop procedure if exists bug8776_1|
 drop procedure if exists bug8776_2|
 drop procedure if exists bug8776_3|

--- 1.177/mysql-test/r/sp.result	Tue Dec 13 02:53:42 2005
+++ 1.178/mysql-test/r/sp.result	Thu Jan 19 13:25:04 2006
@@ -2075,7 +2075,6 @@
 show databases like 'foo';
 show errors;
 show columns from t1;
-show grants for 'root'@'localhost';
 show keys from t1;
 show open tables like 'foo';
 show privileges;
@@ -2102,8 +2101,6 @@
 Field	Type	Null	Key	Default	Extra
 id	char(16)	NO			
 data	int(11)	NO			
-Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 Database	Table	In_use	Name_locked
 Privilege	Context	Comment
@@ -2156,8 +2153,6 @@
 Field	Type	Null	Key	Default	Extra
 id	char(16)	NO			
 data	int(11)	NO			
-Grants for root@localhost
-GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 Database	Table	In_use	Name_locked
 Privilege	Context	Comment
@@ -2193,18 +2188,6 @@
 Variable_name	Value
 Level	Code	Message
 drop procedure bug4902|
-drop procedure if exists bug4902_2|
-create procedure bug4902_2()
-begin
-show processlist;
-end|
-call bug4902_2()|
-Id	User	Host	db	Command	Time	State	Info
-#	root	localhost	test	Query	#	NULL	show processlist
-call bug4902_2()|
-Id	User	Host	db	Command	Time	State	Info
-#	root	localhost	test	Query	#	NULL	show processlist
-drop procedure bug4902_2|
 drop procedure if exists bug4904|
 create procedure bug4904()
 begin
@@ -2347,52 +2330,6 @@
 NULL
 delete from t1|
 drop procedure bug4941|
-drop procedure if exists bug3583|
-drop procedure if exists bug3583|
-create procedure bug3583()
-begin
-declare c int;
-select * from t1;
-select count(*) into c from t1;
-select c;
-end|
-insert into t1 values ("x", 3), ("y", 5)|
-set @x = @@query_cache_size|
-set global query_cache_size = 10*1024*1024|
-flush status|
-flush query cache|
-show status like 'Qcache_hits'|
-Variable_name	Value
-Qcache_hits	0
-call bug3583()|
-id	data
-x	3
-y	5
-c
-2
-show status like 'Qcache_hits'|
-Variable_name	Value
-Qcache_hits	0
-call bug3583()|
-id	data
-x	3
-y	5
-c
-2
-call bug3583()|
-id	data
-x	3
-y	5
-c
-2
-show status like 'Qcache_hits'|
-Variable_name	Value
-Qcache_hits	2
-set global query_cache_size = @x|
-flush status|
-flush query cache|
-delete from t1|
-drop procedure bug3583|
 drop procedure if exists bug4905|
 create table t3 (s1 int,primary key (s1))|
 drop procedure if exists bug4905|
@@ -2608,17 +2545,6 @@
 id	bug5240()
 answer	42
 drop function bug5240|
-drop function if exists bug5278|
-create function bug5278 () returns char
-begin
-SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('newpass');
-return 'okay';
-end|
-select bug5278()|
-ERROR 42000: Can't find any matching row in the user table
-select bug5278()|
-ERROR 42000: Can't find any matching row in the user table
-drop function bug5278|
 drop procedure if exists p1|
 create table t3(id int)|
 insert into t3 values(1)|
@@ -3983,14 +3909,6 @@
 ERROR HY000: Recursive stored functions and triggers are not allowed.
 call bug10100t(5)|
 ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine bug10100p
-set @@max_sp_recursion_depth=255|
-set @var=1|
-call bug10100p(255, @var)|
-call bug10100pt(1,255)|
-call bug10100pv(1,255)|
-call bug10100pd(1,255)|
-call bug10100pc(1,255)|
-set @@max_sp_recursion_depth=0|
 deallocate prepare stmt2|
 drop function bug10100f|
 drop procedure bug10100p|

--- 1.4/mysql-test/t/sp-destruct.test	Wed Jan  4 14:18:54 2006
+++ 1.5/mysql-test/t/sp-destruct.test	Thu Jan 19 13:25:04 2006
@@ -7,6 +7,11 @@
 # In the case of trouble you might want to skip this.
 #
 
+# embedded server returns different paths in error messages
+# in lines like 'call bug14233();'
+# mysqltest should be fixed to allow REPLACE_RESULT in error message
+-- source include/not_embedded.inc
+
 # We're using --system things that probably doesn't work on Windows.
 --source include/not_windows.inc
 
Thread
bk commit into 5.1 tree (holyfoot:1.2030)holyfoot19 Jan