List:Commits« Previous MessageNext Message »
From:Annamalai Gurusami Date:April 18 2012 9:46am
Subject:bzr push into mysql-5.5 branch (annamalai.gurusami:3792 to 3793) Bug#12902967
View as plain text  
 3793 Annamalai Gurusami	2012-04-18
      Bug #12902967 Creating self referencing fk on same index unhandled,
      confusing error. Updated the test script to work properly on
      windows platform. 

    modified:
      mysql-test/suite/innodb/t/innodb_bug12902967.test
 3792 Nuno Carvalho	2012-04-18 [merge]
      WL#6236: Allow SHOW MASTER LOGS and SHOW BINARY LOGS with REPLICATION CLIENT
      
      Merge from 5.1 into 5.5.

    modified:
      mysql-test/suite/binlog/r/binlog_grant.result
      mysql-test/suite/binlog/t/binlog_grant.test
      sql/sql_parse.cc
=== modified file 'mysql-test/suite/innodb/t/innodb_bug12902967.test'
--- a/mysql-test/suite/innodb/t/innodb_bug12902967.test	revid:nuno.carvalho@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug12902967.test	revid:annamalai.gurusami@stripped
@@ -10,7 +10,6 @@
 --source include/not_embedded.inc
 
 let error_log= $MYSQLTEST_VARDIR/log/mysqld.1.err;
---remove_file $error_log
 --source include/restart_mysqld.inc
 
 create table t1 (f1 integer primary key) engine innodb;
@@ -21,7 +20,7 @@ create table t1 (f1 integer primary key)
 --replace_regex /'\.\/test\/#sql-[0-9a-f_]*'/'#sql-temporary'/
 --error ER_ERROR_ON_RENAME
 alter table t1 add constraint c1 foreign key (f1) references t1(f1);
-
+--source include/restart_mysqld.inc
 perl;
 
 $file = "$ENV{'error_log'}";

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (annamalai.gurusami:3792 to 3793) Bug#12902967Annamalai Gurusami20 Apr