Commit d7c7060d authored by unknown's avatar unknown
Browse files

Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
parents 0e415583 702a25dd

mysql-test/r/csv.result

+21 −5
Original line number Diff line number Diff line
@@ -5210,16 +5210,32 @@ create table bug22080_3 (id int,string varchar(64)) Engine=CSV; 
insert into bug22080_1 values(1,'string');

insert into bug22080_1 values(2,'string');

insert into bug22080_1 values(3,'string');

"1","string"

1,"string"

2","string"

"3","string"

3,"string"

check table bug22080_2;

Table	Op	Msg_type	Msg_text

test.bug22080_2	check	error	Corrupt

"1","string"

"2",string"

"3","string"

1,"string"

2,"string"

3,"string"

check table bug22080_3;

Table	Op	Msg_type	Msg_text

test.bug22080_3	check	error	Corrupt

drop tables bug22080_1,bug22080_2,bug22080_3;

create table float_test (id float,string varchar(64)) Engine=CSV;

insert into float_test values(1.0,'string');

insert into float_test values(2.23,'serg.g');

insert into float_test values(0.03,'string');

insert into float_test values(0.19,'string');

insert into float_test values(.67,'string');

insert into float_test values(9.67,'string');

select * from float_test;

id	string

1	string

2.23	serg.g

0.03	string

0.19	string

0.67	string

9.67	string

drop table float_test;

mysql-test/r/warnings.result

+2 −2
Original line number Diff line number Diff line
@@ -166,10 +166,10 @@ show variables like 'max_error_count'; 
Variable_name	Value

max_error_count	10

drop table t1;

create table t1 (id int) engine=NDB;

create table t1 (id int) engine=Innodb;

Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

alter table t1 engine=NDB;

alter table t1 engine=Innodb;

Warnings:

Warning	1266	Using storage engine MyISAM for table 't1'

drop table t1;

mysql-test/t/csv.test

+15 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ insert into bug22080_1 values(2,'string'); 
insert into bug22080_1 values(3,'string');



# Currupt the file as described in the bug report

--exec sed -e 's/"2"/2"/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV

--exec sed -e 's/2/2"/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV

--exec sed -e 's/2","/2",/' $MYSQLTEST_VARDIR/master-data/test/bug22080_1.CSV > $MYSQLTEST_VARDIR/master-data/test/bug22080_3.CSV



--exec cat $MYSQLTEST_VARDIR/master-data/test/bug22080_2.CSV
@@ -1605,3 +1605,17 @@ check table bug22080_2; 
check table bug22080_3;



drop tables bug22080_1,bug22080_2,bug22080_3;



#

# Testing float type

#

create table float_test (id float,string varchar(64)) Engine=CSV;

insert into float_test values(1.0,'string');

insert into float_test values(2.23,'serg.g');

insert into float_test values(0.03,'string');

insert into float_test values(0.19,'string');

insert into float_test values(.67,'string');

insert into float_test values(9.67,'string');

select * from float_test;



drop table float_test;

mysql-test/t/warnings-master.opt

+1 −0
Original line number Diff line number Diff line 
--skip-innodb

mysql-test/t/warnings.test

+2 −4
Original line number Diff line number Diff line
@@ -113,8 +113,8 @@ show variables like 'max_error_count'; 
# Test for handler type

#

drop table t1;

create table t1 (id int) engine=NDB;

alter table t1 engine=NDB;

create table t1 (id int) engine=Innodb;

alter table t1 engine=Innodb;

drop table t1;



#
@@ -150,8 +150,6 @@ drop table t1; 
# Bug#20778: strange characters in warning message 1366 when called in SP

#



let $engine_type= innodb;



CREATE TABLE t1( f1 CHAR(20) );

CREATE TABLE t2( f1 CHAR(20), f2 CHAR(25) );

CREATE TABLE t3( f1 CHAR(20), f2 CHAR(25), f3 DATE );