Commit f52e64cc authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into serg.mylan:/usr/home/serg/Abk/mysql-5.0
parents 59c396e3 26fe3289

mysql-test/r/strict.result

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ col1 col2 
-9223372036854775808	0

9223372036854775807	18446744073709551615

-9223372036854773760	0

-9223372036854775808	1844674407370953984

9223372036854775807	1844674407370953984

-9223372036854775808	NULL

-9223372036854775808	NULL

NULL	18446744073709551615

mysql-test/r/view.result

+4 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ create temporary table t1 (a int, b int); 
create view v1 (c) as select b+1 from t1;

ERROR HY000: View's SELECT contains a temporary table 't1'

drop table t1;

create table t1 (a int, b int) max_rows=1000000;

create table t1 (a int, b int);

insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);

create view v1 (c,d) as select a,b+@@global.max_user_connections from t1;

ERROR HY000: View's SELECT contains a variable or parameter
@@ -149,7 +149,7 @@ v5 VIEW 
v6	VIEW

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Fixed	5	9	45	150994943	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL	max_rows=1000000	

t1	MyISAM	9	Fixed	5	9	45	38654705663	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

v1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view

v2	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view

v3	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	view
@@ -1213,14 +1213,14 @@ select * from v1; 
drop view v1;

drop table t1;

create function x1 () returns int return 5;

create table t1 (s1 int) max_rows=1000000;

create table t1 (s1 int);

create view v1 as select x1() from t1;

drop function x1;

select * from v1;

ERROR 42000: FUNCTION test.x1 does not exist

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	MyISAM	9	Fixed	0	0	0	83886079	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL	max_rows=1000000	

t1	MyISAM	9	Fixed	0	0	0	21474836479	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

v1	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	#	#	NULL	NULL	NULL	NULL	FUNCTION test.x1 does not exist

drop view v1;

drop table t1;

mysql-test/t/information_schema.test

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ show tables like 't%'; 
--replace_column 15 # 16 #

show tables * from test where table_name like 't%';

--replace_column 12 # 13 #

--replace_result "2147483647	" "21474836479	"

show table status;

show full columns from t3 like "a%";

show full columns from mysql.db like "Insert%";

mysql-test/t/ps_1general.test

+2 −0
Original line number Diff line number Diff line
@@ -294,12 +294,14 @@ execute stmt4; 
prepare stmt4 from ' show table status from test like ''t2%'' ';

# egalize date and time values

--replace_column 12 # 13 # 14 #

--replace_result 2147483647 64424509439

# Bug#4288 : prepared statement 'show table status ..', wrong output on execute

execute stmt4;

# try the same with the big table

prepare stmt4 from ' show table status from test like ''t9%'' ';

# egalize date and time values

--replace_column 12 # 13 # 14 #

--replace_result 2147483647 4294967295

# Bug#4288

execute stmt4;

prepare stmt4 from ' show status like ''Threads_running'' ';

mysql-test/t/view.test

+4 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ create temporary table t1 (a int, b int); 
create view v1 (c) as select b+1 from t1;

drop table t1;



create table t1 (a int, b int) max_rows=1000000;

create table t1 (a int, b int);

insert into t1 values (1,2), (1,3), (2,4), (2,5), (3,10);



# view with variable
@@ -84,6 +84,7 @@ explain extended select c from v6; 
show tables;

show full tables;

--replace_column 12 # 13 #

--replace_result 2147483647 38654705663

show table status;



drop view v1,v2,v3,v4,v5,v6;
@@ -1165,12 +1166,13 @@ drop table t1; 
# VIEW over dropped function

#

create function x1 () returns int return 5;

create table t1 (s1 int) max_rows=1000000;

create table t1 (s1 int);

create view v1 as select x1() from t1;

drop function x1;

-- error 1305

select * from v1;

--replace_column 12 # 13 #

--replace_result "2147483647	" "21474836479	"

show table status;

drop view v1;

drop table t1;