1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compiler warning fix

Browse Source
This commit is contained in:
Sergey Glukhov 2008-12-24 18:45:47 +04:00
parent b5f005f65a
commit 4e8fae9ec2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/mysqld.cc
View File

@ -3616,6 +3616,7 @@ void decrement_handler_count()
#endif /* defined(__NT__) || defined(HAVE_SMEM) */ #endif /* defined(__NT__) || defined(HAVE_SMEM) */
#ifndef EMBEDDED_LIBRARY
#ifndef DBUG_OFF #ifndef DBUG_OFF
/* /*
Debugging helper function to keep the locale database Debugging helper function to keep the locale database
@ -3654,7 +3655,6 @@ static void test_lc_time_sz()
#endif//DBUG_OFF #endif//DBUG_OFF
#ifndef EMBEDDED_LIBRARY
#ifdef __WIN__ #ifdef __WIN__
int win_main(int argc, char **argv) int win_main(int argc, char **argv)
#else #else

2
sql/sql_acl.cc
View File

@ -5953,6 +5953,7 @@ int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr)
} }
#ifndef NO_EMBEDDED_ACCESS_CHECKS
static bool update_schema_privilege(THD *thd, TABLE *table, char *buff, static bool update_schema_privilege(THD *thd, TABLE *table, char *buff,
const char* db, const char* t_name, const char* db, const char* t_name,
const char* column, uint col_length, const char* column, uint col_length,
@ -5973,6 +5974,7 @@ static bool update_schema_privilege(THD *thd, TABLE *table, char *buff,
table->field[i]->store(is_grantable, strlen(is_grantable), cs); table->field[i]->store(is_grantable, strlen(is_grantable), cs);
return schema_table_store_record(thd, table); return schema_table_store_record(thd, table);
} }
#endif
int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond) int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond)