Bug fix: for SHOW STATUS (when ssl is used)

Added ROW_RESULT to switchs(for documentation purposes)


sql/filesort.cc:
  For documentation purposes
sql/item_cmpfunc.cc:
  For documentation purposes
sql/item_func.cc:
  For documentation purposes
sql/item_sum.cc:
  For documentation purposes
sql/log_event.cc:
  For documentation purposes
sql/sql_lex.cc:
  For documentation purposes
sql/sql_select.cc:
  For documentation purposes
sql/sql_show.cc:
  Bug fix: for SHOW STATUS (when ssl is used)

8 files changed, 24 insertions, 3 deletions

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 6ff3e09b7ea..e1ef9c26008 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -561,6 +561,7 @@ static void make_sortkey(register SORTPARAM *param,
 	  change_double_for_sort(value,(byte*) to);
 	  break;
 	}
+      case ROW_RESULT:
       default: 
 	// This case should never be choosen
 	DBUG_ASSERT(0);
@@ -971,6 +972,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
       case REAL_RESULT:
 	sortorder->length=sizeof(double);
 	break;
+      case ROW_RESULT:
       default: 
 	// This case should never be choosen
 	DBUG_ASSERT(0);
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index e2b87da612a..0993b8b155a 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -840,6 +840,7 @@ Item *Item_func_case::find_item(String *str)
       if (args[i]->val()==first_expr_real && !args[i]->null_value) 
         return args[i+1];
       break;
+    case ROW_RESULT:
     default:
       // This case should never be choosen
       DBUG_ASSERT(0);
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 41082805aa8..3954b53c063 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -251,6 +251,7 @@ Field *Item_func::tmp_table_field(TABLE *t_arg)
     else
       res= new Field_string(max_length, maybe_null, name, t_arg, charset());
     break;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -910,6 +911,7 @@ String *Item_func_min_max::val_str(String *str)
     }
     return res;
   }
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -1466,10 +1468,11 @@ bool udf_handler::get_arguments()
 	to+= ALIGN_SIZE(sizeof(double));
       }
       break;
+    case ROW_RESULT:
     default:
       // This case should never be choosen
       DBUG_ASSERT(0);
-      ;
+      break;
     }
   }
   return 0;
@@ -1926,6 +1929,7 @@ longlong Item_func_benchmark::val_int()
     case STRING_RESULT:
       (void) args[0]->val_str(&tmp);
       break;
+    case ROW_RESULT:
     default:
       // This case should never be choosen
       DBUG_ASSERT(0);
@@ -2062,6 +2066,7 @@ Item_func_set_user_var::update()
     (void) val_str(&tmp);
     break;
   }
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -2143,6 +2148,7 @@ Item_func_get_user_var::val_str(String *str)
       return NULL;
     }
     break;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -2164,6 +2170,7 @@ double Item_func_get_user_var::val()
     return (double) *(longlong*) entry->value;
   case STRING_RESULT:
     return atof(entry->value);			// This is null terminated
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -2185,6 +2192,7 @@ longlong Item_func_get_user_var::val_int()
     return *(longlong*) entry->value;
   case STRING_RESULT:
     return strtoull(entry->value,NULL,10);	// String is null terminated
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index fc59569e25b..ae0559e2249 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -387,6 +387,7 @@ double Item_sum_hybrid::val()
     return (double) sum_int;
   case REAL_RESULT:
     return sum;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -422,6 +423,7 @@ Item_sum_hybrid::val_str(String *str)
     else
       str->set((longlong) sum_int,thd_charset());
     break;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -467,6 +469,7 @@ bool Item_sum_min::add()
     }
   }
   break;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
@@ -513,11 +516,11 @@ bool Item_sum_max::add()
     }
   }
   break;
+  case ROW_RESULT:
   default:
     // This case should never be choosen
     DBUG_ASSERT(0);
     break;
-
   }
   return 0;
 }
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 01fe360b68f..36d4b16225a 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2004,6 +2004,7 @@ void User_var_log_event::pack_info(Protocol* protocol)
       memcpy(buf + val_offset + 1, val, val_len);
       buf[val_offset + val_len + 1]= '\'';
       break;
+    case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
       return;
@@ -2069,6 +2070,7 @@ int User_var_log_event::write_data(IO_CACHE* file)
     case STRING_RESULT:
       pos= val;
       break;
+    case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
       return 0;
@@ -2121,6 +2123,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
     case STRING_RESULT:
       fprintf(file, ":='%s';\n", val);
       break;
+    case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
       return;
@@ -2165,6 +2168,7 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli)
     case STRING_RESULT:
       it= new Item_string(val, val_len, charset);
       break;
+    case ROW_RESULT:
     default:
       DBUG_ASSERT(1);
       return 0;
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index df34d56b0c2..e370ce569b5 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -207,6 +207,7 @@ static int find_keyword(LEX *lex, uint len, bool function)
       return (udf->type == UDFTYPE_FUNCTION) ? UDF_FLOAT_FUNC : UDA_FLOAT_SUM;
     case INT_RESULT:
       return (udf->type == UDFTYPE_FUNCTION) ? UDF_INT_FUNC : UDA_INT_SUM;
+    case ROW_RESULT:
     default:
       // This case should never be choosen
       DBUG_ASSERT(0);
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d3f41265e78..883693a0406 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -4007,6 +4007,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
 				 item->name,table,item->charset());
 	return	new Field_string(item_sum->max_length,maybe_null,
 				 item->name,table,item->charset());
+      case ROW_RESULT:
       default:
 	// This case should never be choosen
 	DBUG_ASSERT(0);
@@ -4067,6 +4068,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
 	new_field= new Field_string(item->max_length,maybe_null,
 				    item->name,table,item->str_value.charset());
       break;
+    case ROW_RESULT: 
     default: 
       // This case should never be choosen
       DBUG_ASSERT(0);
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index 7cda3d59c59..8607ddadd81 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1664,7 +1664,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
             pos= "Unknown";
 	    break;
 	}
-	pos= strend(pos);
+	end= strend(pos);
         break;
 	/* First group - functions relying on SSL */
       case SHOW_SSL_GET_VERSION: