Various build fixes.

sql/mysql_priv.h

@@ -566,8 +566,8 @@ int mysql_explain_select(THD *thd, SELECT_LEX *sl, char const *type,
 int mysql_union(THD *thd, LEX *lex, select_result *result,
 		SELECT_LEX_UNIT *unit);
 int mysql_handle_derived(LEX *lex, int (*processor)(THD *thd,
-                                                    st_lex *lex,
-                                                    st_table_list *table));
+                                                    LEX *lex,
+                                                    TABLE_LIST *table));
 int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *t);
 int mysql_derived_filling(THD *thd, LEX *lex, TABLE_LIST *t);
 Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,

sql/net_serv.cc

@@ -96,7 +96,7 @@ extern void query_cache_insert(NET *net, const char *packet, ulong length);
 #define update_statistics(A) A
 #else
 #define update_statistics(A)
-#define thd_increment_bytes_sent()
+#define thd_increment_bytes_sent(N)
 #endif
 
 #define TEST_BLOCKING		8

sql/sql_base.cc

@@ -3056,6 +3056,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
   SELECT_LEX *select_lex= thd->lex->current_select;
   Item_arena *arena= thd->current_arena, backup;
   bool save_wrapper= thd->lex->current_select->no_wrap_view_item;
+  TABLE_LIST *table= NULL;	// For HP compilers
   DBUG_ENTER("setup_conds");
 
   if (select_lex->conds_processed_with_permanent_arena ||
@@ -3075,7 +3076,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
   }
 
   /* Check if we are using outer joins */
-  for (TABLE_LIST *table= tables; table; table= table->next_local)
+  for (table= tables; table; table= table->next_local)
   {
     TABLE_LIST *embedded;
     TABLE_LIST *embedding= table;

sql/sql_show.cc

@@ -1965,7 +1965,7 @@ int mysqld_show(THD *thd, const char *wild, show_var_st *variables,
       switch (show_type) {
       case SHOW_LONG_STATUS:
       case SHOW_LONG_CONST_STATUS:
-	value= ((char *) status_var + (uint) value);
+	value= ((char *) status_var + (ulong) value);
 	  /* fall through */
       case SHOW_LONG:
       case SHOW_LONG_CONST: