mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

Browse source 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
This commit is contained in:
unknown 2006-08-22 14:19:10 +02:00
commit 3da7bceba5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/disabled.def
View file

@ -18,7 +18,7 @@ im_options : Bug#20294 2006-07-24 stewart Instance manager test
#im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails #im_life_cycle : Bug#20368 2006-06-10 alik im_life_cycle test fails
ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog ndb_autodiscover2 : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog
ndb_binlog_ignore_db : BUG#21279 2006-07-25 ingo Randomly throws a warning #ndb_binlog_ignore_db : BUG#21279 2006-07-25 ingo Randomly throws a warning
ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed ndb_load : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed
partition : BUG#21658 2006-08-16 Partition test fails, --ps-protocol partition : BUG#21658 2006-08-16 Partition test fails, --ps-protocol
partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table partition_03ndb : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table

2
mysql-test/t/ndb_binlog_discover.test
View file

@ -20,7 +20,7 @@ let $mysql_errno= 1;
while ($mysql_errno) while ($mysql_errno)
{ {
# Table t1 is readonly until the mysqld has reconnected properly # Table t1 is readonly until the mysqld has reconnected properly
--error 0,1036 --error 0,1036,1296
insert into t1 values(1); insert into t1 values(1);
if ($mysql_errno) if ($mysql_errno)
{ {