Commit 3daeb40f authored by kaa@kaamos.(none)'s avatar kaa@kaamos.(none)
Browse files

Merge kaamos.(none):/data/src/mysql-5.0 

into  kaamos.(none):/data/src/opt/mysql-5.0-opt
parents 23d670c3 f41a5edf

mysql-test/r/bdb.result

+1 −0
Original line number Diff line number Diff line
@@ -1325,6 +1325,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/create.result

+14 −0
Original line number Diff line number Diff line
@@ -1532,4 +1532,18 @@ Handler_read_prev 0 
Handler_read_rnd	0

Handler_read_rnd_next	7

drop table t1,t2;

CREATE TABLE t1(c1 VARCHAR(33), KEY USING BTREE (c1));

DROP TABLE t1;

CREATE TABLE t1(c1 VARCHAR(33), KEY (c1) USING BTREE);

DROP TABLE t1;

CREATE TABLE t1(c1 VARCHAR(33), KEY USING BTREE (c1) USING HASH) ENGINE=MEMORY;

SHOW INDEX FROM t1;

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

t1	1	c1	1	c1	NULL	0	NULL	NULL	YES	HASH	

DROP TABLE t1;

CREATE TABLE t1(c1 VARCHAR(33), KEY USING HASH (c1) USING BTREE) ENGINE=MEMORY;

SHOW INDEX FROM t1;

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

t1	1	c1	1	c1	A	NULL	NULL	NULL	YES	BTREE	

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/grant3.result

+17 −0
Original line number Diff line number Diff line
@@ -138,3 +138,20 @@ SELECT user, host, db, select_priv FROM mysql.db where user = 'CUser2' order by 
user	host	db	select_priv

DROP USER CUser2@localhost;

DROP USER CUser2@LOCALHOST;

CREATE DATABASE mysqltest_1;

CREATE TABLE mysqltest_1.t1 (a INT);

CREATE USER 'mysqltest1'@'%';

GRANT SELECT, UPDATE ON `mysqltest_1`.* TO 'mysqltest1'@'%';

REVOKE SELECT ON `mysqltest_1`.* FROM 'mysqltest1'@'%';

GRANT SELECT, UPDATE ON `mysqltest\_1`.* TO 'mysqltest1'@'%';

FLUSH PRIVILEGES;

SHOW GRANTS;

Grants for mysqltest1@%

GRANT USAGE ON *.* TO 'mysqltest1'@'%'

GRANT SELECT, UPDATE ON `mysqltest\_1`.* TO 'mysqltest1'@'%'

GRANT UPDATE ON `mysqltest_1`.* TO 'mysqltest1'@'%'

SELECT * FROM mysqltest_1.t1;

a

DROP USER 'mysqltest1'@'%';

DROP DATABASE mysqltest_1;

End of 5.0 tests

mysql-test/r/heap.result

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/innodb.result

+1 −0
Original line number Diff line number Diff line
@@ -1901,6 +1901,7 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *