← Back to branch summary

~mdcallag/mysql-patch/5.0-map

« back to all changes in this revision

Viewing changes to sql/mysql_priv.h

  • Committer: Mark Callaghan
  • Date: 2009-03-08 23:10:48 UTC
  • mfrom: (2676.15.35 merge-5.0-bugteam)
  • Revision ID: mdcallag@gmail.com-20090308231048-98m2y0h6lck93gn1
merge from 5.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/mysql_priv.h
132
132
  TYPELIB *ab_month_names;
133
133
  TYPELIB *day_names;
134
134
  TYPELIB *ab_day_names;
 
135
  uint max_month_name_length;
 
136
  uint max_day_name_length;
135
137
#ifdef __cplusplus 
136
138
  my_locale_st(uint number_par,
137
139
               const char *name_par, const char *descr_par, bool is_ascii_par,
138
140
               TYPELIB *month_names_par, TYPELIB *ab_month_names_par,
139
 
               TYPELIB *day_names_par, TYPELIB *ab_day_names_par) : 
 
141
               TYPELIB *day_names_par, TYPELIB *ab_day_names_par,
 
142
               uint max_month_name_length_par, uint max_day_name_length_par) : 
140
143
    number(number_par),
141
144
    name(name_par), description(descr_par), is_ascii(is_ascii_par),
142
145
    month_names(month_names_par), ab_month_names(ab_month_names_par),
143
 
    day_names(day_names_par), ab_day_names(ab_day_names_par)
 
146
    day_names(day_names_par), ab_day_names(ab_day_names_par),
 
147
    max_month_name_length(max_month_name_length_par),
 
148
    max_day_name_length(max_day_name_length_par)
144
149
  {}
145
150
#endif
146
151
} MY_LOCALE;
435
440
#define UNCACHEABLE_PREPARE    16
436
441
/* For uncorrelated SELECT in an UNION with some correlated SELECTs */
437
442
#define UNCACHEABLE_UNITED     32
 
443
#define UNCACHEABLE_CHECKOPTION   64
438
444
 
439
445
/* Used to check GROUP BY list in the MODE_ONLY_FULL_GROUP_BY mode */
440
446
#define UNDEF_POS (-1)
645
651
  unsigned int client_long_flag:1;
646
652
  unsigned int client_protocol_41:1;
647
653
  unsigned int more_results_exists:1;
 
654
  unsigned int in_trans:1;
 
655
  unsigned int autocommit:1;
648
656
  unsigned int pkt_nr;
649
657
  uint character_set_client_num;
650
658
  uint character_set_results_num;
978
986
bool get_schema_tables_result(JOIN *join,
979
987
                              enum enum_schema_table_state executed_place);
980
988
enum enum_schema_tables get_schema_table_idx(ST_SCHEMA_TABLE *schema_table);
 
989
bool schema_table_store_record(THD *thd, TABLE *table);
981
990
 
982
991
#define is_schema_db(X) \
983
992
  !my_strcasecmp(system_charset_info, INFORMATION_SCHEMA_NAME.str, (X))
1557
1566
               String *str);
1558
1567
void make_time(const DATE_TIME_FORMAT *format, const MYSQL_TIME *l_time,
1559
1568
               String *str);
1560
 
ulonglong get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
1561
 
                             Item *warn_item, bool *is_null);
 
1569
longlong get_datetime_value(THD *thd, Item ***item_arg, Item **cache_arg,
 
1570
                            Item *warn_item, bool *is_null);
1562
1571
 
1563
1572
int test_if_number(char *str,int *res,bool allow_wildcards);
1564
1573
void change_byte(byte *,uint,char,char);