← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/server_includes.h

  • Committer: Lee
  • Date: 2008-10-30 13:54:17 UTC
  • mfrom: (570 drizzle)
  • mto: (572.1.2 devel)
  • mto: This revision was merged to the branch mainline in revision 573.
  • Revision ID: lbieber@lbieber-desktop-20081030135417-h4ve2igbe2lyksv9
merge in latest changes from the trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/server_includes.h
692
692
extern LOGGER logger;
693
693
extern TableList general_log, slow_log;
694
694
extern FILE *stderror_file;
695
 
extern pthread_key(MEM_ROOT**,THR_MALLOC);
 
695
extern pthread_key_t THR_MALLOC;
696
696
extern pthread_mutex_t LOCK_mysql_create_db,LOCK_open, LOCK_lock_db,
697
697
       LOCK_thread_count,LOCK_user_locks, LOCK_status,
698
698
       LOCK_error_log, LOCK_uuid_generator,
724
724
extern const char* any_db;
725
725
extern struct my_option my_long_options[];
726
726
extern const LEX_STRING view_type;
727
 
extern scheduler_functions thread_scheduler;
728
727
extern TYPELIB thread_handling_typelib;
729
728
extern uint8_t uc_update_queries[SQLCOM_END+1];
730
729
extern uint32_t sql_command_flags[];
963
962
  memset(table->null_flags, 255, table->s->null_bytes);
964
963
}
965
964
 
966
 
inline void table_case_convert(char * name, uint32_t length)
967
 
{
968
 
  if (lower_case_table_names)
969
 
    files_charset_info->cset->casedn(files_charset_info,
970
 
                                     name, length, name, length);
971
 
}
972
 
 
973
 
inline const char *table_case_name(HA_CREATE_INFO *info, const char *name)
974
 
{
975
 
  return ((lower_case_table_names == 2 && info->alias) ? info->alias : name);
976
 
}
977
 
 
978
965
inline ulong sql_rnd()
979
966
{
980
967
  ulong tmp= (ulong) (rand() * 0xffffffff); /* make all bits random */