Commit 93528f28 authored by unknown's avatar unknown
Browse files

Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 

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


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
configure.in:
  Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge
sql/ha_myisammrg.cc:
  Manual merge
sql/handler.h:
  Manual merge
storage/blackhole/ha_blackhole.cc:
  Manual merge
support-files/mysql.spec.sh:
  Manual merge
parents 7b2cabd9 034522f4

mysql-test/extra/binlog_tests/blackhole.test

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ show binlog events; 
drop table t1,t2,t3;



# End of 4.1 tests



# Test that a transaction which is rolled back does not go into binlog

# and that a transaction which is committed does

mysql-test/r/merge.result

+0 −8
Original line number Diff line number Diff line
@@ -771,14 +771,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/merge.test

+0 −10
Original line number Diff line number Diff line
@@ -383,16 +383,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/handler.h

+0 −1
Original line number Diff line number Diff line
@@ -679,7 +679,6 @@ struct handlerton 
#define HTON_FLUSH_AFTER_RENAME      (1 << 4)

#define HTON_NOT_USER_SELECTABLE     (1 << 5)

#define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported

#define HTON_ALTER_CANNOT_CREATE     (1 << 7) //Cannot use alter to create



typedef struct st_thd_trans

{

sql/sql_table.cc

+1 −3
Original line number Diff line number Diff line
@@ -5108,9 +5108,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 
             ha_resolve_storage_engine_name(old_db_type),

             ha_resolve_storage_engine_name(new_db_type)));

  if (ha_check_storage_engine_flag(old_db_type, HTON_ALTER_NOT_SUPPORTED) ||

      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED) ||

      (old_db_type != new_db_type &&

       ha_check_storage_engine_flag(new_db_type, HTON_ALTER_CANNOT_CREATE)))

      ha_check_storage_engine_flag(new_db_type, HTON_ALTER_NOT_SUPPORTED))

  {

    DBUG_PRINT("info", ("doesn't support alter"));

    my_error(ER_ILLEGAL_HA, MYF(0), table_name);