1 files changed, 36 insertions, 24 deletions

diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 12e8c9e227a..0505d2409d4 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 
 #include "mysql_priv.h"
 #include "sql_select.h"
-#include <assert.h>
 
 /* TODO:
   HANDLER blabla OPEN [ AS foobar ] [ (column-list) ]
@@ -62,7 +61,7 @@ int mysql_ha_open(THD *thd, TABLE_LIST *tables)
     return -1;
   }
 
-  send_ok(&thd->net);
+  send_ok(thd);
   return 0;
 }
 
@@ -83,7 +82,7 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables, bool dont_send_ok)
     return -1;
   }
   if (!dont_send_ok)
-    send_ok(&thd->net);
+    send_ok(thd);
   return 0;
 }
 
@@ -96,7 +95,7 @@ int mysql_ha_closeall(THD *thd, TABLE_LIST *tables)
 }
 
 static enum enum_ha_read_modes rkey_to_rnext[]=
-    { RNEXT, RNEXT, RPREV, RNEXT, RPREV, RNEXT, RPREV };
+    { RNEXT, RNEXT, RPREV, RNEXT, RPREV, RNEXT, RPREV, RPREV };
 
 
 int mysql_ha_read(THD *thd, TABLE_LIST *tables,
@@ -114,10 +113,12 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
   }
   tables->table=table;
 
-  if (cond && cond->fix_fields(thd,tables))
+  if (cond && (cond->fix_fields(thd, tables, &cond) || cond->check_cols(1)))
     return -1;
 
-  table->file->init_table_handle_for_HANDLER(); // Only InnoDB requires it
+  /* InnoDB needs to know that this table handle is used in the HANDLER */
+
+  table->file->init_table_handle_for_HANDLER();
 
   if (keyname)
   {
@@ -133,13 +134,16 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
   List<Item> list;
   list.push_front(new Item_field(NULL,NULL,"*"));
   List_iterator<Item> it(list);
+  Protocol *protocol= thd->protocol;
+  char buff[MAX_FIELD_WIDTH];
+  String buffer(buff, sizeof(buff), system_charset_info);
   uint num_rows;
   it++;
 
   insert_fields(thd,tables,tables->db,tables->alias,&it);
 
   select_limit+=offset_limit;
-  send_fields(thd,list,1);
+  protocol->send_fields(&list,1);
 
   HANDLER_TABLES_HACK(thd);
   MYSQL_LOCK *lock=mysql_lock_tables(thd,&tables->table,1);
@@ -147,11 +151,17 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
   if (!lock)
      goto err0; // mysql_lock_tables() printed error message already
 
-  table->file->init_table_handle_for_HANDLER(); // Only InnoDB requires it
+  /*
+    In ::external_lock InnoDB resets the fields which tell it that
+    the handle is used in the HANDLER interface. Tell it again that
+    we are using it for HANDLER.
+  */
+
+  table->file->init_table_handle_for_HANDLER();
 
   for (num_rows=0; num_rows < select_limit; )
   {
-    switch(mode) {
+    switch (mode) {
     case RFIRST:
       err=keyname ?
 	table->file->index_first(table->record[0]) :
@@ -190,12 +200,12 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
       Item *item;
       for (key_len=0 ; (item=it_ke++) ; key_part++)
       {
-	item->save_in_field(key_part->field, 1);
+	(void) item->save_in_field(key_part->field, 1);
 	key_len+=key_part->store_length;
       }
       if (!(key= (byte*) thd->calloc(ALIGN_SIZE(key_len))))
       {
-	send_error(&thd->net,ER_OUTOFMEMORY);
+	send_error(thd,ER_OUTOFMEMORY);
 	goto err;
       }
       key_copy(key, table, keyno, key_len);
@@ -205,7 +215,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
       break;
     }
     default:
-      send_error(&thd->net,ER_ILLEGAL_HA);
+      send_error(thd,ER_ILLEGAL_HA);
       goto err;
     }
 
@@ -226,31 +236,31 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
       if (!cond->val_int())
         continue;
     }
-    if (num_rows>=offset_limit)
+    if (num_rows >= offset_limit)
     {
       if (!err)
       {
         String *packet = &thd->packet;
         Item *item;
-        packet->length(0);
+        protocol->prepare_for_resend();
         it.rewind();
         while ((item=it++))
         {
-          if (item->send(thd,packet))
+          if (item->send(thd->protocol, &buffer))
           {
-            packet->free();                             // Free used
+            protocol->free();                             // Free used
             my_error(ER_OUT_OF_RESOURCES,MYF(0));
             goto err;
           }
         }
-        my_net_write(&thd->net, (char*)packet->ptr(), packet->length());
+	protocol->write();
       }
     }
     num_rows++;
   }
 ok:
   mysql_unlock_tables(thd,lock);
-  send_eof(&thd->net);
+  send_eof(thd);
   return 0;
 err:
   mysql_unlock_tables(thd,lock);
@@ -258,6 +268,7 @@ err0:
   return -1;
 }
 
+
 static TABLE **find_table_ptr_by_name(THD *thd, const char *db,
 				      const char *table_name, bool is_alias)
 {
@@ -267,15 +278,16 @@ static TABLE **find_table_ptr_by_name(THD *thd, const char *db,
   if (!db || ! *db)
     db= thd->db ? thd->db : "";
   dblen=strlen(db)+1;
-  ptr=&(thd->handler_tables);
+  ptr= &(thd->handler_tables);
 
-  for (TABLE *table=*ptr; table ; table=*ptr)
+  for (TABLE *table= *ptr; table ; table= *ptr)
   {
     if (!memcmp(table->table_cache_key, db, dblen) &&
-        !my_strcasecmp((is_alias ? table->table_name : table->real_name),table_name))
+        !my_strcasecmp(system_charset_info,
+		       (is_alias ? table->table_name : table->real_name),
+		       table_name))
       break;
-    ptr=&(table->next);
+    ptr= &(table->next);
   }
   return ptr;
 }
-