From: Date: June 9 2008 2:39pm
Subject: bzr commit into mysql-5.1 branch (mattiasj:2661) Bug#31210
List-Archive: http://lists.mysql.com/commits/47599
X-Bug: 31210
Message-Id: <20080609123942.7AF08A1943A@client-10-129-10-147.upp.off.mysql.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/mattiasj/clones/bzrroot/topush-51-bugteam/

 2661 Mattias Jonsson	2008-06-09
      Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
      
      post push patch
      
      push build found tree failing test when using:
      --ps-protocol --mysqld=--binlog-format=row
      Changed to the new error message.
modified:
  sql/sql_prepare.cc

per-file messages:
  sql/sql_prepare.cc
    Bug#31210: INSERT DELAYED crashes server when used on partitioned tables
    
    Changed to the newly added error message
=== modified file 'sql/sql_prepare.cc'
--- a/sql/sql_prepare.cc	2008-05-20 16:36:26 +0000
+++ b/sql/sql_prepare.cc	2008-06-09 12:39:20 +0000
@@ -1154,9 +1154,9 @@ static bool mysql_test_insert(Prepared_s
     if (table_list->lock_type == TL_WRITE_DELAYED &&
         !(table_list->table->file->ha_table_flags() & HA_CAN_INSERT_DELAYED))
     {
-      my_error(ER_ILLEGAL_HA, MYF(0), (table_list->view ?
-                                       table_list->view_name.str :
-                                       table_list->table_name));
+      my_error(ER_DELAYED_NOT_SUPPORTED, MYF(0), (table_list->view ?
+                                                  table_list->view_name.str :
+                                                  table_list->table_name));
       goto error;
     }
     while ((values= its++))