From: Pekka Nousiainen
Date: September 18 2012 1:16pm
Subject: bzr push into mysql-5.5-cluster-7.3-fk branch (pekka.nousiainen:3915 to
 3916) WL#6244
List-Archive: http://lists.mysql.com/commits/144782
Message-Id: <20120918131604.18973.44449.3916@cuda>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3916 Pekka Nousiainen	2012-09-18
      wl#6244 errcode3.diff
      push_warning_printf WARN_LEVEL_ERROR not allowed

    modified:
      sql/ha_ndb_ddl_fk.cc
 3915 Pekka Nousiainen	2012-09-18
      wl#6244 errcode2.diff
      create_fks handler error 150 and push warnings

    modified:
      sql/ha_ndb_ddl_fk.cc
=== modified file 'sql/ha_ndb_ddl_fk.cc'
--- a/sql/ha_ndb_ddl_fk.cc	2012-09-18 09:47:44 +0000
+++ b/sql/ha_ndb_ddl_fk.cc	2012-09-18 13:15:29 +0000
@@ -264,7 +264,7 @@ ha_ndbcluster::create_fks(THD *thd, Ndb
                                                       tmpbuf, sizeof(tmpbuf)));
         if (ndbcol == 0)
         {
-          push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+          push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                               ER_CANNOT_ADD_FOREIGN,
                               "Child table %s has no column %s in NDB",
                               child_tab.get_table()->getName(), tmpbuf);
@@ -283,7 +283,7 @@ ha_ndbcluster::create_fks(THD *thd, Ndb
 
     if (!child_primary_key && child_index == 0)
     {
-      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_CANNOT_ADD_FOREIGN,
                           "Child table %s foreign key columns match no index in NDB",
                           child_tab.get_table()->getName());
@@ -333,7 +333,7 @@ ha_ndbcluster::create_fks(THD *thd, Ndb
                                                       tmpbuf, sizeof(tmpbuf)));
         if (ndbcol == 0)
         {
-          push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+          push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                               ER_CANNOT_ADD_FOREIGN,
                               "Parent table %s has no column %s in NDB",
                               parent_tab.get_table()->getName(), tmpbuf);
@@ -354,7 +354,7 @@ ha_ndbcluster::create_fks(THD *thd, Ndb
 
     if (!parent_primary_key && parent_index == 0)
     {
-      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
                           ER_CANNOT_ADD_FOREIGN,
                           "Parent table %s foreign key columns match no index in NDB",
                           parent_tab.get_table()->getName());

No bundle (reason: useless for push emails).