Commit d29ecd5e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/bk/mysql-5.0 

into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
parents 0cd95ca6 8ba28aa3

mysql-test/r/ctype_utf8.result

+9 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,15 @@ create table t1 (a varchar(255)) default charset=utf8; 
select * from t1 where find_in_set('-1', a);

a

drop table t1;

create table t1 (a int);

insert into t1 values (48),(49),(50);

set names utf8;

select distinct char(a) from t1;

char(a)

0

1

2

drop table t1;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/r/show_check.result

+7 −0
Original line number Diff line number Diff line
@@ -557,3 +557,10 @@ DROP TABLE tyt2; 
DROP TABLE urkunde;

SHOW TABLES FROM non_existing_database;

ERROR 42000: Unknown database 'non_existing_database'

flush tables;

SHOW TABLE STATUS like 't1';

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	NULL	NULL	NULL	NULL	#	#	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Incorrect information in file: './test/t1.frm'

show create table t1;

ERROR HY000: Incorrect information in file: './test/t1.frm'

drop table t1;

mysql-test/t/ctype_utf8.test

+9 −0
Original line number Diff line number Diff line
@@ -859,6 +859,15 @@ create table t1 (a varchar(255)) default charset=utf8; 
select * from t1 where find_in_set('-1', a);

drop table t1;



#

# Bug#13233: select distinct char(column) fails with utf8

#

create table t1 (a int);

insert into t1 values (48),(49),(50);

set names utf8;

select distinct char(a) from t1;

drop table t1;



# End of 4.1 tests



#

mysql-test/t/show_check.test

+13 −0
Original line number Diff line number Diff line
@@ -386,6 +386,19 @@ create table t1 ( 
SHOW CREATE TABLE t1;

DROP TABLE t1;



# Test for BUG#93: 4.1 protocl crash on corupted frm and SHOW TABLE STATUS



flush tables;



# Create a junk frm file on disk

system echo "this is a junk file for test" >> var/master-data/test/t1.frm ;

--replace_column 6 # 7 # 8 # 9 #

SHOW TABLE STATUS like 't1';

--error 1033

show create table t1;

drop table t1;





# End of 4.1 tests

#

# BUG 12183 -  SHOW OPEN TABLES behavior doesn't match grammar

ndb/include/kernel/signaldata/DumpStateOrd.hpp

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,8 @@ public: 
    StartTcTimer = 2509,

    StopTcTimer = 2510,

    StartPeriodicTcTimer = 2511,

    TcStartDumpIndexOpCount = 2512,

    TcDumpIndexOpCount = 2513,

    CmvmiDumpConnections = 2600,

    CmvmiDumpLongSignalMemory = 2601,

    CmvmiSetRestartOnErrorInsert = 2602,