database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity

Merge perch.ndb.mysql.com:/home/jonas/src/51-work

Browse Source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
This commit is contained in:
jonas@perch.ndb.mysql.com
2006-08-22 12:42:56 +02:00
parent a1ea21bf26 770c2edcdd
commit 5067c4214b
2 changed files with 2 additions and 2 deletions
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
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_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
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

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

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