Commit 6731dd63 authored by unknown's avatar unknown
Browse files

Embedded-server related tests fixes 


BitKeeper/deleted/.del-ctype_cp932_notembedded.test~7c748e8e7ae6e7fe:
  Delete: mysql-test/t/ctype_cp932_notembedded.test
mysql-test/r/innodb.result:
  result fixed
mysql-test/r/query_cache.result:
  result fixed
mysql-test/r/query_cache_notembedded.result:
  result fixed
mysql-test/r/sp-error.result:
  result fixed
mysql-test/r/sp.result:
  result fixed
mysql-test/r/view.result:
  result fixed
mysql-test/r/view_grant.result:
  result fixed
mysql-test/t/sp-destruct.test:
  test disabled
mysql-test/t/view.test:
  lines moved to view_grant.test
mysql-test/t/view_grant.test:
  lines moved from view.test
parent c000e8a1

mysql-test/r/ctype_cp932_notembedded.result

0 → 100644
+17 −0
Original line number Diff line number Diff line 
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;

mysql-test/r/innodb.result

+0 −19
Original line number Diff line number Diff line
@@ -2635,25 +2635,6 @@ checksum table t1; 
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;

mysql-test/r/innodb_notembedded.result

0 → 100644
+19 −0
Original line number Diff line number Diff line 
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;

mysql-test/r/query_cache.result

+0 −45
Original line number Diff line number Diff line
@@ -1105,56 +1105,20 @@ 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
@@ -1172,15 +1136,6 @@ s1 
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;

mysql-test/r/query_cache_notembedded.result

+220 −0
Original line number Diff line number Diff line
@@ -94,4 +94,224 @@ a 
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;