← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

Fixed -Wmissing-declarations

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
303
303
    path length on success, 0 on failure
304
304
*/
305
305
 
306
 
uint32_t build_tmptable_filename(Session* session, char *buff, size_t bufflen)
 
306
static uint32_t build_tmptable_filename(Session* session,
 
307
                                        char *buff, size_t bufflen)
307
308
{
308
309
  uint32_t length;
309
310
  ostringstream path_str, post_tmpdir_str;
761
762
    1             Error
762
763
*/
763
764
 
764
 
bool check_duplicates_in_interval(const char *set_or_name,
765
 
                                  const char *name, TYPELIB *typelib,
766
 
                                  const CHARSET_INFO * const cs, unsigned int *dup_val_count)
 
765
static bool check_duplicates_in_interval(const char *set_or_name,
 
766
                                         const char *name, TYPELIB *typelib,
 
767
                                         const CHARSET_INFO * const cs,
 
768
                                         unsigned int *dup_val_count)
767
769
{
768
770
  TYPELIB tmp= *typelib;
769
771
  const char **cur_value= typelib->type_names;
804
806
  RETURN VALUES
805
807
    void
806
808
*/
807
 
void calculate_interval_lengths(const CHARSET_INFO * const cs, TYPELIB *interval,
808
 
                                uint32_t *max_length, uint32_t *tot_length)
 
809
static void calculate_interval_lengths(const CHARSET_INFO * const cs,
 
810
                                       TYPELIB *interval,
 
811
                                       uint32_t *max_length,
 
812
                                       uint32_t *tot_length)
809
813
{
810
814
  const char **pos;
811
815
  uint32_t *len;
2603
2607
    @retval       0                        success
2604
2608
    @retval       1                        error
2605
2609
*/
2606
 
bool mysql_create_like_schema_frm(Session* session, TableList* schema_table,
2607
 
                                  char *dst_path, HA_CREATE_INFO *create_info)
 
2610
static bool mysql_create_like_schema_frm(Session* session,
 
2611
                                         TableList* schema_table,
 
2612
                                         char *dst_path,
 
2613
                                         HA_CREATE_INFO *create_info)
2608
2614
{
2609
2615
  HA_CREATE_INFO local_create_info;
2610
2616
  Alter_info alter_info;
2943
2949
  return -1;
2944
2950
}
2945
2951
 
2946
 
/**
2947
 
  Copy all changes detected by parser to the HA_ALTER_FLAGS
2948
 
*/
2949
 
 
2950
 
void setup_ha_alter_flags(Alter_info *alter_info, HA_ALTER_FLAGS *alter_flags)
2951
 
{
2952
 
  uint32_t flags= alter_info->flags;
2953
 
 
2954
 
  if (ALTER_ADD_COLUMN & flags)
2955
 
    alter_flags->set(HA_ADD_COLUMN);
2956
 
  if (ALTER_DROP_COLUMN & flags)
2957
 
    alter_flags->set(HA_DROP_COLUMN);
2958
 
  if (ALTER_RENAME & flags)
2959
 
    alter_flags->set(HA_RENAME_TABLE);
2960
 
  if (ALTER_CHANGE_COLUMN & flags)
2961
 
    alter_flags->set(HA_CHANGE_COLUMN);
2962
 
  if (ALTER_COLUMN_DEFAULT & flags)
2963
 
    alter_flags->set(HA_COLUMN_DEFAULT_VALUE);
2964
 
  if (ALTER_COLUMN_STORAGE & flags)
2965
 
    alter_flags->set(HA_COLUMN_STORAGE);
2966
 
  if (ALTER_COLUMN_FORMAT & flags)
2967
 
    alter_flags->set(HA_COLUMN_FORMAT);
2968
 
  if (ALTER_COLUMN_ORDER & flags)
2969
 
    alter_flags->set(HA_ALTER_COLUMN_ORDER);
2970
 
  if (ALTER_STORAGE & flags)
2971
 
    alter_flags->set(HA_ALTER_STORAGE);
2972
 
  if (ALTER_ROW_FORMAT & flags)
2973
 
    alter_flags->set(HA_ALTER_ROW_FORMAT);
2974
 
  if (ALTER_RECREATE & flags)
2975
 
    alter_flags->set(HA_RECREATE);
2976
 
  if (ALTER_FOREIGN_KEY & flags)
2977
 
    alter_flags->set(HA_ALTER_FOREIGN_KEY);
2978
 
}
2979
 
 
2980
2952
 
2981
2953
/*
2982
2954
  Manages enabling/disabling of indexes for ALTER Table