List:Commits« Previous MessageNext Message »
From:Maitrayi Sabaratnam Date:September 18 2012 3:00pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4978 to 4979)
Bug#14578595
View as plain text  
 4979 Maitrayi Sabaratnam	2012-09-18
      Bug#14578595: fix the test

    modified:
      mysql-test/suite/ndb/r/ndb_alter_table_dml.result
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
 4978 Maitrayi Sabaratnam	2012-09-18
      Bug#14578595 - CONCURRENT ALTER TABLE WITH DML GIVES: GOT ERROR -1 'UNKNOWN ERROR CODE' FROM NDB

    added:
      mysql-test/suite/ndb/r/ndb_alter_table_dml.result
      mysql-test/suite/ndb/t/ndb_alter_table_dml.test
    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/ndbapi/ndberror.c
=== modified file 'mysql-test/suite/ndb/r/ndb_alter_table_dml.result'
--- a/mysql-test/suite/ndb/r/ndb_alter_table_dml.result	2012-09-18 12:00:01 +0000
+++ b/mysql-test/suite/ndb/r/ndb_alter_table_dml.result	2012-09-18 14:56:03 +0000
@@ -23,9 +23,6 @@ where parent.b > 5;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	parent	range	b	b	5	NULL	819	Using where with pushed condition
 1	SIMPLE	child	eq_ref	PRIMARY	PRIMARY	4	test.parent.b	1	
-show variables like 'server_id';
-Variable_name	Value
-server_id	1
 Starting engines...
 call queryload(10);
 call queryload(10);

=== modified file 'mysql-test/suite/ndb/t/ndb_alter_table_dml.test'
--- a/mysql-test/suite/ndb/t/ndb_alter_table_dml.test	2012-09-18 12:00:01 +0000
+++ b/mysql-test/suite/ndb/t/ndb_alter_table_dml.test	2012-09-18 14:56:03 +0000
@@ -37,8 +37,6 @@ explain
   on (parent.b = child.a)
   where parent.b > 5;
 
-show variables like 'server_id';
-
 --disable_query_log
 delimiter %;
 create procedure queryload (seconds int)

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (maitrayi.sabaratnam:4978 to 4979)Bug#14578595Maitrayi Sabaratnam19 Sep