Commit 99f5b6d1 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jimw/my/mysql-5.0-clean
parents 66e6808e e2e40c76

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ gerberb@ou800.zenez.com 
gluh@eagle.intranet.mysql.r18.ru

gluh@gluh.(none)

gluh@gluh.mysql.r18.ru

gluh@mysql.com

gordon@zero.local.lan

greg@gcw.ath.cx

greg@mysql.com

innobase/row/row0sel.c

+3 −1
Original line number Diff line number Diff line
@@ -2364,7 +2364,9 @@ row_sel_field_store_in_mysql_format( 


		ut_a(templ->mbmaxlen > templ->mbminlen

			|| templ->mysql_col_len == len);

		ut_a(!templ->mbmaxlen

		/* The following assertion would fail for old tables

		containing UTF-8 ENUM columns due to Bug #9526. */

		ut_ad(!templ->mbmaxlen

			|| !(templ->mysql_col_len % templ->mbmaxlen));

		ut_a(len * templ->mbmaxlen >= templ->mysql_col_len);

mysql-test/r/information_schema.result

+27 −18
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ mysql 
test

show databases where `database` = 't%';

Database

create database testtets;

create table testtets.t1(a int, b VARCHAR(30), KEY string_data (b));

create database mysqltest;

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 testtets.t4(a int);

create table mysqltest.t4(a int);

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

select * from v1;

c
@@ -62,11 +62,11 @@ time_zone_name 
time_zone_transition

time_zone_transition_type

user

t1

t4

t2

t3

v1

t1

t4

select c,table_name from v1 

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

where v1.c like "t%";
@@ -80,10 +80,10 @@ time_zone_leap_second time_zone_leap_second 
time_zone_name	time_zone_name

time_zone_transition	time_zone_transition

time_zone_transition_type	time_zone_transition_type

t2	t2

t3	t3

t1	t1

t4	t4

t2	t2

t3	t3

select c, v2.table_name from v1

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

where v1.c like "t%";
@@ -97,18 +97,18 @@ time_zone_leap_second time_zone_leap_second 
time_zone_name	time_zone_name

time_zone_transition	time_zone_transition

time_zone_transition_type	time_zone_transition_type

t2	t2

t3	t3

t1	t1

t4	t4

t2	t2

t3	t3

select table_name from information_schema.TABLES

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

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

table_name

t1

t4

select * from information_schema.STATISTICS where TABLE_SCHEMA = "testtets";

select * from information_schema.STATISTICS where TABLE_SCHEMA = "mysqltest";

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	NON_UNIQUE	INDEX_SCHEMA	INDEX_NAME	SEQ_IN_INDEX	COLUMN_NAME	COLLATION	CARDINALITY	SUB_PART	PACKED	NULLABLE	INDEX_TYPE	COMMENT

NULL	testtets	t1	1	testtets	string_data	1	b	A	NULL	NULL	NULL	YES	BTREE	

NULL	mysqltest	t1	1	mysqltest	string_data	1	b	A	NULL	NULL	NULL	YES	BTREE	

show keys from t3 where Key_name = "a_data";

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

t3	1	a_data	1	a	A	NULL	NULL	NULL	YES	BTREE
@@ -133,13 +133,22 @@ c varchar(64) utf8_general_ci NO select,insert,update,references 
select * from information_schema.COLUMNS where table_name="t1"

and column_name= "a";

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	COLUMN_DEFAULT	IS_NULLABLE	DATA_TYPE	CHARACTER_MAXIMUM_LENGTH	CHARACTER_OCTET_LENGTH	NUMERIC_PRECISION	NUMERIC_SCALE	CHARACTER_SET_NAME	COLLATION_NAME	COLUMN_TYPE	COLUMN_KEY	EXTRA	PRIVILEGES	COLUMN_COMMENT

NULL	testtets	t1	a	1	NULL	YES	int	NULL	NULL	11	0	NULL	NULL	int(11)			select,insert,update,references	

show columns from testtets.t1 where field like "%a%";

NULL	mysqltest	t1	a	1	NULL	YES	int	NULL	NULL	11	0	NULL	NULL	int(11)			select,insert,update,references	

show columns from mysqltest.t1 where field like "%a%";

Field	Type	Null	Key	Default	Extra

a	int(11)	YES		NULL	

grant select (a) on mysqltest.t1 to mysqltest_2@localhost;

select table_name, column_name, privileges from information_schema.columns 

where table_schema = 'mysqltest' and table_name = 't1';

table_name	column_name	privileges

t1	a	select

show columns from mysqltest.t1;

Field	Type	Null	Key	Default	Extra

a	int(11)	YES		NULL	

b	varchar(30)	YES	MUL	NULL	

drop view v1;

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

drop database testtets;

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

drop database mysqltest;

select * from information_schema.CHARACTER_SETS

where CHARACTER_SET_NAME like 'latin1%';

CHARACTER_SET_NAME	DEFAULT_COLLATE_NAME	DESCRIPTION	MAXLEN
@@ -352,8 +361,8 @@ GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME PRIVILEGE_TYPE IS_GRAN 
'mysqltest_1'@'localhost'	NULL	test	t1	a	REFERENCES	NO

delete from mysql.user where user='mysqltest_1' or user='mysqltest_2';

delete from mysql.db where user='mysqltest_1' or user='mysqltest_2';

delete from mysql.tables_priv where user='mysqltest_1';

delete from mysql.columns_priv where user='mysqltest_1';

delete from mysql.tables_priv where user='mysqltest_1' or user='mysqltest_2';

delete from mysql.columns_priv where user='mysqltest_1' or user='mysqltest_2';

flush privileges;

drop table t1;

create table t1 (a int null, primary key(a));

mysql-test/r/ps.result

+18 −0
Original line number Diff line number Diff line
@@ -524,3 +524,21 @@ execute stmt using @a, @b, @c; 
a	b	c	a	b	c

deallocate prepare stmt;

drop table t1,t2;

SET @aux= "SELECT COUNT(*)

                FROM INFORMATION_SCHEMA.COLUMNS A,

                INFORMATION_SCHEMA.COLUMNS B

                WHERE A.TABLE_SCHEMA = B.TABLE_SCHEMA

                AND A.TABLE_NAME = B.TABLE_NAME

                AND A.COLUMN_NAME = B.COLUMN_NAME AND

                A.TABLE_NAME = 'user'";

prepare my_stmt from @aux;

execute my_stmt;

COUNT(*)

37

execute my_stmt;

COUNT(*)

37

execute my_stmt;

COUNT(*)

37

deallocate prepare my_stmt;

mysql-test/r/type_bit.result

+3 −0
Original line number Diff line number Diff line
@@ -377,3 +377,6 @@ hex(concat(a)) hex(concat(b)) 
07	0FFE

01	01FF

drop table t1;

create table t1(a int, b bit not null);

alter table t1 add primary key (a);

drop table t1;