Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.0

-- require r/have_outfile.require

disable_query_log;

select load_file(concat(@tmpdir,"/outfile.test"));

--exec rm $MYSQL_TEST_DIR/var/tmp/outfile.test

enable_query_log;

eval select "Outfile OK" into outfile "$MYSQL_TEST_DIR/var/tmp/outfile.test"; 

rename table t1 to `t1\\`;

Incorrect table name 't1\\'

drop table t1;

drop table if exists t1, t2;

create table t1 ( a varchar(10) not null primary key ) engine=myisam;

create table t2 ( a varchar(10) not null primary key ) engine=merge union=(t1);

flush tables;

alter table t1 modify a varchar(10);

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

flush tables;

alter table t1 modify a varchar(10) not null;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` varchar(10) NOT NULL default '',

  PRIMARY KEY  (`a`)

) TYPE=MRG_MyISAM UNION=(t1)

drop table if exists t1, t2;

load_file(concat(@tmpdir,"/outfile.test"))

Outfile OK