Commit 6116d017 authored by unknown's avatar unknown
Browse files

bug#10952 

  "alter table from MyISAM to MERGE lost data without errors and warnings"
  Add new handlerton flag which prevent user from altering table storage
  engine to storage engines which would lose data. Both 'blackhole' and 
  'merge' are marked with the new flag.
  Tests included.


mysql-test/r/blackhole.result:
  test for bug#10952
mysql-test/r/merge.result:
  test for bug#10952
mysql-test/t/blackhole.test:
  test for bug#10952
mysql-test/t/merge.test:
  test for bug#10952
sql/ha_blackhole.cc:
  Bug#10952
    shouldn't be able to alter a table into a blackhole
sql/ha_myisammrg.cc:
  Bug#10952
    shouldn't be able to alter a table into a merge
sql/handler.h:
  Bug#10952
    new handlerton flag
sql/sql_table.cc:
  Bug#10952
    If alter is changing engine, check if new engine allows creating table
    via ALTER statement.
parent b5732e7c

mysql-test/r/blackhole.result

+8 −0
Original line number Diff line number Diff line
@@ -123,3 +123,11 @@ 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

+8 −0
Original line number Diff line number Diff line
@@ -768,3 +768,11 @@ 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;

mysql-test/t/blackhole.test

+12 −0
Original line number Diff line number Diff line
@@ -128,3 +128,15 @@ 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

+12 −0
Original line number Diff line number Diff line
@@ -379,3 +379,15 @@ check table t1, t2; 
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;



# End of 5.0 tests

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_CAN_RECREATE | HTON_ALTER_CANNOT_CREATE

};



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