Commit bd868fb6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337


mysql-test/r/ps_1general.result:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
parents 37a25b53 9a770f53

mysql-test/r/drop.result

+13 −0
Original line number Diff line number Diff line
@@ -74,3 +74,16 @@ show tables; 
Tables_in_test

t1

drop table t1;

drop database if exists mysqltest;

drop table if exists t1;

create table t1 (i int);

lock tables t1 read;

create database mysqltest;

 drop table t1;

show open tables;

 drop database mysqltest;

select 1;

1

1

unlock tables;

End of 5.0 tests

mysql-test/r/ps.result

+882 −0

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/r/ps_1general.result

+0 −12
Original line number Diff line number Diff line
@@ -308,17 +308,11 @@ prepare stmt4 from ' show engine bdb logs '; 
execute stmt4;

prepare stmt4 from ' show grants for user ';

prepare stmt4 from ' show create table t2 ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show master status ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show master logs ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show slave status ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show warnings limit 20 ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show errors limit 20 ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' show storage engines ';

execute stmt4;

drop table if exists t5;
@@ -387,10 +381,8 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp 
prepare stmt4 from ' use test ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt3 from ' create database mysqltest ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

create database mysqltest ;

prepare stmt3 from ' drop database mysqltest ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

drop database mysqltest ;

prepare stmt3 from ' describe t2 ';

execute stmt3;
@@ -412,7 +404,6 @@ execute stmt1 ; 
prepare stmt1 from ' optimize table t1 ' ;

prepare stmt1 from ' analyze table t1 ' ;

prepare stmt1 from ' checksum table t1 ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' repair table t1 ' ;

prepare stmt1 from ' restore table t1 from ''data.txt'' ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet
@@ -440,11 +431,8 @@ execute stmt5; 
1

SET sql_mode="";

prepare stmt1 from ' flush local privileges ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' reset query cache ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' KILL 0 ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' explain select a from t1 order by b ';

execute stmt1;

Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr

mysql-test/r/ps_grant.result

+0 −3
Original line number Diff line number Diff line
@@ -78,13 +78,10 @@ ERROR 42000: There is no such grant defined for user 'second_user' on host 'loca 
drop database mysqltest;

prepare stmt3 from ' grant all on test.t1 to drop_user@localhost

identified by ''looser'' ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

grant all on test.t1 to drop_user@localhost

identified by 'looser' ;

prepare stmt3 from ' revoke all privileges on test.t1 from 

drop_user@localhost ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

revoke all privileges on test.t1 from drop_user@localhost ;

prepare stmt3 from ' drop user drop_user@localhost ';

ERROR HY000: This command is not supported in the prepared statement protocol yet

drop user drop_user@localhost;

mysql-test/r/sp-dynamic.result

+2 −2
Original line number Diff line number Diff line
@@ -284,11 +284,11 @@ call p1()| 
select * from t1|

id	stmt_text	status

1	select 1	supported

2	flush tables	not supported

2	flush tables	supported

3	handler t1 open as ha	not supported

4	analyze table t1	supported

5	check table t1	not supported

6	checksum table t1	not supported

6	checksum table t1	supported

7	check table t1	not supported

8	optimize table t1	supported

9	repair table t1	supported