← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2009-07-09 19:49:32 UTC
  • mfrom: (1085.1.10 mordred)
  • Revision ID: brian@gaz-20090709194932-o90qfzgk9xem5di1
Merge from Monty

Show diffs side-by-side

added added

removed removed

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