Commit 8103db27 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/dlenev/src/mysql-5.0-is


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
mysql-test/r/sp.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge
sql/sql_class.h:
  Manual merge
parents 807a9c8d 39fda600

mysql-test/r/alter_table.result

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ INSERT INTO t1 VALUES ('localhost','root'),('localhost',''),('games','monty'); 
SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	3	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

ALTER TABLE t1 ENABLE KEYS;

UNLOCK TABLES;

CHECK TABLES t1;
@@ -338,7 +338,7 @@ INSERT INTO t1 VALUES ('localhost','root'),('localhost',''); 
SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	Host	A	NULL	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	2	NULL	NULL		BTREE	

t1	0	PRIMARY	2	User	A	0	NULL	NULL		BTREE	

t1	1	Host	1	Host	A	NULL	NULL	NULL		BTREE	disabled

ALTER TABLE t1 ENABLE KEYS;

SHOW INDEX FROM t1;

mysql-test/r/information_schema.result

+10 −2
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t0,t1,t2;

DROP TABLE IF EXISTS t0,t1,t2,t3,t5;

show variables where variable_name like "skip_show_database";

Variable_name	Value

skip_show_database	OFF
@@ -30,6 +30,8 @@ create table mysqltest.t1(a int, b VARCHAR(30), KEY string_data (b)); 
create table test.t2(a int);

create table t3(a int, KEY a_data (a));

create table mysqltest.t4(a int);

create table t5 (id int auto_increment primary key);

insert into t5 values (10);

create view v1 (c) as select table_name from information_schema.TABLES;

select * from v1;

c
@@ -70,6 +72,7 @@ t1 
t4

t2

t3

t5

v1

select c,table_name from v1 

inner join information_schema.TABLES v2 on (v1.c=v2.table_name)
@@ -89,6 +92,7 @@ t1 t1 
t4	t4

t2	t2

t3	t3

t5	t5

select c,table_name from v1 

left join information_schema.TABLES v2 on (v1.c=v2.table_name)

where v1.c like "t%";
@@ -107,6 +111,7 @@ t1 t1 
t4	t4

t2	t2

t3	t3

t5	t5

select c, v2.table_name from v1

right join information_schema.TABLES v2 on (v1.c=v2.table_name)

where v1.c like "t%";
@@ -125,6 +130,7 @@ t1 t1 
t4	t4

t2	t2

t3	t3

t5	t5

select table_name from information_schema.TABLES

where table_schema = "mysqltest" and table_name like "t%";

table_name
@@ -140,10 +146,12 @@ show tables like 't%'; 
Tables_in_test (t%)

t2

t3

t5

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

t2	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

t3	MyISAM	10	Fixed	0	0	0	#	1024	0	NULL	#	#	NULL	latin1_swedish_ci	NULL		

t5	MyISAM	10	Fixed	1	7	7	#	2048	0	11	#	#	NULL	latin1_swedish_ci	NULL		

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

show full columns from t3 like "a%";

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment
@@ -177,7 +185,7 @@ where table_schema = 'mysqltest' and table_name = 'v1'; 
table_name	column_name	privileges

v1	c	select

drop view v1, mysqltest.v1;

drop tables mysqltest.t4, mysqltest.t1, t2, t3;

drop tables mysqltest.t4, mysqltest.t1, t2, t3, t5;

drop database mysqltest;

select * from information_schema.CHARACTER_SETS

where CHARACTER_SET_NAME like 'latin1%';

mysql-test/r/sp.result

+9 −0
Original line number Diff line number Diff line
@@ -3076,4 +3076,13 @@ v1 v2 v3 v4 v5 v6 v7 
						NULL

drop procedure bug8692|

drop table t3|

drop function if exists bug10055|

create function bug10055(v char(255)) returns char(255) return lower(v)|

select t.column_name, bug10055(t.column_name)

from information_schema.columns as t

where t.table_schema = 'test' and t.table_name = 't1'|

column_name	bug10055(t.column_name)

id	id

data	data

drop function bug10055|

drop table t1,t2;

mysql-test/t/information_schema.test

+4 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# show databases



--disable_warnings

DROP TABLE IF EXISTS t0,t1,t2;

DROP TABLE IF EXISTS t0,t1,t2,t3,t5;

--enable_warnings
@@ -30,6 +30,8 @@ create table mysqltest.t1(a int, b VARCHAR(30), KEY string_data (b)); 
create table test.t2(a int);

create table t3(a int, KEY a_data (a));

create table mysqltest.t4(a int);

create table t5 (id int auto_increment primary key);

insert into t5 values (10);

create view v1 (c) as select table_name from information_schema.TABLES;

select * from v1;
@@ -76,7 +78,7 @@ where table_schema = 'mysqltest' and table_name = 'v1'; 
connection default;



drop view v1, mysqltest.v1;

drop tables mysqltest.t4, mysqltest.t1, t2, t3;

drop tables mysqltest.t4, mysqltest.t1, t2, t3, t5;

drop database mysqltest;



# Test for information_schema.CHARACTER_SETS &

mysql-test/t/sp.test

+14 −0
Original line number Diff line number Diff line
@@ -3853,6 +3853,20 @@ call bug8692()| 
drop procedure bug8692|

drop table t3|



#

# Bug#10055 "Using stored function with information_schema causes empty

#            result set"

#

--disable_warnings

drop function if exists bug10055|

--enable_warnings

create function bug10055(v char(255)) returns char(255) return lower(v)|

# This select should not crash server and should return all fields in t1

select t.column_name, bug10055(t.column_name)

from information_schema.columns as t

where t.table_schema = 'test' and t.table_name = 't1'|

drop function bug10055|



#

# BUG#NNNN: New bug synopsis

#