5.0-bugteam->5.1-bugteam merge

sql/mysqld.cc

@@ -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

sql/sql_acl.cc

@@ -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)