diff options
| author | unknown <pem@mysql.comhem.se> | 2004-11-12 12:28:34 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.comhem.se> | 2004-11-12 12:28:34 +0100 |
| commit | 433bebfb27c5ad7218cc74eb5bd349e2d6e57121 (patch) | |
| tree | d5a1793cadbf56f99cb0fe2a8132c26793f87583 | |
| parent | 92b17a7b108cb572ef97647fda187795ec65351d (diff) | |
| download | mariadb-git-433bebfb27c5ad7218cc74eb5bd349e2d6e57121.tar.gz | |
Various build fixes.
sql/mysql_priv.h:
Fix build problems (causing link errors with the Sun compiler).
sql/net_serv.cc:
Corrected macro definition.
sql/sql_base.cc:
Fixed build problems (for broken HP compiler).
sql/sql_show.cc:
64-bit build fix.
| -rw-r--r-- | sql/mysql_priv.h | 4 | ||||
| -rw-r--r-- | sql/net_serv.cc | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 3 | ||||
| -rw-r--r-- | sql/sql_show.cc | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 20ede9a623e..7d1ffe97e08 100644 --- a/sql/mysql_priv.h +++ b/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, diff --git a/sql/net_serv.cc b/sql/net_serv.cc index bcb1f8634c0..02fc1691b8b 100644 --- a/sql/net_serv.cc +++ b/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 diff --git a/sql/sql_base.cc b/sql/sql_base.cc index b518af80a43..eeb34f6b600 100644 --- a/sql/sql_base.cc +++ b/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; diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 557ec1bd5d2..7043379bf8f 100644 --- a/sql/sql_show.cc +++ b/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: |