← Back to branch summary

~stewart/drizzle/use-catalog-for-path

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2011-03-28 02:46:21 UTC
  • Revision ID: brian@tangent.org-20110328024621-wtkdtlvdplqm0ybf
Shift CHARSET_INFO to charset_info_st

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
327
327
{
328
328
public:
329
329
  string s;
330
 
  const CHARSET_INFO * const cs;
 
330
  const charset_info_st * const cs;
331
331
 
332
332
  typelib_set_member(const char* value, unsigned int length,
333
 
                     const CHARSET_INFO * const charset)
 
333
                     const charset_info_st * const charset)
334
334
    : s(value, length),
335
335
      cs(charset)
336
336
  {}
359
359
 
360
360
static bool check_duplicates_in_interval(const char *set_or_name,
361
361
                                         const char *name, TYPELIB *typelib,
362
 
                                         const CHARSET_INFO * const cs,
 
362
                                         const charset_info_st * const cs,
363
363
                                         unsigned int *dup_val_count)
364
364
{
365
365
  TYPELIB tmp= *typelib;
405
405
  RETURN VALUES
406
406
    void
407
407
*/
408
 
static void calculate_interval_lengths(const CHARSET_INFO * const cs,
 
408
static void calculate_interval_lengths(const charset_info_st * const cs,
409
409
                                       TYPELIB *interval,
410
410
                                       uint32_t *max_length,
411
411
                                       uint32_t *tot_length)
543
543
 
544
544
  for (int32_t field_no=0; (sql_field=it++) ; field_no++)
545
545
  {
546
 
    const CHARSET_INFO *save_cs;
 
546
    const charset_info_st *save_cs;
547
547
 
548
548
    /*
549
549
      Initialize length from its original value (number of characters),
608
608
    if (sql_field->sql_type == DRIZZLE_TYPE_ENUM)
609
609
    {
610
610
      size_t dummy;
611
 
      const CHARSET_INFO * const cs= sql_field->charset;
 
611
      const charset_info_st * const cs= sql_field->charset;
612
612
      TYPELIB *interval= sql_field->interval;
613
613
 
614
614
      /*
1732
1732
  Item *item;
1733
1733
  int result_code= 0;
1734
1734
  TransactionServices &transaction_services= TransactionServices::singleton();
1735
 
  const CHARSET_INFO * const cs= system_charset_info;
 
1735
  const charset_info_st * const cs= system_charset_info;
1736
1736
 
1737
1737
  if (! session->endActiveTransaction())
1738
1738
    return 1;