Commit bdb781c1 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-new 

into mysql.com:/home/hf/work/mysql-5.1.mrg


sql/mysqld.cc:
  Auto merged
parents d0f27c18 2a655fcc

mysql-test/r/ndb_alter_table.result

+42 −0
Original line number Diff line number Diff line
@@ -286,3 +286,45 @@ unique key tx1 (c002, c003, c004, c005)) engine=ndb; 
create index tx2 

on t1 (c010, c011, c012, c013);

drop table t1;

CREATE TABLE t1 (

auto int(5) unsigned NOT NULL auto_increment,

string char(10),

vstring varchar(10),

bin binary(2),

vbin varbinary(7),

tiny tinyint(4) DEFAULT '0' NOT NULL ,

short smallint(6) DEFAULT '1' NOT NULL ,

medium mediumint(8) DEFAULT '0' NOT NULL,

long_int int(11) DEFAULT '0' NOT NULL,

longlong bigint(13) DEFAULT '0' NOT NULL,

real_float float(13,1) DEFAULT 0.0 NOT NULL,

real_double double(16,4),

real_decimal decimal(16,4),

utiny tinyint(3) unsigned DEFAULT '0' NOT NULL,

ushort smallint(5) unsigned zerofill DEFAULT '00000' NOT NULL,

umedium mediumint(8) unsigned DEFAULT '0' NOT NULL,

ulong int(11) unsigned DEFAULT '0' NOT NULL,

ulonglong bigint(13) unsigned DEFAULT '0' NOT NULL,

bits bit(3),

options enum('zero','one','two','three','four') not null,

flags set('zero','one','two','three','four') not null,

date_field date,

year_field year,

time_field time,

date_time datetime,

time_stamp timestamp,

PRIMARY KEY (auto)

) engine=ndb;

CREATE TEMPORARY TABLE ndb_show_tables (id INT, type VARCHAR(20), state VARCHAR(20), logging VARCHAR(20), _database VARCHAR(255), _schema VARCHAR(20), name VARCHAR(255));

LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;

set @t1_id = (select id from ndb_show_tables where name like '%t1%');

truncate ndb_show_tables;

alter table t1 change tiny new_tiny tinyint(4) DEFAULT '0' NOT NULL;

create index i1 on t1(medium);

alter table t1 add index i2(long_int);

drop index i1 on t1;

LOAD DATA INFILE 'tmp.dat' INTO TABLE ndb_show_tables;

select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%';

no_copy

no_copy

DROP TABLE t1, ndb_show_tables;

mysql-test/r/ndb_alter_table_stm.result

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

create table t1 ( a int primary key, b varchar(10), c varchar(10), index (b) )

engine=ndb;

insert into t1 values (1,'one','one'), (2,'two','two'), (3,'three','three');

create index c on t1(c);

select * from t1 where c = 'two';

a	b	c

2	two	two

alter table t1 drop index c;

select * from t1 where c = 'two';

select * from t1 where c = 'two';

a	b	c

2	two	two

drop table t1;

create table t3 (a int primary key) engine=ndbcluster;

begin;

insert into t3 values (1);

alter table t3 rename t4;

delete from t3;

insert into t3 values (1);

commit;

select * from t3;

ERROR HY000: Can't lock file (errno: 155)

select * from t4;

a

1

drop table t4;

show tables;

Tables_in_test

mysql-test/r/ndb_multi_row.result

+2 −0
Original line number Diff line number Diff line
@@ -62,4 +62,6 @@ t4 
drop table t1, t2, t3, t4;

drop table if exists t1, t3, t4;

Warnings:

Error	155	Table 'test.t1' doesn't exist

Error	155	Table 'test.t3' doesn't exist

Error	155	Table 'test.t4' doesn't exist

mysql-test/t/disabled.def

+3 −1
Original line number Diff line number Diff line
@@ -18,12 +18,14 @@ ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t 
ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown

#ndb_cache2               : BUG#18597 2006-03-28 brian simultaneous drop table and ndb statistics update triggers node failure

#ndb_cache_multi2         : BUG#18597 2006-04-10 kent  simultaneous drop table and ndb statistics update triggers node failure

ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

ps_7ndb                  : BUG#18950 2006-02-16 jmiller create table like does not obtain LOCK_open

rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_2myisam          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated

rpl_ndb_auto_inc         : BUG#17086 2006-02-16 jmiller CR: auto_increment_increment and auto_increment_offset produce duplicate key er

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on solaris

rpl_ndb_commit_afterflush : BUG#19328 2006-05-04 tomas Slave timeout with COM_REGISTER_SLAVE error causing stop

rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked

rpl_ndb_innodb2ndb       : BUG#17400 2006-04-19 tomas Cluster Replication: delete & update of rows in table without pk fails on slave.

rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create table and insert (on different table) not determ