database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Various build fixes.

Browse Source 
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.
This commit is contained in:
unknown
2004-11-12 12:28:34 +01:00
parent c3531618f1
commit eed282d6dd
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysql_priv.h
View File

@ -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, int mysql_union(THD *thd, LEX *lex, select_result *result,
SELECT_LEX_UNIT *unit); SELECT_LEX_UNIT *unit);
int mysql_handle_derived(LEX *lex, int (*processor)(THD *thd, int mysql_handle_derived(LEX *lex, int (*processor)(THD *thd,
st_lex *lex, LEX *lex,
st_table_list *table)); TABLE_LIST *table));
int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *t); int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *t);
int mysql_derived_filling(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, Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,

2
sql/net_serv.cc
View File

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

3
sql/sql_base.cc
View File

@ -3056,6 +3056,7 @@ int setup_conds(THD *thd,TABLE_LIST *tables,COND **conds)
SELECT_LEX *select_lex= thd->lex->current_select; SELECT_LEX *select_lex= thd->lex->current_select;
Item_arena *arena= thd->current_arena, backup; Item_arena *arena= thd->current_arena, backup;
bool save_wrapper= thd->lex->current_select->no_wrap_view_item; bool save_wrapper= thd->lex->current_select->no_wrap_view_item;
TABLE_LIST *table= NULL; // For HP compilers
DBUG_ENTER("setup_conds"); DBUG_ENTER("setup_conds");
if (select_lex->conds_processed_with_permanent_arena || 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 */ /* 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 *embedded;
TABLE_LIST *embedding= table; TABLE_LIST *embedding= table;

2
sql/sql_show.cc
View File

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