bk commit into 5.0 tree (mskold:1.2303) BUG#26242

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-27 10:53:52+01:00, mskold@stripped +4 -0
  Bug #26242  UPDATE with subquery and triggers failing with cluster tables: removing HA_EXTRA_DELETE_CAN_BATCH and HA_EXTRA_UPDATE_CAN_BATCH, using HA_EXTRA_RESET instead

  include/my_base.h@stripped, 2007-02-27 10:53:23+01:00, mskold@stripped +1 -3
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: removing HA_EXTRA_DELETE_CAN_BATCH and HA_EXTRA_UPDATE_CAN_BATCH, using HA_EXTRA_RESET instead

  sql/ha_ndbcluster.cc@stripped, 2007-02-27 10:53:23+01:00, mskold@stripped +2 -8
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: removing HA_EXTRA_DELETE_CAN_BATCH and HA_EXTRA_UPDATE_CAN_BATCH, using HA_EXTRA_RESET instead

  sql/sql_delete.cc@stripped, 2007-02-27 10:53:23+01:00, mskold@stripped +0 -9
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: removing HA_EXTRA_DELETE_CAN_BATCH and HA_EXTRA_UPDATE_CAN_BATCH, using HA_EXTRA_RESET instead

  sql/sql_update.cc@stripped, 2007-02-27 10:53:23+01:00, mskold@stripped +0 -10
    Bug #26242  UPDATE with subquery and triggers failing with cluster tables: removing HA_EXTRA_DELETE_CAN_BATCH and HA_EXTRA_UPDATE_CAN_BATCH, using HA_EXTRA_RESET instead

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.0

--- 1.82/include/my_base.h	2007-02-27 10:54:02 +01:00
+++ 1.83/include/my_base.h	2007-02-27 10:54:02 +01:00
@@ -163,9 +163,7 @@ enum ha_extra_function {
   HA_EXTRA_WRITE_CAN_REPLACE,
   HA_EXTRA_WRITE_CANNOT_REPLACE,
   HA_EXTRA_DELETE_CANNOT_BATCH,
-  HA_EXTRA_DELETE_CAN_BATCH,
-  HA_EXTRA_UPDATE_CANNOT_BATCH,
-  HA_EXTRA_UPDATE_CAN_BATCH
+  HA_EXTRA_UPDATE_CANNOT_BATCH
 };
 
 	/* The following is parameter to ha_panic() */

--- 1.182/sql/sql_delete.cc	2007-02-27 10:54:02 +01:00
+++ 1.183/sql/sql_delete.cc	2007-02-27 10:54:02 +01:00
@@ -295,15 +295,6 @@ bool mysql_delete(THD *thd, TABLE_LIST *
   }
 
 cleanup:
-  if (table->triggers && table->triggers->has_triggers(TRG_EVENT_DELETE,
-						       TRG_ACTION_AFTER))
-  {
-    /*
-      The table table has AFTER DELETE triggers that needed delete
-      to be done immediately, tell handler batching is possible again
-    */
-    (void) table->file->extra(HA_EXTRA_DELETE_CAN_BATCH);
-  }
   /*
     Invalidate the table in the query cache if something changed. This must
     be before binlog writing and ha_autocommit_...

--- 1.202/sql/sql_update.cc	2007-02-27 10:54:02 +01:00
+++ 1.203/sql/sql_update.cc	2007-02-27 10:54:02 +01:00
@@ -526,16 +526,6 @@ int mysql_update(THD *thd,
   thd->proc_info="end";
   VOID(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY));
 
-  if (table->triggers && table->triggers->has_triggers(TRG_EVENT_UPDATE,
-						       TRG_ACTION_AFTER))
-  {
-    /*
-      The table table has AFTER UPDATE triggers that needed update
-      to be done immediately, tell handler batching is possible again
-    */
-    (void) table->file->extra(HA_EXTRA_UPDATE_CAN_BATCH);
-  }
-
   /*
     Invalidate the table in the query cache if something changed.
     This must be before binlog writing and ha_autocommit_...

--- 1.297/sql/ha_ndbcluster.cc	2007-02-27 10:54:02 +01:00
+++ 1.298/sql/ha_ndbcluster.cc	2007-02-27 10:54:02 +01:00
@@ -3280,6 +3280,8 @@ int ha_ndbcluster::extra(enum ha_extra_f
     DBUG_PRINT("info", ("HA_EXTRA_RESET"));
     DBUG_PRINT("info", ("Clearing condition stack"));
     cond_clear();
+    m_delete_cannot_batch= FALSE;
+    m_update_cannot_batch= FALSE;
     break;
   case HA_EXTRA_CACHE:                 /* Cash record in HA_rrnd() */
     DBUG_PRINT("info", ("HA_EXTRA_CACHE"));
@@ -3400,17 +3402,9 @@ int ha_ndbcluster::extra(enum ha_extra_f
     DBUG_PRINT("info", ("HA_EXTRA_DELETE_CANNOT_BATCH"));
     m_delete_cannot_batch= TRUE;
     break;
-  case HA_EXTRA_DELETE_CAN_BATCH:
-    DBUG_PRINT("info", ("HA_EXTRA_DELETE_CAN_BATCH"));
-    m_delete_cannot_batch= FALSE;
-    break;
   case HA_EXTRA_UPDATE_CANNOT_BATCH:
     DBUG_PRINT("info", ("HA_EXTRA_UPDATE_CANNOT_BATCH"));
     m_update_cannot_batch= TRUE;
-    break;
-  case HA_EXTRA_UPDATE_CAN_BATCH:
-    DBUG_PRINT("info", ("HA_EXTRA_UPDATE_CAN_BATCH"));
-    m_update_cannot_batch= FALSE;
     break;
   }