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

fixing compiler warnings

Browse Source 
sql/item_func.cc:
  fixed type
sql/sql_base.cc:
  keep kompiller happy about unused lable in libmysqld
sql/sql_view.cc:
  keep kompiller happy about unused variable in libmysqld
sql/table.h:
  correct type casting
This commit is contained in:
unknown
2004-11-17 14:17:09 +02:00
parent 163d8b27aa
commit 6eb81bbb22
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_func.cc
View File

@ -174,7 +174,7 @@ bool Item_func::agg_arg_charsets(DTCollation &coll,
for (arg= args, last= args + nargs; arg < last; arg++) for (arg= args, last= args + nargs; arg < last; arg++)
{ {
Item* conv; Item* conv;
uint dummy_offset; uint32 dummy_offset;
if (!String::needs_conversion(0, coll.collation, if (!String::needs_conversion(0, coll.collation,
(*arg)->collation.collation, (*arg)->collation.collation,
&dummy_offset)) &dummy_offset))

3
sql/sql_base.cc
View File

@ -3037,8 +3037,9 @@ insert_fields(THD *thd, TABLE_LIST *tables, const char *db_name,
my_message(ER_NO_TABLES_USED, ER(ER_NO_TABLES_USED), MYF(0)); my_message(ER_NO_TABLES_USED, ER(ER_NO_TABLES_USED), MYF(0));
else else
my_error(ER_BAD_TABLE_ERROR, MYF(0), table_name); my_error(ER_BAD_TABLE_ERROR, MYF(0), table_name);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
err: err:
#endif
DBUG_RETURN(1); DBUG_RETURN(1);
} }

7
sql/sql_view.cc
View File

@ -55,7 +55,10 @@ bool mysql_create_view(THD *thd,
TABLE_LIST *view= lex->unlink_first_table(&link_to_local); TABLE_LIST *view= lex->unlink_first_table(&link_to_local);
TABLE_LIST *tables= lex->query_tables; TABLE_LIST *tables= lex->query_tables;
TABLE_LIST *tbl; TABLE_LIST *tbl;
SELECT_LEX *select_lex= &lex->select_lex, *sl; SELECT_LEX *select_lex= &lex->select_lex;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
SELECT_LEX *sl;
#endif
SELECT_LEX_UNIT *unit= &lex->unit; SELECT_LEX_UNIT *unit= &lex->unit;
bool res= FALSE; bool res= FALSE;
DBUG_ENTER("mysql_create_view"); DBUG_ENTER("mysql_create_view");
@ -745,7 +748,7 @@ mysql_make_view(File_parser *parser, TABLE_LIST *table)
table->effective_algorithm= VIEW_ALGORITHM_MERGE; table->effective_algorithm= VIEW_ALGORITHM_MERGE;
DBUG_PRINT("info", ("algorithm: MERGE")); DBUG_PRINT("info", ("algorithm: MERGE"));
table->updatable= (table->updatable_view != 0); table->updatable= (table->updatable_view != 0);
table->effective_with_check= table->with_check; table->effective_with_check= (uint8)table->with_check;
table->ancestor= view_tables; table->ancestor= view_tables;
/* /*

2
sql/table.h
View File

@ -274,7 +274,7 @@ typedef struct st_schema_table
#define VIEW_CHECK_SKIP 2 #define VIEW_CHECK_SKIP 2
struct st_lex; struct st_lex;
struct select_union; class select_union;
typedef struct st_table_list typedef struct st_table_list
{ {