bk commit into 6.0 tree (vvaintroub:1.2665) BUG#36467

[vvaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub.  When vvaintroub 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, 2008-05-02 13:35:06+02:00, vvaintroub@wva. +2 -0
  Bug#36467 - ha_partition::extra runs into assertion when 
  called with recently introduced HA_EXTRA_ORDERBY_LIMIT or 
  HA_EXTRA_NO_ORDERBY_LIMIT flags.
  
  Fix is to accept the flags and ignore them for now.
  
  Also, removed 2 fprintf() calls from ha_falcon.cpp

  sql/ha_partition.cc@stripped, 2008-05-02 13:35:03+02:00, vvaintroub@wva. +7 -1
    Bug#36467 
    ha_partition::extra runs into assertion if called with recently 
    introduced HA_EXTRA_ORDERBY_LIMIT, used in Falcon.
    
    The fix is to accept and currently ignore this flag

  storage/falcon/ha_falcon.cpp@stripped, 2008-05-02 13:35:04+02:00, vvaintroub@wva. +0 -3
    Remove fprintf calls

diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2008-04-23 08:54:11 +02:00
+++ b/sql/ha_partition.cc	2008-05-02 13:35:03 +02:00
@@ -5077,8 +5077,14 @@ int ha_partition::extra(enum ha_extra_fu
     /* Category 8) Parameters only used by NDB */
   case HA_EXTRA_DELETE_CANNOT_BATCH:
   case HA_EXTRA_UPDATE_CANNOT_BATCH:
-  {
     /* Currently only NDB use the *_CANNOT_BATCH */
+  {
+    break;
+  }
+  case HA_EXTRA_ORDERBY_LIMIT:
+  case HA_EXTRA_NO_ORDERBY_LIMIT:
+    /* ORDERBY_LIMIT is used by Falcon */
+  {
     break;
   }
   default:
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-05-02 07:20:00 +02:00
+++ b/storage/falcon/ha_falcon.cpp	2008-05-02 13:35:04 +02:00
@@ -2749,7 +2749,6 @@ int StorageInterface::extra(ha_extra_fun
 		//  2. If doing #1, every index/range scan must return records in
 		//     index order.
 
-		fprintf(stderr, "ha_falcon->extra(HA_EXTRA_ORDERBY_LIMIT)\n");
 		ordered_index_reads= TRUE;
 		}
 
@@ -2759,8 +2758,6 @@ int StorageInterface::extra(ha_extra_fun
 		// ORDER BY ... LIMIT. This could happen for a number of reasons,
 		// but the result is that we don't have to return records in index
 		// order.
-
-		fprintf(stderr, "ha_falcon->extra(HA_EXTRA_NO_ORDERBY_LIMIT)\n");
 		ordered_index_reads= FALSE;
 		}