Merge lp:~stewart/drizzle/cursor-warn-unused-result into lp:drizzle/7.0

[Stewart Smith]

http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/699/

goes through more Cursor methods to make them warn_unused_result

=== modified file 'drizzled/cursor.cc'
--- drizzled/cursor.cc	2011-01-07 05:11:59 +0000
+++ drizzled/cursor.cc	2011-01-07 05:12:00 +0000
@@ -288,9 +288,12 @@
   else
   {
     /* Find the first row through the primary key */
-    (void) startIndexScan(primary_key, 0);
-    error=index_first(buf);
-    (void) endIndexScan();
+    error= startIndexScan(primary_key, 0);
+    if (error == 0)
+    {
+      error=index_first(buf);
+      (void) endIndexScan();
+    }
   }
   return error;
 }
 
=== modified file 'drizzled/cursor.h'
--- drizzled/cursor.h	2011-01-07 05:11:59 +0000
+++ drizzled/cursor.h	2011-01-07 05:12:00 +0000
@@ -232,7 +232,7 @@
   /* ha_ methods: pubilc wrappers for private virtual API */
 
   int ha_open(const TableIdentifier &identifier, int mode, int test_if_locked);
-  int startIndexScan(uint32_t idx, bool sorted);
+  int startIndexScan(uint32_t idx, bool sorted) __attribute__ ((warn_unused_result));
   int endIndexScan();
   int startTableScan(bool scan) __attribute__ ((warn_unused_result));
   int endTableScan();
@@ -248,9 +248,9 @@
     and doDeleteRecord() below.
   */
   int ha_external_lock(Session *session, int lock_type);
-  int insertRecord(unsigned char * buf);
-  int updateRecord(const unsigned char * old_data, unsigned char * new_data);
-  int deleteRecord(const unsigned char * buf);
+  int insertRecord(unsigned char * buf) __attribute__ ((warn_unused_result));
+  int updateRecord(const unsigned char * old_data, unsigned char * new_data) __attribute__ ((warn_unused_result));
+  int deleteRecord(const unsigned char * buf) __attribute__ ((warn_unused_result));
   void ha_release_auto_increment();
 
   /** to be actually called to get 'check()' functionality*/
@@ -350,7 +350,7 @@
                                  const unsigned char * key,
                                  key_part_map keypart_map,
                                  enum ha_rkey_function find_flag);
-  virtual int index_next(unsigned char *)
+  virtual int index_next(unsigned char *) __attribute__ ((warn_unused_result))
    { return  HA_ERR_WRONG_COMMAND; }
   virtual int index_prev(unsigned char *)
    { return  HA_ERR_WRONG_COMMAND; }
 
=== modified file 'drizzled/item/subselect.cc'
--- drizzled/item/subselect.cc	2011-01-07 05:11:59 +0000
+++ drizzled/item/subselect.cc	2011-01-07 05:12:00 +0000
@@ -2498,7 +2498,16 @@
     return(scan_table());
 
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->ref.key, 0);
+  {
+    error= table->cursor->startIndexScan(tab->ref.key, 0);
+
+    if (error != 0)
+    {
+      error= table->report_error(error);
+      return (error != 0);
+    }
+  }
+
   error= table->cursor->index_read_map(table->record[0],
                                      tab->ref.key_buff,
                                      make_prev_keypart_map(tab->ref.key_parts),
@@ -2611,7 +2620,15 @@
     return(scan_table());
 
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->ref.key, 1);
+  {
+    error= table->cursor->startIndexScan(tab->ref.key, 1);
+
+    if (error != 0)
+    {
+      error= table->report_error(error);
+      return(error != 0);
+    }
+  }
   error= table->cursor->index_read_map(table->record[0],
                                      tab->ref.key_buff,
                                      make_prev_keypart_map(tab->ref.key_parts),
 
=== modified file 'drizzled/records.cc'
--- drizzled/records.cc	2011-01-07 05:11:59 +0000
+++ drizzled/records.cc	2011-01-07 05:12:00 +0000
@@ -48,10 +48,10 @@
   read_record= rr_sequential;
 }
 
-void ReadRecord::init_read_record_idx(Session *, 
-                                      Table *table_arg,
-                                      bool print_error_arg, 
-                                      uint32_t idx)
+int ReadRecord::init_read_record_idx(Session *,
+                                     Table *table_arg,
+                                     bool print_error_arg,
+                                     uint32_t idx)
 {
   table_arg->emptyRecord();
   table= table_arg;
@@ -61,9 +61,15 @@
 
   table->status=0;			/* And it's always found */
   if (not table->cursor->inited)
-    table->cursor->startIndexScan(idx, 1);
+  {
+    int error= table->cursor->startIndexScan(idx, 1);
+    if (error != 0)
+      return error;
+  }
   /* read_record will be changed to rr_index in rr_index_first */
   read_record= rr_index_first;
+
+  return 0;
 }
 
 
 
=== modified file 'drizzled/records.h'
--- drizzled/records.h	2011-01-07 05:11:59 +0000
+++ drizzled/records.h	2011-01-07 05:12:00 +0000
@@ -205,10 +205,10 @@
                       occurs (except for end-of-records error)
   @param idx          index to scan
                     */
-  void init_read_record_idx(Session *session, 
-                            Table *table,
-                            bool print_error, 
-                            uint32_t idx);
+  int init_read_record_idx(Session *session,
+                           Table *table,
+                           bool print_error,
+                           uint32_t idx) __attribute__ ((warn_unused_result));
 
   void init_reard_record_sequential();
 
 
=== modified file 'drizzled/sql_delete.cc'
--- drizzled/sql_delete.cc	2011-01-07 05:11:59 +0000
+++ drizzled/sql_delete.cc	2011-01-07 05:12:00 +0000
@@ -251,7 +251,13 @@
   }
   else
   {
-    info.init_read_record_idx(session, table, 1, usable_index);
+    if ((error= info.init_read_record_idx(session, table, 1, usable_index)))
+    {
+      table->print_error(error, MYF(0));
+      delete select;
+      free_underlaid_joins(session, select_lex);
+      return true;
+    }
   }
 
   session->set_proc_info("updating");
 
=== modified file 'drizzled/sql_select.cc'
--- drizzled/sql_select.cc	2011-01-07 05:11:59 +0000
+++ drizzled/sql_select.cc	2011-01-07 05:12:00 +0000
@@ -3053,7 +3053,15 @@
     table->emptyRecord();
     if (table->group && join->tmp_table_param.sum_func_count &&
         table->getShare()->sizeKeys() && !table->cursor->inited)
-      table->cursor->startIndexScan(0, 0);
+    {
+      int tmp_error;
+      tmp_error= table->cursor->startIndexScan(0, 0);
+      if (tmp_error != 0)
+      {
+        table->print_error(tmp_error, MYF(0));
+        return -1;
+      }
+    }
   }
   /* Set up select_end */
   Next_select_func end_select= setup_end_select_func(join);
@@ -3531,7 +3539,11 @@
 
   if (!table->cursor->inited)
   {
-    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+    error= table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+    if (error != 0)
+    {
+      table->print_error(error, MYF(0));
+    }
   }
 
   /* TODO: Why don't we do "Late NULLs Filtering" here? */
@@ -3579,7 +3591,11 @@
 
   /* Initialize the index first */
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+  {
+    error= table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+    if (error != 0)
+      return table->report_error(error);
+  }
 
   /* Perform "Late NULLs Filtering" (see internals manual for explanations) */
   for (uint32_t i= 0 ; i < tab->ref.key_parts ; i++)
@@ -3613,7 +3629,11 @@
   Table *table= tab->table;
 
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+  {
+    error= table->cursor->startIndexScan(tab->ref.key, tab->sorted);
+    if (error != 0)
+      return table->report_error(error);
+  }
   if (cp_buffer_from_ref(tab->join->session, &tab->ref))
     return -1;
   if ((error=table->cursor->index_read_last_map(table->getInsertRecord(),
@@ -3762,7 +3782,14 @@
   }
 
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->index, tab->sorted);
+  {
+    error= table->cursor->startIndexScan(tab->index, tab->sorted);
+    if (error != 0)
+    {
+      table->report_error(error);
+      return -1;
+    }
+  }
   if ((error=tab->table->cursor->index_first(tab->table->getInsertRecord())))
   {
     if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)
@@ -3821,7 +3848,11 @@
   tab->read_record.index=tab->index;
   tab->read_record.record=table->getInsertRecord();
   if (!table->cursor->inited)
-    table->cursor->startIndexScan(tab->index, 1);
+  {
+    error= table->cursor->startIndexScan(tab->index, 1);
+    if (error != 0)
+      return table->report_error(error);
+  }
   if ((error= tab->table->cursor->index_last(tab->table->getInsertRecord())))
     return table->report_error(error);
 
 
=== modified file 'drizzled/sql_update.cc'
--- drizzled/sql_update.cc	2011-01-07 05:11:59 +0000
+++ drizzled/sql_update.cc	2011-01-07 05:12:00 +0000
@@ -368,7 +368,8 @@
       }
       else
       {
-        info.init_read_record_idx(session, table, 1, used_index);
+        if ((error= info.init_read_record_idx(session, table, 1, used_index)))
+          goto err;
       }
 
       session->set_proc_info("Searching rows for update");