Commit 034522f4 authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-release 

into  chilla.local:/home/mydev/mysql-5.0-amerge


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
parents 0859819a 1a7e4ac0

mysql-test/r/blackhole.result

+0 −8
Original line number Diff line number Diff line
@@ -123,11 +123,3 @@ master-bin.000001 # Query 1 # use `test`; create table t3 like t1 
master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3

master-bin.000001	#	Query	1	#	use `test`; replace into t1 select * from t3

drop table t1,t2,t3;
 
drop table if exists t1;

Warnings:

Note	1051	Unknown table 't1'

create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

alter table t1 engine=blackhole;

ERROR HY000: Table storage engine for 't1' doesn't have this option

drop table t1;

mysql-test/r/merge.result

+0 −8
Original line number Diff line number Diff line
@@ -768,14 +768,6 @@ Table Op Msg_type Msg_text 
test.t1	check	status	OK

test.t2	check	status	OK

drop table t1, t2, t3;

drop table if exists t1;

Warnings:

Note	1051	Unknown table 't1'

create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

alter table t1 engine=MERGE;

ERROR HY000: Table storage engine for 't1' doesn't have this option

drop table t1;

create table t1 (b bit(1));

create table t2 (b bit(1));

create table tm (b bit(1)) engine = merge union = (t1,t2);

mysql-test/t/blackhole.test

+0 −12
Original line number Diff line number Diff line
@@ -128,15 +128,3 @@ show binlog events; 
drop table t1,t2,t3;



# End of 4.1 tests
 


#

# BUG#10952 - alter table ... lost data without errors and warnings

#

drop table if exists t1;

create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

--error 1031

alter table t1 engine=blackhole;

drop table t1;



# End of 5.0 tests

mysql-test/t/merge.test

+0 −10
Original line number Diff line number Diff line
@@ -380,16 +380,6 @@ drop table t1, t2, t3; 


# End of 4.1 tests



#

# BUG#10952 - alter table ... lost data without errors and warnings

#

drop table if exists t1;

create table t1 (c char(20)) engine=MyISAM;

insert into t1 values ("Monty"),("WAX"),("Walrus");

--error 1031

alter table t1 engine=MERGE;

drop table t1;



#

# BUG#19648 - Merge table does not work with bit types

#

sql/ha_blackhole.cc

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ handlerton blackhole_hton= { 
  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE

  HTON_CAN_RECREATE

};



/*****************************************************************************