mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

5.0-bugteam->5.1-bugteam merge

Browse source
This commit is contained in:
Sergey Glukhov 2008-12-24 18:47:24 +04:00
commit 853f4ba37b
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

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

2
sql/sql_acl.cc
View file

@ -6304,6 +6304,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,
const char* db, const char* t_name,
const char* column, uint col_length,
@ -6324,6 +6325,7 @@ static bool update_schema_privilege(THD *thd, TABLE *table, char *buff,
table->field[i]->store(is_grantable, strlen(is_grantable), cs);
return schema_table_store_record(thd, table);
}
#endif
int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond)